qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests 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 3668d8b165
commit 9ced81cc97
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/cwm/calmwm.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: calmwm.c,v 1.101 2017/12/22 21:21:44 okan Exp $
* $OpenBSD: calmwm.c,v 1.102 2017/12/22 21:27:45 okan Exp $
*/
#include <sys/types.h>
@ -46,7 +46,7 @@ volatile sig_atomic_t cwm_status;
static void sighdlr(int);
static int x_errorhandler(Display *, XErrorEvent *);
static void x_init(const char *);
static int x_init(const char *);
static void x_teardown(void);
static int x_wmerrorhandler(Display *, XErrorEvent *);
@ -55,7 +55,7 @@ main(int argc, char **argv)
{
const char *conf_file = NULL;
char *conf_path, *display_name = NULL;
int ch;
int ch, xfd;
struct passwd *pw;
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
@ -108,7 +108,7 @@ main(int argc, char **argv)
warnx("config file %s has errors", conf_path);
free(conf_path);
x_init(display_name);
xfd = x_init(display_name);
cwm_status = CWM_RUNNING;
if (pledge("stdio rpath proc exec", NULL) == -1)
@ -123,7 +123,7 @@ main(int argc, char **argv)
return(0);
}
static void
static int
x_init(const char *dpyname)
{
int i;
@ -143,6 +143,8 @@ x_init(const char *dpyname)
for (i = 0; i < ScreenCount(X_Dpy); i++)
screen_init(i);
return ConnectionNumber(X_Dpy);
}
static void