From 85ceaa232a0e8e466a205297920015da19030c06 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Mon, 9 Mar 2020 22:05:44 -0400 Subject: [PATCH] coalesce files --- disp.c | 37 +++++++++++++++++++++++++++------ error.c | 64 --------------------------------------------------------- lwm.c | 6 ++++++ lwm.h | 10 +++------ 4 files changed, 40 insertions(+), 77 deletions(-) delete mode 100644 error.c diff --git a/disp.c b/disp.c index 36266d4..36c9e83 100644 --- a/disp.c +++ b/disp.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -83,6 +84,8 @@ static Disp disps[] = {NoExpose, 0}, }; +int ignore_badwindow; + extern void dispatch(XEvent * ev) { Disp * p; @@ -142,11 +145,6 @@ buttonpress(XEvent *ev) { c = Client_Get(e->window); - /*move this test up to disable scroll to focus*/ - if (e->button >= 4 && e->button <= 7) { - return; - } - if (c && c == current && (e->window == c->parent)) { /* Click went to our frame around a client. */ if (e->button == Button1) { @@ -188,7 +186,6 @@ buttonrelease(XEvent *ev) { static void circulaterequest(XEvent *ev) { XCirculateRequestEvent * e = &ev->xcirculaterequest; Client * c = Client_Get(e->window); - if (c == 0) { if (e->place == PlaceOnTop) { XRaiseWindow(e->display, e->window); @@ -638,3 +635,31 @@ reshaping_motionnotify(XEvent* ev) { sendConfigureNotify(current); } } + +int +errorHandler(Display *d, XErrorEvent *e) { + char msg[80]; + char req[80]; + char number[80]; + + if (mode == wm_initialising && + e->request_code == X_ChangeWindowAttributes && + e->error_code == BadAccess) + panic("another window manager is already running."); + + if (ignore_badwindow && + (e->error_code == BadWindow || e->error_code == BadColor)) + return 0; + + XGetErrorText(d, e->error_code, msg, sizeof(msg)); + sprintf(number, "%d", e->request_code); + XGetErrorDatabaseText(d, "XRequest", number, number, req, sizeof(req)); + + fprintf(stderr, "%s: protocol request %s on resource %#x failed: %s\n", + argv0, req, (unsigned int) e->resourceid, msg); + + if (mode == wm_initialising) + panic("can't initialise."); + + return 0; +} diff --git a/error.c b/error.c deleted file mode 100644 index 9c7e4cd..0000000 --- a/error.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * lwm, a window manager for X11 - * Copyright (C) 1997-2016 Elliott Hughes, James Carter - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include - -#include -#include -#include -#include - -#include "lwm.h" - -int ignore_badwindow; - -void -panic(char *s) { - fprintf(stderr, "%s: %s\n", argv0, s); - exit(EXIT_FAILURE); -} - -int -errorHandler(Display *d, XErrorEvent *e) { - char msg[80]; - char req[80]; - char number[80]; - - if (mode == wm_initialising && - e->request_code == X_ChangeWindowAttributes && - e->error_code == BadAccess) - panic("another window manager is already running."); - - if (ignore_badwindow && - (e->error_code == BadWindow || e->error_code == BadColor)) - return 0; - - XGetErrorText(d, e->error_code, msg, sizeof(msg)); - sprintf(number, "%d", e->request_code); - XGetErrorDatabaseText(d, "XRequest", number, number, req, sizeof(req)); - - fprintf(stderr, "%s: protocol request %s on resource %#x failed: %s\n", - argv0, req, (unsigned int) e->resourceid, msg); - - if (mode == wm_initialising) - panic("can't initialise."); - - return 0; -} diff --git a/lwm.c b/lwm.c index b118fde..2cdd2c1 100644 --- a/lwm.c +++ b/lwm.c @@ -67,6 +67,12 @@ char *argv0; static void initScreen(void); +void +panic(char *s) { + fprintf(stderr, "%s: %s\n", argv0, s); + exit(EXIT_FAILURE); +} + /*ARGSUSED*/ extern int main(int argc, char *argv[]) { diff --git a/lwm.h b/lwm.h index aed2bdb..0f87626 100644 --- a/lwm.h +++ b/lwm.h @@ -91,12 +91,12 @@ typedef struct Client { #define ButtonMask (ButtonPressMask | ButtonReleaseMask) /* lwm.c */ +extern int ignore_badwindow; extern char *font_name; extern int border; extern Mode mode; extern int start_x; extern int start_y; - extern Display * dpy; extern Window root; extern int display_width; /* The width of the screen. */ @@ -108,7 +108,6 @@ extern unsigned long gray; /* Gray pixel value. */ extern Cursor root_cursor; extern Cursor box_cursor; extern Cursor cursor_map[E_LAST]; - extern XFontSet font_set; extern XFontSetExtents *font_set_ext; extern Atom wm_state; @@ -121,6 +120,8 @@ extern int titleHeight(void); extern int titleWidth(XFontSet font_set, Client *c); extern int ascent(XFontSetExtents *font_set_ext); extern void scanWindowTree(void); +extern int errorHandler(Display *, XErrorEvent *); +extern void panic(char*); /* client.c */ extern Edge interacting_edge; @@ -151,11 +152,6 @@ extern void initialiseCursors(void); /* disp.c */ extern void dispatch(XEvent *); -/* error.c */ -extern int ignore_badwindow; -extern int errorHandler(Display *, XErrorEvent *); -extern void panic(char*); - /* manage.c */ extern void getWindowName(Client *); extern void getNormalHints(Client *); -- 2.54.0