Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-24 10:32:32 +00:00
Code Issues Projects Releases Wiki Activity

removed unnecessary window attributes

Browse Source
This commit is contained in:
cebix 2000-11-03 12:23:49 +00:00
parent ed6e74340c
commit 3e6bb33b15
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BasiliskII/src/Unix/video_x.cpp
View File

@ -336,15 +336,10 @@ static bool init_window(int width, int height)
XSetWindowAttributes wattr; XSetWindowAttributes wattr;
wattr.event_mask = eventmask = win_eventmask; wattr.event_mask = eventmask = win_eventmask;
wattr.background_pixel = black_pixel; wattr.background_pixel = black_pixel;
wattr.border_pixel = black_pixel;
wattr.backing_store = NotUseful;
wattr.save_under = false;
wattr.backing_planes = xdepth;
XSync(x_display, false); XSync(x_display, false);
the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
CWBackingStore | CWBackingPlanes, &wattr);
// Indicate that we want keyboard input // Indicate that we want keyboard input
{ {
@ -372,13 +367,7 @@ static bool init_window(int width, int height)
} }
// Set window title // Set window title
{ XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
XTextProperty title_prop;
const char *title = GetString(STR_WINDOW_TITLE);
XStringListToTextProperty((char **)&title, 1, &title_prop);
XSetWMName(x_display, the_win, &title_prop);
XFree(title_prop.value);
}
// Set window class // Set window class
{ {
@ -572,17 +561,15 @@ static bool init_fbdev_dga(char *in_fb_name)
// Create window // Create window
XSetWindowAttributes wattr; XSetWindowAttributes wattr;
wattr.override_redirect = True;
wattr.backing_store = NotUseful;
wattr.background_pixel = white_pixel;
wattr.border_pixel = black_pixel;
wattr.event_mask = eventmask = dga_eventmask; wattr.event_mask = eventmask = dga_eventmask;
wattr.background_pixel = white_pixel;
wattr.override_redirect = True;
XSync(x_display, false); XSync(x_display, false);
the_win = XCreateWindow(x_display, rootwin, the_win = XCreateWindow(x_display, rootwin,
0, 0, width, height, 0, 0, width, height,
0, xdepth, InputOutput, vis, 0, xdepth, InputOutput, vis,
CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore, CWEventMask | CWBackPixel | CWOverrideRedirect,
&wattr); &wattr);
XSync(x_display, false); XSync(x_display, false);
XMapRaised(x_display, the_win); XMapRaised(x_display, the_win);
@ -684,12 +671,11 @@ static bool init_xf86_dga(int width, int height)
// Create window // Create window
XSetWindowAttributes wattr; XSetWindowAttributes wattr;
wattr.event_mask = eventmask = dga_eventmask; wattr.event_mask = eventmask = dga_eventmask;
wattr.border_pixel = black_pixel;
wattr.override_redirect = True; wattr.override_redirect = True;
XSync(x_display, false); XSync(x_display, false);
the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth, the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr); InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
XSync(x_display, false); XSync(x_display, false);
XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE)); XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
XMapRaised(x_display, the_win); XMapRaised(x_display, the_win);
@ -1296,15 +1282,14 @@ static void suspend_emul(void)
XSetWindowAttributes wattr; XSetWindowAttributes wattr;
wattr.event_mask = KeyPressMask; wattr.event_mask = KeyPressMask;
wattr.background_pixel = black_pixel; wattr.background_pixel = black_pixel;
wattr.border_pixel = black_pixel; wattr.backing_store = WhenMapped;
wattr.backing_store = Always;
wattr.backing_planes = xdepth; wattr.backing_planes = xdepth;
wattr.colormap = DefaultColormap(x_display, screen); wattr.colormap = DefaultColormap(x_display, screen);
XSync(x_display, false); XSync(x_display, false);
suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth, suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | InputOutput, vis, CWEventMask | CWBackPixel | CWBackingStore |
CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr); CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
XSync(x_display, false); XSync(x_display, false);
XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE)); XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
XMapRaised(x_display, suspend_win); XMapRaised(x_display, suspend_win);