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:
Jay Sorg 2002-07-30 01:57:39 +00:00
parent ef024a66ae
commit 7a1b799c9d
2 changed files with 20 additions and 8 deletions

View File

@ -229,6 +229,8 @@ main(int argc, char *argv[])
strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
xkeymap_init1(); xkeymap_init1();
if(!ui_init())
return 1;
if (!rdp_connect(server, flags, domain, password, shell, directory)) if (!rdp_connect(server, flags, domain, password, shell, directory))
return 1; return 1;

26
xwin.c
View File

@ -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 BOOL
ui_create_window(char *title) ui_create_window(char *title)
@ -254,14 +272,6 @@ ui_create_window(char *title)
uint16 test; uint16 test;
int i; int i;
display = XOpenDisplay(NULL);
if (display == NULL)
{
error("Failed to open display\n");
return False;
}
x_socket = ConnectionNumber(display); x_socket = ConnectionNumber(display);
screen = DefaultScreenOfDisplay(display); screen = DefaultScreenOfDisplay(display);
visual = DefaultVisualOfScreen(screen); visual = DefaultVisualOfScreen(screen);