diff options
| author | Bernhard R. Link <brlink@debian.org> | 2009-07-15 17:30:31 +0200 |
|---|---|---|
| committer | Bernhard R. Link <brlink@debian.org> | 2009-07-15 17:30:31 +0200 |
| commit | ad06f3519881bd3b2d5b8a3f1880a6768a530e2a (patch) | |
| tree | 5c0aa16782cc0e2463ab3fafccd9e460afbc57da /src/input.c | |
| parent | 7bdee1c7f38befd9b6b0b5805dd0824fe2233936 (diff) | |
| download | ratpoison-ad06f3519881bd3b2d5b8a3f1880a6768a530e2a.zip | |
do not shadow identifiers (silencing gcc's -Wshadow warnings)
Diffstat (limited to 'src/input.c')
| -rw-r--r-- | src/input.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/input.c b/src/input.c index e2c3054..8c8ab80 100644 --- a/src/input.c +++ b/src/input.c @@ -432,7 +432,7 @@ update_input_window (rp_screen *s, rp_input_line *line) int input_width = rp_text_width (s, defaults.font, line->buffer, line->length); int total_width; GC lgc; - XGCValues gv; + XGCValues gcv; int height; total_width = defaults.bar_x_padding * 2 + prompt_width + input_width + MAX_FONT_WIDTH (defaults.font); @@ -462,9 +462,9 @@ update_input_window (rp_screen *s, rp_input_line *line) line->buffer, line->length); - gv.function = GXxor; - gv.foreground = s->fg_color ^ s->bg_color; - lgc = XCreateGC (dpy, s->input_window, GCFunction | GCForeground, &gv); + gcv.function = GXxor; + gcv.foreground = s->fg_color ^ s->bg_color; + lgc = XCreateGC (dpy, s->input_window, GCFunction | GCForeground, &gcv); /* Draw a cheap-o cursor - MkII */ XFillRectangle (dpy, s->input_window, lgc, @@ -482,15 +482,15 @@ ring_bell (void) { #ifdef VISUAL_BELL GC lgc; - XGCValues gv; + XGCValues gcv; XWindowAttributes attr; rp_screen *s = current_screen (); XGetWindowAttributes (dpy, s->input_window, &attr); - gv.function = GXxor; - gv.foreground = s->fg_color ^ s->bg_color; - lgc = XCreateGC (dpy, s->input_window, GCFunction | GCForeground, &gv); + gcv.function = GXxor; + gcv.foreground = s->fg_color ^ s->bg_color; + lgc = XCreateGC (dpy, s->input_window, GCFunction | GCForeground, &gcv); XFillRectangle (dpy, s->input_window, lgc, 0, 0, attr.width, attr.height); XFlush (dpy); |