aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cmd/rio/client.c1
-rw-r--r--src/cmd/rio/color.c1
-rw-r--r--src/cmd/rio/cursor.c13
-rw-r--r--src/cmd/rio/error.c1
-rw-r--r--src/cmd/rio/event.c4
-rw-r--r--src/cmd/rio/fns.h164
-rw-r--r--src/cmd/rio/grab.c1
-rw-r--r--src/cmd/rio/main.c3
-rw-r--r--src/cmd/rio/manage.c2
-rw-r--r--src/cmd/rio/menu.c1
10 files changed, 98 insertions, 93 deletions
diff --git a/src/cmd/rio/client.c b/src/cmd/rio/client.c
index d78be626..572383ee 100644
--- a/src/cmd/rio/client.c
+++ b/src/cmd/rio/client.c
@@ -6,6 +6,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
#include "dat.h"
#include "fns.h"
diff --git a/src/cmd/rio/color.c b/src/cmd/rio/color.c
index 489c68e8..26989fe9 100644
--- a/src/cmd/rio/color.c
+++ b/src/cmd/rio/color.c
@@ -4,6 +4,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
#include "dat.h"
#include "fns.h"
diff --git a/src/cmd/rio/cursor.c b/src/cmd/rio/cursor.c
index 3aff91bb..5f35cc4a 100644
--- a/src/cmd/rio/cursor.c
+++ b/src/cmd/rio/cursor.c
@@ -3,15 +3,17 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
#include "dat.h"
#include "fns.h"
-typedef struct {
+typedef struct Cursordata Cursordata;
+struct Cursordata {
int width;
int hot[2];
unsigned char mask[64];
unsigned char fore[64];
-} Cursordata;
+};
Cursordata bigarrow = {
16,
@@ -157,9 +159,7 @@ static char grey_bits[] = {
static XColor bl, wh;
Cursor
-getcursor(c, s)
-Cursordata *c;
-ScreenInfo *s;
+getcursor(Cursordata *c, ScreenInfo *s)
{
Pixmap f, m;
@@ -172,8 +172,7 @@ ScreenInfo *s;
}
void
-initcurs(s)
-ScreenInfo *s;
+initcurs(ScreenInfo *s)
{
XColor dummy;
diff --git a/src/cmd/rio/error.c b/src/cmd/rio/error.c
index fa2493f3..ce119726 100644
--- a/src/cmd/rio/error.c
+++ b/src/cmd/rio/error.c
@@ -5,6 +5,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xproto.h>
+#include <X11/extensions/shape.h>
#include "dat.h"
#include "fns.h"
diff --git a/src/cmd/rio/event.c b/src/cmd/rio/event.c
index 0035cf34..8b419c6f 100644
--- a/src/cmd/rio/event.c
+++ b/src/cmd/rio/event.c
@@ -119,7 +119,7 @@ configurereq(XConfigureRequestEvent *e)
/* we don't set curtime as nothing here uses it */
c = getclient(e->window, 0);
- trace("configurereq", c, e);
+ trace("configurereq", c, (XEvent *)e);
e->value_mask &= ~CWSibling;
@@ -190,7 +190,7 @@ mapreq(XMapRequestEvent *e)
curtime = CurrentTime;
c = getclient(e->window, 0);
- trace("mapreq", c, e);
+ trace("mapreq", c, (XEvent *)e);
if(c == 0 || c->window != e->window){
/* workaround for stupid NCDware */
diff --git a/src/cmd/rio/fns.h b/src/cmd/rio/fns.h
index 4766f1d8..60ba9d72 100644
--- a/src/cmd/rio/fns.h
+++ b/src/cmd/rio/fns.h
@@ -7,111 +7,111 @@
#endif
#define setstate setstaterio
+typedef struct Cursordata Cursordata;
/* color.c */
unsigned long colorpixel(Display*, ScreenInfo*, int, unsigned long, unsigned long);
/* main.c */
-void usage();
-void initscreen();
-ScreenInfo *getscreen();
-Time timestamp();
-void sendcmessage();
-void sendconfig();
-void sighandler();
-void getevent();
-void cleanup();
+void usage(void);
+void initscreen(ScreenInfo*, int, int);
+ScreenInfo *getscreen(Window);
+Time timestamp(void);
+void sendcmessage(Window, Atom, long, int, int);
+void sendconfig(Client *);
+void sighandler(int);
+void getevent(XEvent *);
+void cleanup(void);
/* event.c */
-void mainloop();
-void configurereq();
-void mapreq();
-void circulatereq();
-void unmap();
-void newwindow();
-void destroy();
-void clientmesg();
-void cmap();
-void property();
-void shapenotify();
-void enter();
-void leave();
-void focusin();
-void reparent();
-void motionnotify();
-BorderOrient borderorient();
+void mainloop(int);
+void configurereq(XConfigureRequestEvent*);
+void mapreq(XMapRequestEvent*);
+void circulatereq(XCirculateRequestEvent*);
+void unmap(XUnmapEvent*);
+void newwindow(XCreateWindowEvent*);
+void destroy(Window);
+void clientmesg(XClientMessageEvent*);
+void cmap(XColormapEvent*);
+void property(XPropertyEvent*);
+void shapenotify(XShapeEvent*);
+void enter(XCrossingEvent*);
+void leave(XCrossingEvent*);
+void focusin(XFocusChangeEvent*);
+void reparent(XReparentEvent*);
+void motionnotify(XMotionEvent*);
+BorderOrient borderorient(Client*, int, int);
/* manage.c */
-int manage();
-void scanwins();
-void setshape();
-void withdraw();
-void gravitate();
-void cmapfocus();
-void cmapnofocus();
-void getcmaps();
-int _getprop();
-char *getprop();
-Window getwprop();
-int getiprop();
-int getstate();
-void setstate();
-void setlabel();
-void getproto();
-void gettrans();
+int manage(Client*, int);
+void scanwins(ScreenInfo*);
+void setshape(Client*);
+void withdraw(Client*);
+void cmapfocus(Client*);
+void cmapnofocus(ScreenInfo*);
+void getcmaps(Client*);
+int _getprop(Window, Atom, Atom, long, unsigned char **);
+char *getprop(Window, Atom);
+Window getwprop(Window, Atom);
+int getiprop(Window, Atom);
+int getstate(Window, int*);
+void setstate(Client*, int);
+void setlabel(Client*);
+void getproto(Client*);
+void gettrans(Client*);
/* key.c */
-void keypress();
-void keyrelease();
-void keysetup();
+void keypress(XKeyEvent*);
+void keyrelease(XKeyEvent*);
+void keysetup(void);
/* menu.c */
-void button();
-void spawn();
-void reshape();
-void move();
-void delete();
-void hide();
-void unhide();
-void unhidec();
-void renamec();
-void button2();
-void initb2menu();
-void switch_to();
-void switch_to_c();
+void button(XButtonEvent*);
+void spawn(ScreenInfo*);
+void reshape(Client*, int, int (*)(Client*, int, XButtonEvent*), XButtonEvent*);
+void move(Client*, int);
+void delete(Client*, int);
+void hide(Client*);
+void unhide(int, int);
+void unhidec(Client*, int);
+void renamec(Client*, char*);
+void button2(int);
+void initb2menu(int);
+void switch_to(int);
+void switch_to_c(int, Client*);
/* client.c */
-void setactive();
-void draw_border();
-void active();
-void nofocus();
-void top();
-Client *getclient();
-void rmclient();
-void dump_revert();
-void dump_clients();
-void shuffle(int);
+void setactive(Client*, int);
+void draw_border(Client*, int);
+void active(Client*);
+void nofocus(void);
+void top(Client*);
+Client *getclient(Window, int);
+void rmclient(Client*);
+void dump_revert(void);
+void dump_clients(void);
+void shuffle(int);
/* grab.c */
-int menuhit();
-Client *selectwin();
-int sweep();
-int drag();
-int pull();
-void getmouse();
-void setmouse();
+int menuhit(XButtonEvent*, Menu*);
+Client *selectwin(int, int*, ScreenInfo*);
+int sweep(Client*, int, XButtonEvent*);
+int drag(Client*, int);
+int pull(Client*, int, XButtonEvent*);
+void getmouse(int*, int*, ScreenInfo*);
+void setmouse(int, int, ScreenInfo*);
/* error.c */
-int handler();
-void fatal();
-void graberror();
-void showhints();
-void dotrace();
+int handler(Display*, XErrorEvent*);
+void fatal(char*);
+void graberror(char*, int);
+void dotrace(char*, Client*, XEvent*);
/* cursor.c */
-void initcurs();
+Cursor getcursor(Cursordata*, ScreenInfo*);
+void initcurs(ScreenInfo*);
void ShowEvent(XEvent*);
diff --git a/src/cmd/rio/grab.c b/src/cmd/rio/grab.c
index 85aa570c..29b1e678 100644
--- a/src/cmd/rio/grab.c
+++ b/src/cmd/rio/grab.c
@@ -4,6 +4,7 @@
#include <X11/Xos.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
#include "dat.h"
#include "fns.h"
diff --git a/src/cmd/rio/main.c b/src/cmd/rio/main.c
index 09c1316e..acb5391e 100644
--- a/src/cmd/rio/main.c
+++ b/src/cmd/rio/main.c
@@ -471,8 +471,9 @@ sendconfig(Client *c)
}
void
-sighandler(void)
+sighandler(int _signo)
{
+ (void)_signo;
signalled = 1;
}
diff --git a/src/cmd/rio/manage.c b/src/cmd/rio/manage.c
index 07c9d479..1c82cc3f 100644
--- a/src/cmd/rio/manage.c
+++ b/src/cmd/rio/manage.c
@@ -115,7 +115,7 @@ manage(Client *c, int mapped)
nwin %= 10;
}
- if(c->is9term && !(fixsize ? drag(c, Button3) : sweep(c, Button3))){
+ if(c->is9term && !(fixsize ? drag(c, Button3) : sweep(c, Button3, 0))){
ScreenInfo *screen = c->screen;
XKillClient(dpy, c->window);
rmclient(c);
diff --git a/src/cmd/rio/menu.c b/src/cmd/rio/menu.c
index e7a37c68..bf092eac 100644
--- a/src/cmd/rio/menu.c
+++ b/src/cmd/rio/menu.c
@@ -14,6 +14,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
#include "dat.h"
#include "fns.h"
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 05:23:24 +0000