awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[screen] Rename ScreensInfo to screen_info_t 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-04-28 15:33:49 +02:00
parent 33837d77a1
commit 04ea13c205
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awesome-menu.c
View File

@ -1241,7 +1241,7 @@ main(int argc, char **argv)
ssize_t len; ssize_t len;
const char *shell = getenv("SHELL"); const char *shell = getenv("SHELL");
area_t geometry = { 0, 0, 0, 0, NULL, NULL }; area_t geometry = { 0, 0, 0, 0, NULL, NULL };
ScreensInfo *si; screens_info_t *si;
static struct option long_options[] = static struct option long_options[] =
{ {
{"help", 0, NULL, 'h'}, {"help", 0, NULL, 'h'},

2
awesome-message.c
View File

@ -128,7 +128,7 @@ main(int argc, char **argv)
int opt, ret, screen = 0, delay = 0; int opt, ret, screen = 0, delay = 0;
xcb_query_pointer_reply_t *xqp = NULL; xcb_query_pointer_reply_t *xqp = NULL;
char *configfile = NULL; char *configfile = NULL;
ScreensInfo *si; screens_info_t *si;
static struct option long_options[] = static struct option long_options[] =
{ {
{"help", 0, NULL, 'h'}, {"help", 0, NULL, 'h'},

10
common/xscreen.c
View File

@ -32,7 +32,7 @@
* \return screen number or DefaultScreen of disp on no match * \return screen number or DefaultScreen of disp on no match
*/ */
int int
screen_get_bycoord(ScreensInfo *si, int screen, int x, int y) screen_get_bycoord(screens_info_t *si, int screen, int x, int y)
{ {
int i; int i;
@ -63,16 +63,16 @@ screen_xsitoarea(xcb_xinerama_screen_info_t si)
} }
void void
screensinfo_delete(ScreensInfo **si) screensinfo_delete(screens_info_t **si)
{ {
p_delete(&(*si)->geometry); p_delete(&(*si)->geometry);
p_delete(si); p_delete(si);
} }
ScreensInfo * screens_info_t *
screensinfo_new(xcb_connection_t *conn) screensinfo_new(xcb_connection_t *conn)
{ {
ScreensInfo *si; screens_info_t *si;
xcb_xinerama_query_screens_reply_t *xsq; xcb_xinerama_query_screens_reply_t *xsq;
xcb_xinerama_screen_info_t *xsi; xcb_xinerama_screen_info_t *xsi;
int xinerama_screen_number, screen, screen_to_test; int xinerama_screen_number, screen, screen_to_test;
@ -80,7 +80,7 @@ screensinfo_new(xcb_connection_t *conn)
bool drop; bool drop;
xcb_xinerama_is_active_reply_t *xia = NULL; xcb_xinerama_is_active_reply_t *xia = NULL;
si = p_new(ScreensInfo, 1); si = p_new(screens_info_t, 1);
/* Check for extension before checking for Xinerama */ /* Check for extension before checking for Xinerama */
if(xcb_get_extension_data(conn, &xcb_xinerama_id)->present) if(xcb_get_extension_data(conn, &xcb_xinerama_id)->present)

8
common/xscreen.h
View File

@ -29,11 +29,11 @@ typedef struct
int nscreen; int nscreen;
bool xinerama_is_active; bool xinerama_is_active;
area_t *geometry; area_t *geometry;
} ScreensInfo; } screens_info_t;
int screen_get_bycoord(ScreensInfo *, int, int, int); int screen_get_bycoord(screens_info_t *, int, int, int);
void screensinfo_delete(ScreensInfo **); void screensinfo_delete(screens_info_t **);
ScreensInfo * screensinfo_new(xcb_connection_t *); screens_info_t * screensinfo_new(xcb_connection_t *);
#endif #endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

2
structs.h
View File

@ -338,7 +338,7 @@ struct AwesomeConf
/** Logical screens */ /** Logical screens */
VirtScreen *screens; VirtScreen *screens;
/** Screens info */ /** Screens info */
ScreensInfo *screens_info; screens_info_t *screens_info;
/** Rules list */ /** Rules list */
rule_t *rules; rule_t *rules;
/** Keys bindings list */ /** Keys bindings list */