morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

freerdp-client: formatting

Browse Source
This commit is contained in:
C-o-r-E
2013-05-30 09:27:20 -04:00
parent 5820c24b03
commit cdc294003d
2 changed files with 123 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
client/X11/xf_event.c
View File

@@ -95,35 +95,30 @@ static BOOL xf_event_Expose(xfInfo* xfi, XEvent* event, BOOL app)
w = event->xexpose.width;
h = event->xexpose.height;
if (!app)
{
//if (xfi->scale != 1.0)
if ( (xfi->scale != 1.0) || (xfi->offset_x) || (xfi->offset_y) )
//if (xfi->scale != 1.0)
if ((xfi->scale != 1.0) || (xfi->offset_x) || (xfi->offset_y))
{
xf_draw_screen_scaled(xfi,
x - xfi->offset_x,
y - xfi->offset_y,
w,
h,
FALSE);
}
else
xf_draw_screen_scaled(xfi, x - xfi->offset_x,
y - xfi->offset_y, w, h, FALSE);
} else
{
XCopyArea(xfi->display, xfi->primary,
xfi->window->handle, xfi->gc, x, y, w, h, x, y);
xfi->window->handle, xfi->gc, x, y, w,
h, x, y);
}
}
else
} else
{
xfWindow* xfw;
rdpWindow* window;
rdpRail* rail = ((rdpContext*) xfi->context)->rail;
window = window_list_get_by_extra_id(rail->list, (void*) event->xexpose.window);
window = window_list_get_by_extra_id(rail->list,
(void*) event->xexpose.window);
if (window != NULL)
if (window != NULL )
{
xfw = (xfWindow*) window->extra;
xf_UpdateWindowArea(xfi, xfw, x, y, w, h);
@@ -173,8 +168,8 @@ static BOOL xf_event_MotionNotify(xfInfo* xfi, XEvent* event, BOOL app)
//if(xfi->scale != 1.0)
if ( (xfi->scale != 1.0) || (xfi->offset_x) || (xfi->offset_y) )
{
x = (int)((x - xfi->offset_x) * (1.0 / xfi->scale) );
y = (int)((y - xfi->offset_y) * (1.0 / xfi->scale) );
x = (int)((x - xfi->offset_x) * (1.0 / xfi->scale) );
y = (int)((y - xfi->offset_y) * (1.0 / xfi->scale) );
}
input->MouseEvent(input, PTR_FLAGS_MOVE, x, y);
@@ -282,11 +277,14 @@ static BOOL xf_event_ButtonPress(xfInfo* xfi, XEvent* event, BOOL app)
}
//if (xfi->scale != 1.0)
if ( (xfi->scale != 1.0) || (xfi->offset_x) || (xfi->offset_y) )
{
x = (int)((x - xfi->offset_x) * (1.0 / xfi->scale) );
y = (int)((y - xfi->offset_y) * (1.0 / xfi->scale) );
}
if ((xfi->scale != 1.0) || (xfi->offset_x)
|| (xfi->offset_y))
{
x = (int) ((x - xfi->offset_x)
* (1.0 / xfi->scale));
y = (int) ((y - xfi->offset_y)
* (1.0 / xfi->scale));
}
if (extended)
input->ExtendedMouseEvent(input, flags, x, y);
@@ -373,10 +371,10 @@ static BOOL xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, BOOL app)
//if (xfi->scale != 1.0)
if ( (xfi->scale != 1.0) || (xfi->offset_x) || (xfi->offset_y) )
if ((xfi->scale != 1.0) || (xfi->offset_x) || (xfi->offset_y))
{
x = (int)((x - xfi->offset_x) * (1.0 / xfi->scale) );
y = (int)((y - xfi->offset_y) * (1.0 / xfi->scale) );
x = (int) ((x - xfi->offset_x) * (1.0 / xfi->scale));
y = (int) ((y - xfi->offset_y) * (1.0 / xfi->scale));
}
if (extended)

178
client/X11/xf_keyboard.c
View File

