Skip to content
Snippets Groups Projects
Commit b4d943a3 authored by deuce's avatar deuce
Browse files

Actually convert the y axis in coord_conv_xy().

parent 0aa0acfd
No related branches found
No related tags found
No related merge requests found
......@@ -675,6 +675,7 @@ coord_conv_xy(struct cterminal *cterm, enum cterm_coordinates from_coord,
{
if (from_coord == to_coord)
return;
if (x) {
if (from_coord == CTERM_COORD_CURR) {
if (cterm->extattr & CTERM_EXTATTR_ORIGINMODE)
......@@ -715,6 +716,46 @@ coord_conv_xy(struct cterminal *cterm, enum cterm_coordinates from_coord,
break;
}
}
if (y) {
if (from_coord == CTERM_COORD_CURR) {
if (cterm->extattr & CTERM_EXTATTR_ORIGINMODE)
from_coord = CTERM_COORD_TERM;
else
from_coord = CTERM_COORD_ABSTERM;
}
switch(from_coord) {
case CTERM_COORD_SCREEN:
break;
case CTERM_COORD_TERM:
*y += cterm->top_margin - 1;
// Fall-through
case CTERM_COORD_ABSTERM:
*y += cterm->y - 1;
break;
case CTERM_COORD_CURR:
// Silence warnings
break;
}
if (to_coord == CTERM_COORD_CURR) {
if (cterm->extattr & CTERM_EXTATTR_ORIGINMODE)
to_coord = CTERM_COORD_TERM;
else
to_coord = CTERM_COORD_ABSTERM;
}
switch(to_coord) {
case CTERM_COORD_SCREEN:
break;
case CTERM_COORD_TERM:
*y -= cterm->top_margin - 1;
// Fall-through
case CTERM_COORD_ABSTERM:
*y -= cterm->y - 1;
break;
case CTERM_COORD_CURR:
// Silence warnings
break;
}
}
}
static void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment