norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uterm: move uterm_vt to the end

Browse Source 
Move uterm_vt to the end of the file to avoid forward declaration of
uterm_input.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-09-11 19:33:58 +02:00
parent 55e37dde77
commit 085aef9e38
1 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/uterm.h
View File

@ -44,45 +44,6 @@
#include <uterm_keysyms.h> #include <uterm_keysyms.h>
#include "eloop.h" #include "eloop.h"
/*
* Virtual Terminals
* Virtual terminals allow controlling multiple virtual terminals on one real
* terminal. It is multi-seat capable and fully asynchronous.
*/
struct uterm_input;
struct uterm_vt;
struct uterm_vt_master;
enum uterm_vt_action {
UTERM_VT_ACTIVATE,
UTERM_VT_DEACTIVATE,
};
enum uterm_vt_mode {
UTERM_VT_REAL,
UTERM_VT_FAKE,
UTERM_VT_DEAD,
};
typedef int (*uterm_vt_cb) (struct uterm_vt *vt, unsigned int action,
void *data);
int uterm_vt_master_new(struct uterm_vt_master **out,
struct ev_eloop *eloop);
void uterm_vt_master_ref(struct uterm_vt_master *vtm);
void uterm_vt_master_unref(struct uterm_vt_master *vtm);
int uterm_vt_allocate(struct uterm_vt_master *vt, struct uterm_vt **out,
const char *seat, struct uterm_input *input,
uterm_vt_cb cb, void *data);
void uterm_vt_deallocate(struct uterm_vt *vt);
void uterm_vt_ref(struct uterm_vt *vt);
void uterm_vt_unref(struct uterm_vt *vt);
int uterm_vt_activate(struct uterm_vt *vt);
int uterm_vt_deactivate(struct uterm_vt *vt);
/* /*
* Video Control * Video Control
* Linux provides 2 famous ways to access the video hardware: fbdev and drm * Linux provides 2 famous ways to access the video hardware: fbdev and drm
@ -341,6 +302,44 @@ void uterm_input_keysym_to_string(struct uterm_input *input,
int uterm_input_string_to_keysym(struct uterm_input *input, const char *n, int uterm_input_string_to_keysym(struct uterm_input *input, const char *n,
uint32_t *out); uint32_t *out);
/*
* Virtual Terminals
* Virtual terminals allow controlling multiple virtual terminals on one real
* terminal. It is multi-seat capable and fully asynchronous.
*/
struct uterm_vt;
struct uterm_vt_master;
enum uterm_vt_action {
UTERM_VT_ACTIVATE,
UTERM_VT_DEACTIVATE,
};
enum uterm_vt_mode {
UTERM_VT_REAL,
UTERM_VT_FAKE,
UTERM_VT_DEAD,
};
typedef int (*uterm_vt_cb) (struct uterm_vt *vt, unsigned int action,
void *data);
int uterm_vt_master_new(struct uterm_vt_master **out,
struct ev_eloop *eloop);
void uterm_vt_master_ref(struct uterm_vt_master *vtm);
void uterm_vt_master_unref(struct uterm_vt_master *vtm);
int uterm_vt_allocate(struct uterm_vt_master *vt, struct uterm_vt **out,
const char *seat, struct uterm_input *input,
uterm_vt_cb cb, void *data);
void uterm_vt_deallocate(struct uterm_vt *vt);
void uterm_vt_ref(struct uterm_vt *vt);
void uterm_vt_unref(struct uterm_vt *vt);
int uterm_vt_activate(struct uterm_vt *vt);
int uterm_vt_deactivate(struct uterm_vt *vt);
/* /*
* System Monitor * System Monitor
* This watches the system for new seats, graphics devices or other devices that * This watches the system for new seats, graphics devices or other devices that