Change awesome_config -> AwesomeConf.

All other struct definitions in the project follow this naming convention.
This commit is contained in:
Aldo Cortesi 2007-12-19 14:46:44 +11:00 committed by Julien Danjou
parent 76a7d91f39
commit 7190e4fa48
23 changed files with 25 additions and 25 deletions

View File

@ -52,7 +52,7 @@
static int (*xerrorxlib) (Display *, XErrorEvent *); static int (*xerrorxlib) (Display *, XErrorEvent *);
static Bool running = True; static Bool running = True;
awesome_config globalconf; AwesomeConf globalconf;
static inline void static inline void
cleanup_buttons(Button *buttons) cleanup_buttons(Button *buttons)

View File

@ -36,7 +36,7 @@
#include "layouts/floating.h" #include "layouts/floating.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Load windows properties, restoring client's tag /** Load windows properties, restoring client's tag
* and floating state before awesome was restarted if any * and floating state before awesome was restarted if any

View File

@ -36,7 +36,7 @@
#define AWESOME_CONFIG_FILE ".awesomerc" #define AWESOME_CONFIG_FILE ".awesomerc"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Link a name to a key symbol */ /** Link a name to a key symbol */
typedef struct typedef struct

View File

@ -49,7 +49,7 @@ struct Rule
Rule *next; Rule *next;
}; };
typedef struct awesome_config awesome_config; typedef struct AwesomeConf AwesomeConf;
typedef struct Layout Layout; typedef struct Layout Layout;
struct Layout struct Layout
@ -232,7 +232,7 @@ struct Widget
/** Main configuration structure */ /** Main configuration structure */
struct awesome_config struct AwesomeConf
{ {
/** Display ref */ /** Display ref */
Display *display; Display *display;

View File

@ -38,7 +38,7 @@
#include "layouts/floating.h" #include "layouts/floating.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
#define CLEANMASK(mask) (mask & ~(globalconf.numlockmask | LockMask)) #define CLEANMASK(mask) (mask & ~(globalconf.numlockmask | LockMask))

View File

@ -24,7 +24,7 @@
#include "layout.h" #include "layout.h"
#include "focus.h" #include "focus.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
static FocusList * static FocusList *
focus_get_node_by_client(Client *c) focus_get_node_by_client(Client *c)

View File

@ -34,7 +34,7 @@
#include "layouts/fibonacci.h" #include "layouts/fibonacci.h"
#include "layouts/floating.h" #include "layouts/floating.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
const NameFuncLink LayoutsList[] = const NameFuncLink LayoutsList[] =
{ {

View File

@ -24,7 +24,7 @@
#include "util.h" #include "util.h"
#include "layouts/fibonacci.h" #include "layouts/fibonacci.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
static void static void
layout_fibonacci(int screen, int shape) layout_fibonacci(int screen, int shape)

View File

@ -22,7 +22,7 @@
#include "tag.h" #include "tag.h"
#include "layouts/floating.h" #include "layouts/floating.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
void void
layout_floating(int screen) layout_floating(int screen)

View File

@ -24,7 +24,7 @@
#include "util.h" #include "util.h"
#include "layouts/max.h" #include "layouts/max.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
void void
layout_max(int screen) layout_max(int screen)

View File

@ -28,7 +28,7 @@
#include "layout.h" #include "layout.h"
#include "layouts/tile.h" #include "layouts/tile.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
void void
uicb_tag_setnmaster(int screen, char * arg) uicb_tag_setnmaster(int screen, char * arg)

View File

@ -28,7 +28,7 @@
#include "window.h" #include "window.h"
#include "layouts/floating.h" #include "layouts/floating.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Move client with mouse /** Move client with mouse
* \param screen Screen ID * \param screen Screen ID

View File

@ -26,7 +26,7 @@
#include "focus.h" #include "focus.h"
#include "statusbar.h" #include "statusbar.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Get screens info /** Get screens info
* \param screen Screen number * \param screen Screen number

View File

@ -30,7 +30,7 @@
#include "tag.h" #include "tag.h"
#include "widget.h" #include "widget.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
void void
statusbar_draw(int screen) statusbar_draw(int screen)

2
tag.c
View File

@ -28,7 +28,7 @@
#include "util.h" #include "util.h"
#include "rules.h" #include "rules.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
static void static void
detach_tagclientlink(int screen, TagClientLink *tc) detach_tagclientlink(int screen, TagClientLink *tc)

4
uicb.c
View File

@ -32,7 +32,7 @@
#include "focus.h" #include "focus.h"
#include "layouts/tile.h" #include "layouts/tile.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
const NameFuncLink UicbList[] = const NameFuncLink UicbList[] =
{ {
@ -86,7 +86,7 @@ const NameFuncLink UicbList[] =
}; };
static int static int
run_uicb(char *cmd, awesome_config *awesomeconf __attribute ((unused))) run_uicb(char *cmd, AwesomeConf *awesomeconf __attribute ((unused)))
{ {
char *p; char *p;
const char *arg; const char *arg;

View File

@ -3,7 +3,7 @@
#include "widget.h" #include "widget.h"
#include "statusbar.h" #include "statusbar.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
const NameFuncLink WidgetList[] = const NameFuncLink WidgetList[] =
{ {

View File

@ -5,7 +5,7 @@
#include "layout.h" #include "layout.h"
#include "focus.h" #include "focus.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
static int static int
focustitle_draw(Widget *widget, DrawCtx *ctx, int offset, int used) focustitle_draw(Widget *widget, DrawCtx *ctx, int offset, int used)

View File

@ -3,7 +3,7 @@
#include "util.h" #include "util.h"
#include "layout.h" #include "layout.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
static int static int
layoutinfo_draw(Widget *widget, layoutinfo_draw(Widget *widget,

View File

@ -4,7 +4,7 @@
#include "widget.h" #include "widget.h"
#include "tag.h" #include "tag.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Check if at least one client is tagged with tag number t and is on screen /** Check if at least one client is tagged with tag number t and is on screen
* screen * screen

View File

@ -3,7 +3,7 @@
#include "widget.h" #include "widget.h"
#include "xutil.h" #include "xutil.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
typedef struct Data Data; typedef struct Data Data;

View File

@ -25,7 +25,7 @@
#include "window.h" #include "window.h"
#include "util.h" #include "util.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Set client WM_STATE property /** Set client WM_STATE property
* \param disp Display ref * \param disp Display ref

View File

@ -27,7 +27,7 @@
#include "xutil.h" #include "xutil.h"
extern awesome_config globalconf; extern AwesomeConf globalconf;
/** Execute another process, replacing the current instance of Awesome /** Execute another process, replacing the current instance of Awesome
* \param screen Screen ID * \param screen Screen ID