Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename screen uicb correctly

This commit is contained in:
Julien Danjou 2007-11-14 18:16:43 +01:00
parent 895c3848eb
commit 7c533b8b40
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awesomerc
View File

@ -242,13 +242,13 @@ keys
{
modkey = {"Mod4", "Control"}
key = "j"
command = "focusnextscreen"
command = "screen_focusnext"
}
key
{
modkey = {"Mod4", "Control"}
key = "k"
command = "focusprevscreen"
command = "screen_focusprev"
}
key
{

6
config.c
View File

@ -92,9 +92,9 @@ const NameFuncLink UicbList[] = {
{"tag_setnmaster", uicb_tag_setnmaster},
{"tag_setncol", uicb_tag_setncol},
/* screen.c */
{"focusnextscreen", uicb_focusnextscreen},
{"focusprevscreen", uicb_focusprevscreen},
{"movetoscreen", uicb_movetoscreen},
{"screen_focusnext", uicb_screen_focusnext},
{"screen_focusprev", uicb_screen_focusprev},
{"client_movetoscreen", uicb_client_movetoscreen},
/* awesome.c */
{"quit", uicb_quit},
/* statusbar.c */

12
screen.c
View File

@ -216,8 +216,8 @@ move_mouse_pointer_to_screen(Display *disp, int screen)
}
void
uicb_focusnextscreen(awesome_config * awesomeconf,
const char *arg __attribute__ ((unused)))
uicb_screen_focusnext(awesome_config * awesomeconf,
const char *arg __attribute__ ((unused)))
{
Client *c;
int next_screen = awesomeconf->screen + 1 >= get_screen_count(awesomeconf->display) ? 0 : awesomeconf->screen + 1;
@ -232,8 +232,8 @@ uicb_focusnextscreen(awesome_config * awesomeconf,
}
void
uicb_focusprevscreen(awesome_config * awesomeconf,
const char *arg __attribute__ ((unused)))
uicb_screen_focusprev(awesome_config * awesomeconf,
const char *arg __attribute__ ((unused)))
{
Client *c;
int prev_screen = awesomeconf->screen - 1 < 0 ? get_screen_count(awesomeconf->display) - 1 : awesomeconf->screen - 1;
@ -253,8 +253,8 @@ uicb_focusprevscreen(awesome_config * awesomeconf,
* \ingroup ui_callback
*/
void
uicb_movetoscreen(awesome_config * awesomeconf,
const char *arg)
uicb_client_movetoscreen(awesome_config * awesomeconf,
const char *arg)
{
int new_screen, prev_screen;
Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;

7
screen.h
View File

@ -34,9 +34,10 @@ int get_screen_bycoord(Display *, int, int);
int get_screen_count(Display *);
int get_phys_screen(Display *, int);
void move_client_to_screen(Client *, awesome_config *, Bool);
UICB_PROTO(uicb_focusnextscreen);
UICB_PROTO(uicb_focusprevscreen);
UICB_PROTO(uicb_movetoscreen);
UICB_PROTO(uicb_screen_focusnext);
UICB_PROTO(uicb_screen_focusprev);
UICB_PROTO(uicb_client_movetoscreen);
#endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99