Indent fixes
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@100 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
a7c00fc2e6
commit
f56b13e3ae
25
xwin.c
25
xwin.c
@ -277,8 +277,8 @@ ui_create_window_obj(int xpos, int ypos, int width, int height, int valuemask)
|
|||||||
screen = DefaultScreenOfDisplay(display);
|
screen = DefaultScreenOfDisplay(display);
|
||||||
|
|
||||||
wnd = XCreateWindow(display, RootWindowOfScreen(screen), xpos,
|
wnd = XCreateWindow(display, RootWindowOfScreen(screen), xpos,
|
||||||
ypos, width, height, 0, CopyFromParent,
|
ypos, width, height, 0, CopyFromParent,
|
||||||
InputOutput, CopyFromParent, valuemask, &attribs);
|
InputOutput, CopyFromParent, valuemask, &attribs);
|
||||||
|
|
||||||
|
|
||||||
XStoreName(display, wnd, title);
|
XStoreName(display, wnd, title);
|
||||||
@ -311,7 +311,8 @@ ui_create_window_obj(int xpos, int ypos, int width, int height, int valuemask)
|
|||||||
XMapWindow(display, wnd);
|
XMapWindow(display, wnd);
|
||||||
|
|
||||||
/* Wait for VisibilityNotify Event */
|
/* Wait for VisibilityNotify Event */
|
||||||
for (;;) {
|
for (;;)
|
||||||
|
{
|
||||||
XNextEvent(display, &xevent);
|
XNextEvent(display, &xevent);
|
||||||
if (xevent.type == VisibilityNotify)
|
if (xevent.type == VisibilityNotify)
|
||||||
break;
|
break;
|
||||||
@ -397,7 +398,7 @@ ui_create_window()
|
|||||||
|
|
||||||
|
|
||||||
input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
|
input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
|
||||||
VisibilityChangeMask | FocusChangeMask;
|
VisibilityChangeMask | FocusChangeMask;
|
||||||
|
|
||||||
if (grab_keyboard)
|
if (grab_keyboard)
|
||||||
input_mask |= EnterWindowMask | LeaveWindowMask;
|
input_mask |= EnterWindowMask | LeaveWindowMask;
|
||||||
@ -408,7 +409,8 @@ ui_create_window()
|
|||||||
input_mask |= ExposureMask;
|
input_mask |= ExposureMask;
|
||||||
|
|
||||||
if (fullscreen)
|
if (fullscreen)
|
||||||
ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel | CWOverrideRedirect);
|
ui_create_window_obj(0, 0, width, height,
|
||||||
|
CWBackingStore | CWBackPixel | CWOverrideRedirect);
|
||||||
else
|
else
|
||||||
ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel);
|
ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel);
|
||||||
|
|
||||||
@ -462,15 +464,16 @@ toggle_fullscreen()
|
|||||||
XFreePixmap(display, backstore);
|
XFreePixmap(display, backstore);
|
||||||
XFreeGC(display, gc);
|
XFreeGC(display, gc);
|
||||||
XDestroyWindow(display, wnd);
|
XDestroyWindow(display, wnd);
|
||||||
if (fullscreen) {
|
if (fullscreen)
|
||||||
|
{
|
||||||
attribs.override_redirect = True;
|
attribs.override_redirect = True;
|
||||||
ui_create_window_obj(0, 0, dpy_width, dpy_height,
|
ui_create_window_obj(0, 0, dpy_width, dpy_height,
|
||||||
CWBackingStore | CWBackPixel | CWOverrideRedirect);
|
CWBackingStore | CWBackPixel | CWOverrideRedirect);
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
attribs.override_redirect = False;
|
attribs.override_redirect = False;
|
||||||
ui_create_window_obj(0, 0, width, height,
|
ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel);
|
||||||
CWBackingStore | CWBackPixel);
|
|
||||||
}
|
}
|
||||||
ui_set_cursor(cache_get_cursor(0));
|
ui_set_cursor(cache_get_cursor(0));
|
||||||
ui_move_pointer(width / 2, height / 2);
|
ui_move_pointer(width / 2, height / 2);
|
||||||
@ -540,7 +543,7 @@ xwin_process_events()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME needs alt modifier */
|
/* FIXME needs alt modifier */
|
||||||
if (keysym == XK_Break) /* toggle full screen */
|
if (keysym == XK_Break) /* toggle full screen */
|
||||||
{
|
{
|
||||||
toggle_fullscreen();
|
toggle_fullscreen();
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user