move stuff to src

This commit is contained in:
Dylan Araps 2020-07-21 09:45:29 +03:00
parent 0e6e6f469f
commit d1535393aa
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
5 changed files with 55 additions and 37 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
sowm sowm
sowm.o
config.h config.h
.ccls-cache .ccls-cache
src/*.o

View File

@ -4,16 +4,22 @@ PREFIX = /usr/local
ALL_WARN = -Wall -Wextra -pedantic -Wmissing-prototypes -Wstrict-prototypes ALL_WARN = -Wall -Wextra -pedantic -Wmissing-prototypes -Wstrict-prototypes
ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -std=c99 $(ALL_WARN) ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -std=c99 $(ALL_WARN)
ALL_LDFLAGS = $(LDFLAGS) -lxcb ALL_LDFLAGS = $(LDFLAGS) $(LIBS) -lxcb
CC = cc CC = cc
all: sowm OBJ = src/event.o src/sowm.o
HDR = src/event.h
sowm: sowm.c Makefile .c.o:
$(CC) -O3 $(ALL_CFLAGS) -o $@ $< $(ALL_LDFLAGS) $(CC) $(ALL_CFLAGS) -c -o $@ $<
install: all sowm: $(OBJ)
$(CC) $(ALL_CFLAGS) -o $@ $(OBJ) $(ALL_LDFLAGS)
$(OBJ): $(HDR)
install: sowm
mkdir -p $(DESTDIR)/bin mkdir -p $(DESTDIR)/bin
cp sowm $(DESTDIR)/bin/sowm cp sowm $(DESTDIR)/bin/sowm
@ -23,4 +29,4 @@ uninstall:
clean: clean:
rm -f sowm *.o rm -f sowm *.o
.PHONY: all install uninstall clean .PHONY: install uninstall clean

23
src/event.c Normal file
View File

@ -0,0 +1,23 @@
#include "event.h"
void (*events[XCB_NO_OPERATION])(xcb_generic_event_t *) = {
[XCB_BUTTON_PRESS] = event_button_press,
[XCB_BUTTON_RELEASE] = event_button_release,
[XCB_CONFIGURE_REQUEST] = event_configure_request,
[XCB_KEY_PRESS] = event_key_press,
[XCB_CREATE_NOTIFY] = event_notify_create,
[XCB_DESTROY_NOTIFY] = event_notify_destroy,
[XCB_ENTER_NOTIFY] = event_notify_enter,
[XCB_MOTION_NOTIFY] = event_notify_motion
};
/* todo */
void event_button_press(xcb_generic_event_t *ev) { }
void event_button_release(xcb_generic_event_t *ev) { }
void event_configure_request(xcb_generic_event_t *ev) { }
void event_key_press(xcb_generic_event_t *ev) { }
void event_notify_create(xcb_generic_event_t *ev) { }
void event_notify_destroy(xcb_generic_event_t *ev) { }
void event_notify_enter(xcb_generic_event_t *ev) { }
void event_notify_motion(xcb_generic_event_t *ev) { }

17
src/event.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef SOWM_EVENT_H_INCLUDED
#define SOWM_EVENT_H_INCLUDED
#include <xcb/xcb.h>
void event_button_press(xcb_generic_event_t *ev);
void event_button_release(xcb_generic_event_t *ev);
void event_configure_request(xcb_generic_event_t *ev);
void event_key_press(xcb_generic_event_t *ev);
void event_notify_create(xcb_generic_event_t *ev);
void event_notify_destroy(xcb_generic_event_t *ev);
void event_notify_enter(xcb_generic_event_t *ev);
void event_notify_motion(xcb_generic_event_t *ev);
extern void (*events[XCB_NO_OPERATION])(xcb_generic_event_t *);
#endif

View File

@ -4,42 +4,14 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include "event.h"
static xcb_connection_t *dpy; static xcb_connection_t *dpy;
static xcb_screen_t *scr; static xcb_screen_t *scr;
static void init_wm(void); static void init_wm(void);
static void init_input(void); static void init_input(void);
static void event_button_press(xcb_generic_event_t *ev);
static void event_button_release(xcb_generic_event_t *ev);
static void event_configure_request(xcb_generic_event_t *ev);
static void event_key_press(xcb_generic_event_t *ev);
static void event_notify_create(xcb_generic_event_t *ev);
static void event_notify_destroy(xcb_generic_event_t *ev);
static void event_notify_enter(xcb_generic_event_t *ev);
static void event_notify_motion(xcb_generic_event_t *ev);
void (*events[XCB_NO_OPERATION])(xcb_generic_event_t *) = {
[XCB_BUTTON_PRESS] = event_button_press,
[XCB_BUTTON_RELEASE] = event_button_release,
[XCB_CONFIGURE_REQUEST] = event_configure_request,
[XCB_KEY_PRESS] = event_key_press,
[XCB_CREATE_NOTIFY] = event_notify_create,
[XCB_DESTROY_NOTIFY] = event_notify_destroy,
[XCB_ENTER_NOTIFY] = event_notify_enter,
[XCB_MOTION_NOTIFY] = event_notify_motion
};
/* todo */
static void event_button_press(xcb_generic_event_t *ev) { }
static void event_button_release(xcb_generic_event_t *ev) { }
static void event_configure_request(xcb_generic_event_t *ev) { }
static void event_key_press(xcb_generic_event_t *ev) { }
static void event_notify_create(xcb_generic_event_t *ev) { }
static void event_notify_destroy(xcb_generic_event_t *ev) { }
static void event_notify_enter(xcb_generic_event_t *ev) { }
static void event_notify_motion(xcb_generic_event_t *ev) { }
static void init_wm(void) { static void init_wm(void) {
uint32_t values[2]; uint32_t values[2];