added ui_init for pre connect inits like fullscreen
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@80 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
ef024a66ae
commit
7a1b799c9d
@ -229,6 +229,8 @@ main(int argc, char *argv[])
|
||||
strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
|
||||
|
||||
xkeymap_init1();
|
||||
if(!ui_init())
|
||||
return 1;
|
||||
|
||||
if (!rdp_connect(server, flags, domain, password, shell, directory))
|
||||
return 1;
|
||||
|
26
xwin.c
26
xwin.c
@ -241,6 +241,24 @@ close_inputmethod(void)
|
||||
}
|
||||
}
|
||||
|
||||
BOOL
|
||||
ui_init()
|
||||
{
|
||||
Screen *screen;
|
||||
display = XOpenDisplay(NULL);
|
||||
if (display == NULL)
|
||||
{
|
||||
error("Failed to open display\n");
|
||||
return False;
|
||||
}
|
||||
if(fullscreen)
|
||||
{
|
||||
screen = DefaultScreenOfDisplay(display);
|
||||
width = WidthOfScreen(screen);
|
||||
height = HeightOfScreen(screen);
|
||||
}
|
||||
return True;
|
||||
}
|
||||
|
||||
BOOL
|
||||
ui_create_window(char *title)
|
||||
@ -254,14 +272,6 @@ ui_create_window(char *title)
|
||||
uint16 test;
|
||||
int i;
|
||||
|
||||
display = XOpenDisplay(NULL);
|
||||
|
||||
if (display == NULL)
|
||||
{
|
||||
error("Failed to open display\n");
|
||||
return False;
|
||||
}
|
||||
|
||||
x_socket = ConnectionNumber(display);
|
||||
screen = DefaultScreenOfDisplay(display);
|
||||
visual = DefaultVisualOfScreen(screen);
|
||||
|
Loading…
Reference in New Issue
Block a user