@@ -208,8 +208,11 @@ BOOL xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym)
{
if (keysym == XK_Return)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
/* Ctrl-Alt-Enter: toggle full screen */
xf_toggle_fullscreen(xfi);
@@ -217,123 +220,140 @@ BOOL xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym)
}
}
if (keysym == XK_period)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
{
//Zoom in (scale larger)
double s = xfi->scale;
s += 0.1;
if(s > 2.0)
s = 2.0;
xfi->scale = s;
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
//Zoom in (scale larger)
double s = xfi->scale;
s += 0.1;
if (s > 2.0)
s = 2.0;
xfi->currentWidth = xfi->originalWidth * s;
xfi->currentHeight = xfi->originalHeight * s;
xfi->scale = s;
xf_transform_window(xfi);
xfi->currentWidth = xfi->originalWidth * s;
xfi->currentHeight = xfi->originalHeight * s;
IFCALL(xfi->client->OnResizeWindow, xfi->instance, xfi->currentWidth, xfi->currentHeight);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
return TRUE;
}
xf_transform_window(xfi);
IFCALL(xfi->client->OnResizeWindow,
xfi->instance, xfi->currentWidth, xfi->currentHeight);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
return TRUE;
}
}
if (keysym == XK_comma)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
{
//Zoom out (scale smaller)
double s = xfi->scale;
s -= 0.1;
if(s < 0.5)
s = 0.5;
xfi->scale = s;
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
//Zoom out (scale smaller)
double s = xfi->scale;
s -= 0.1;
if (s < 0.5)
s = 0.5;
xfi->currentWidth = xfi->originalWidth * s;
xfi->currentHeight = xfi->originalHeight * s;
xfi->scale = s;
xf_transform_window(xfi);
xfi->currentWidth = xfi->originalWidth * s;
xfi->currentHeight = xfi->originalHeight * s;
IFCALL(xfi->client->OnResizeWindow, xfi->instance, xfi->currentWidth, xfi->currentHeight);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
return TRUE;
}
xf_transform_window(xfi);
IFCALL(xfi->client->OnResizeWindow,
xfi->instance, xfi->currentWidth, xfi->currentHeight);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
return TRUE;
}
}
if (keysym == XK_KP_4)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
{
xfi->offset_x -= 5;
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
xfi->offset_x -= 5;
xf_transform_window(xfi);
xf_transform_window(xfi);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan left : %d\n", xfi->offset_x);
return TRUE;
}
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan left : %d\n", xfi->offset_x);
return TRUE;
}
}
if (keysym == XK_KP_6)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
{
xfi->offset_x += 5;
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
xfi->offset_x += 5;
if(xfi->offset_x > 0)
xfi->offset_x = 0;
if (xfi->offset_x > 0)
xfi->offset_x = 0;
xf_transform_window(xfi);
xf_transform_window(xfi);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan right : %d\n", xfi->offset_x);
return TRUE;
}
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan right : %d\n", xfi->offset_x);
return TRUE;
}
}
if (keysym == XK_KP_8)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
{
xfi->offset_y -= 5;
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
xfi->offset_y -= 5;
xf_transform_window(xfi);
xf_transform_window(xfi);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan up : %d\n", xfi->offset_y);
return TRUE;
}
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan up : %d\n", xfi->offset_y);
return TRUE;
}
}
if (keysym == XK_KP_2)
{
if ((xf_kbd_key_pressed(xfi, XK_Alt_L) || xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L) || xf_kbd_key_pressed(xfi, XK_Control_R)))
{
xfi->offset_y += 5;
if ((xf_kbd_key_pressed(xfi, XK_Alt_L)
|| xf_kbd_key_pressed(xfi, XK_Alt_R))
&& (xf_kbd_key_pressed(xfi, XK_Control_L)
|| xf_kbd_key_pressed(xfi,
XK_Control_R)))
{
xfi->offset_y += 5;
if(xfi->offset_y > 0)
xfi->offset_y = 0;
if (xfi->offset_y > 0)
xfi->offset_y = 0;
xf_transform_window(xfi);
xf_transform_window(xfi);
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan down : %d\n", xfi->offset_y);
return TRUE;
}
xf_draw_screen_scaled(xfi, 0, 0, 0, 0, FALSE);
printf("pan down : %d\n", xfi->offset_y);
return TRUE;
}
}
return FALSE;
}