mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2025-01-19 08:39:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

re-enabled X stuff on wm startup, basic fs works

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-02-02 18:23:04 +02:00
parent 8003a76dcf
commit fe0f9d5c67
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/wm/wm.c
View File

@ -661,7 +661,6 @@ main(int argc, char *argv[])
} }
} }
} }
#if 0
dpy = XOpenDisplay(0); dpy = XOpenDisplay(0);
if(!dpy) { if(!dpy) {
fprintf(stderr, "%s", "wmiiwm: cannot open display\n"); fprintf(stderr, "%s", "wmiiwm: cannot open display\n");
@ -688,7 +687,6 @@ main(int argc, char *argv[])
} }
XSetErrorHandler(0); XSetErrorHandler(0);
x_error_handler = XSetErrorHandler(wmii_error_handler); x_error_handler = XSetErrorHandler(wmii_error_handler);
#endif
errstr = nil; errstr = nil;
if(!address) if(!address)
usage(); usage();
@ -709,7 +707,6 @@ main(int argc, char *argv[])
root_qid.type = IXP_QTDIR; root_qid.type = IXP_QTDIR;
root_qid.version = 0; root_qid.version = 0;
root_qid.path = mkqpath(Droot, 0, 0, 0); root_qid.path = mkqpath(Droot, 0, 0, 0);
#if 0
/* X server */ /* X server */
c = cext_emallocz(sizeof(IXPConn)); c = cext_emallocz(sizeof(IXPConn));
c->fd = ConnectionNumber(dpy); c->fd = ConnectionNumber(dpy);
@ -717,8 +714,7 @@ main(int argc, char *argv[])
srv.conn = (IXPConn **)cext_array_attach((void **)srv.conn, c, srv.conn = (IXPConn **)cext_array_attach((void **)srv.conn, c,
sizeof(IXPConn *), &srv.connsz); sizeof(IXPConn *), &srv.connsz);
init_event_hander(); init_x_event_handler();
#endif
ndet = npage = nclient = aqsz = detsz = pagesz = clientsz = sel = 0; ndet = npage = nclient = aqsz = detsz = pagesz = clientsz = sel = 0;
page = nil; page = nil;
@ -727,18 +723,16 @@ main(int argc, char *argv[])
def.font = strdup("fixed"); def.font = strdup("fixed");
cext_strlcpy(def.selcolor, BLITZ_SEL_COLOR, sizeof(def.selcolor)); cext_strlcpy(def.selcolor, BLITZ_SEL_COLOR, sizeof(def.selcolor));
/*blitz_loadcolor(dpy, screen, def.selcolor, &def.sel);*/ blitz_loadcolor(dpy, screen, def.selcolor, &def.sel);
cext_strlcpy(def.normcolor, BLITZ_SEL_COLOR, sizeof(def.normcolor)); cext_strlcpy(def.normcolor, BLITZ_SEL_COLOR, sizeof(def.normcolor));
/*blitz_loadcolor(dpy, screen, def.normcolor, &def.norm);*/ blitz_loadcolor(dpy, screen, def.normcolor, &def.norm);
#if 0
init_atoms(); init_atoms();
init_cursors(); init_cursors();
xfont = blitz_getfont(dpy, def.font); xfont = blitz_getfont(dpy, def.font);
wmii_init_lock_modifiers(dpy, &valid_mask, &num_lock_mask); wmii_init_lock_modifiers(dpy, &valid_mask, &num_lock_mask);
init_screen(); init_screen();
scan_wins(); scan_wins();
#endif
/* main event loop */ /* main event loop */
errstr = ixp_server_loop(&srv); errstr = ixp_server_loop(&srv);
if(errstr) if(errstr)
@ -746,7 +740,7 @@ main(int argc, char *argv[])
cleanup(); cleanup();
/*XCloseDisplay(dpy);*/ XCloseDisplay(dpy);
return 0; return 0;
} }