mirror of https://codeberg.org/nsxiv/nsxiv
Option handling, merged app.c & events.c into main.c
parent
79c7e6178e
commit
a7e30bb081
@ -1,39 +0,0 @@
|
||||
/* sxiv: app.h
|
||||
* Copyright (c) 2011 Bert Muennich <muennich at informatik.hu-berlin.de>
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef APP_H
|
||||
#define APP_H
|
||||
|
||||
#include "image.h"
|
||||
#include "window.h"
|
||||
|
||||
typedef struct app_s {
|
||||
char **filenames;
|
||||
unsigned int filecnt;
|
||||
unsigned int fileidx;
|
||||
img_t img;
|
||||
win_t win;
|
||||
} app_t;
|
||||
|
||||
void app_init(app_t*);
|
||||
void app_run(app_t*);
|
||||
void app_quit(app_t*);
|
||||
|
||||
void app_load_image(app_t*);
|
||||
|
||||
#endif /* APP_H */
|
@ -1,72 +0,0 @@
|
||||
/* sxiv: events.c
|
||||
* Copyright (c) 2011 Bert Muennich <muennich at informatik.hu-berlin.de>
|
||||
*
|
||||
* 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 <stdlib.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/keysym.h>
|
||||
|
||||
#include "events.h"
|
||||
#include "window.h"
|
||||
|
||||
void on_keypress(app_t*, XEvent*);
|
||||
void on_configurenotify(app_t*, XEvent*);
|
||||
void on_expose(app_t*, XEvent*);
|
||||
|
||||
static void (*handler[LASTEvent])(app_t*, XEvent*) = {
|
||||
[Expose] = on_expose,
|
||||
[ConfigureNotify] = on_configurenotify,
|
||||
[KeyPress] = on_keypress
|
||||
};
|
||||
|
||||
void event_loop(app_t *app) {
|
||||
XEvent ev;
|
||||
|
||||
while (!XNextEvent(app->win.env.dpy, &ev)) {
|
||||
if (handler[ev.type])
|
||||
handler[ev.type](app, &ev);
|
||||
}
|
||||
}
|
||||
|
||||
void on_keypress(app_t *app, XEvent *ev) {
|
||||
KeySym keysym;
|
||||
|
||||
if (!app || !ev)
|
||||
return;
|
||||
|
||||
keysym = XLookupKeysym(&ev->xkey, 0);
|
||||
|
||||
switch (keysym) {
|
||||
case XK_Escape:
|
||||
app_quit(app);
|
||||
exit(1);
|
||||
case XK_q:
|
||||
app_quit(app);
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
void on_configurenotify(app_t *app, XEvent *ev) {
|
||||
if (!app || !ev)
|
||||
return;
|
||||
|
||||
win_configure(&app->win, &ev->xconfigure);
|
||||
}
|
||||
|
||||
void on_expose(app_t *app, XEvent *ev) {
|
||||
}
|
Loading…
Reference in New Issue