mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Return the connection number for the display.

Browse Source
This commit is contained in:
okan 2017-12-22 21:27:45 +00:00
parent c5d03b0853
commit dfaf44c0ac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calmwm.c
View File

@ -46,7 +46,7 @@ volatile sig_atomic_t cwm_status;
static void sighdlr(int); static void sighdlr(int);
static int x_errorhandler(Display *, XErrorEvent *); static int x_errorhandler(Display *, XErrorEvent *);
static void x_init(const char *); static int x_init(const char *);
static void x_teardown(void); static void x_teardown(void);
static int x_wmerrorhandler(Display *, XErrorEvent *); static int x_wmerrorhandler(Display *, XErrorEvent *);
@ -55,7 +55,7 @@ main(int argc, char **argv)
{ {
const char *conf_file = NULL; const char *conf_file = NULL;
char *conf_path, *display_name = NULL; char *conf_path, *display_name = NULL;
int ch; int ch, xfd;
struct passwd *pw; struct passwd *pw;
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
@ -108,7 +108,7 @@ main(int argc, char **argv)
warnx("config file %s has errors", conf_path); warnx("config file %s has errors", conf_path);
free(conf_path); free(conf_path);
x_init(display_name); xfd = x_init(display_name);
cwm_status = CWM_RUNNING; cwm_status = CWM_RUNNING;
if (pledge("stdio rpath proc exec", NULL) == -1) if (pledge("stdio rpath proc exec", NULL) == -1)
@ -123,7 +123,7 @@ main(int argc, char **argv)
return(0); return(0);
} }
static void static int
x_init(const char *dpyname) x_init(const char *dpyname)
{ {
int i; int i;
@ -143,6 +143,8 @@ x_init(const char *dpyname)
for (i = 0; i < ScreenCount(X_Dpy); i++) for (i = 0; i < ScreenCount(X_Dpy); i++)
screen_init(i); screen_init(i);
return ConnectionNumber(X_Dpy);
} }
static void static void