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

rename screen to phys_screen to avoid confusion

This commit is contained in:
Julien Danjou 2008-02-25 13:01:54 +01:00
parent 73696a26a9
commit 328e5d0d4e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/draw.c
View File

@ -491,14 +491,14 @@ draw_get_image_size(const char *filename)
} }
Drawable Drawable
draw_rotate(DrawCtx *ctx, int screen, double angle, int tx, int ty) draw_rotate(DrawCtx *ctx, int phys_screen, double angle, int tx, int ty)
{ {
cairo_surface_t *surface, *source; cairo_surface_t *surface, *source;
cairo_t *cr; cairo_t *cr;
Drawable newdrawable; Drawable newdrawable;
newdrawable = XCreatePixmap(ctx->display, newdrawable = XCreatePixmap(ctx->display,
RootWindow(ctx->display, screen), RootWindow(ctx->display, phys_screen),
ctx->height, ctx->width, ctx->height, ctx->width,
ctx->depth); ctx->depth);
surface = cairo_xlib_surface_create(ctx->display, newdrawable, ctx->visual, ctx->height, ctx->width); surface = cairo_xlib_surface_create(ctx->display, newdrawable, ctx->visual, ctx->height, ctx->width);

6
screen.c
View File

@ -313,11 +313,11 @@ move_client_to_screen(Client *c, int new_screen, Bool doresize)
* \param screen screen number * \param screen screen number
*/ */
static void static void
move_mouse_pointer_to_screen(int screen) move_mouse_pointer_to_screen(int phys_screen)
{ {
if(XineramaIsActive(globalconf.display)) if(XineramaIsActive(globalconf.display))
{ {
Area area = screen_get_area(screen, NULL, NULL); Area area = screen_get_area(phys_screen, NULL, NULL);
XWarpPointer(globalconf.display, XWarpPointer(globalconf.display,
None, None,
DefaultRootWindow(globalconf.display), DefaultRootWindow(globalconf.display),
@ -326,7 +326,7 @@ move_mouse_pointer_to_screen(int screen)
else else
XWarpPointer(globalconf.display, XWarpPointer(globalconf.display,
None, None,
RootWindow(globalconf.display, screen), RootWindow(globalconf.display, phys_screen),
0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0);
} }

14
window.c
View File

@ -91,7 +91,7 @@ window_configure(Window win, Area geometry, int border)
* \param win The window * \param win The window
*/ */
void void
window_grabbuttons(int screen, Window win) window_grabbuttons(int phys_screen, Window win)
{ {
Button *b; Button *b;
@ -116,27 +116,27 @@ window_grabbuttons(int screen, Window win)
win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
} }
XUngrabButton(globalconf.display, AnyButton, AnyModifier, RootWindow(globalconf.display, screen)); XUngrabButton(globalconf.display, AnyButton, AnyModifier, RootWindow(globalconf.display, phys_screen));
} }
void void
window_root_grabbuttons(int screen) window_root_grabbuttons(int phys_screen)
{ {
Button *b; Button *b;
for(b = globalconf.buttons.root; b; b = b->next) for(b = globalconf.buttons.root; b; b = b->next)
{ {
XGrabButton(globalconf.display, b->button, b->mod, XGrabButton(globalconf.display, b->button, b->mod,
RootWindow(globalconf.display, screen), False, BUTTONMASK, RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
XGrabButton(globalconf.display, b->button, b->mod | LockMask, XGrabButton(globalconf.display, b->button, b->mod | LockMask,
RootWindow(globalconf.display, screen), False, BUTTONMASK, RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask, XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask,
RootWindow(globalconf.display, screen), False, BUTTONMASK, RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask | LockMask, XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask | LockMask,
RootWindow(globalconf.display, screen), False, BUTTONMASK, RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
} }
} }