diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 14:25:35 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 14:25:35 +0200 |
commit | 9d4f32e88a1b642070f0adb41df04a0846c31970 (patch) | |
tree | cff0fcdf72b79fb162729dc607933296b65d63b1 /src/w32term.c | |
parent | 9650fc61909f4b0b142770b269d1905a41aa672d (diff) | |
download | emacs-9d4f32e88a1b642070f0adb41df04a0846c31970.tar.gz |
src/w32*.c: Whitespace fixes and typos.
Diffstat (limited to 'src/w32term.c')
-rw-r--r-- | src/w32term.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/w32term.c b/src/w32term.c index 801c56bf994..bda7438f78a 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -325,8 +325,9 @@ XChangeGC (void * ignore, XGCValues* gc, unsigned long mask, gc->font = xgcv->font; } -XGCValues *XCreateGC (void * ignore, Window window, unsigned long mask, - XGCValues *xgcv) +XGCValues * +XCreateGC (void * ignore, Window window, unsigned long mask, + XGCValues *xgcv) { XGCValues *gc = (XGCValues *) xmalloc (sizeof (XGCValues)); bzero (gc, sizeof (XGCValues)); @@ -338,7 +339,7 @@ XGCValues *XCreateGC (void * ignore, Window window, unsigned long mask, void XGetGCValues (void* ignore, XGCValues *gc, - unsigned long mask, XGCValues *xgcv) + unsigned long mask, XGCValues *xgcv) { XChangeGC (ignore, xgcv, mask, gc); } @@ -920,7 +921,7 @@ w32_set_terminal_modes (struct terminal *term) { } -/* This is called when exiting or suspending Emacs. Exiting will make +/* This is called when exiting or suspending Emacs. Exiting will make the W32 windows go away, and suspending requires no action. */ static void @@ -2410,7 +2411,7 @@ x_draw_glyph_string (s) /* Draw strike-through. */ if (s->face->strike_through_p - && !FONT_TEXTMETRIC(s->font).tmStruckOut) + && !FONT_TEXTMETRIC (s->font).tmStruckOut) { unsigned long h = 1; unsigned long dy = (s->height - h) / 2; @@ -2889,7 +2890,8 @@ x_get_keysym_name (keysym) return value; } -static int codepage_for_locale(LCID locale) +static int +codepage_for_locale (LCID locale) { char cp[20]; @@ -3388,7 +3390,7 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole) BLOCK_INPUT; si.cbSize = sizeof (si); si.fMask = SIF_POS | SIF_PAGE; - GetScrollInfo(w, SB_CTL, &si); + GetScrollInfo (w, SB_CTL, &si); near_bottom_p = si.nPos + si.nPage >= range; UNBLOCK_INPUT; if (!near_bottom_p) @@ -4284,7 +4286,7 @@ w32_read_socket (sd, expected, hold_quit) temp_index = 0; temp_buffer[temp_index++] = msg.msg.wParam; inev.kind = MULTIMEDIA_KEY_EVENT; - inev.code = GET_APPCOMMAND_LPARAM(msg.msg.lParam); + inev.code = GET_APPCOMMAND_LPARAM (msg.msg.lParam); inev.modifiers = msg.dwModifiers; XSETFRAME (inev.frame_or_window, f); inev.timestamp = msg.msg.time; @@ -4332,7 +4334,7 @@ w32_read_socket (sd, expected, hold_quit) selected now and last mouse movement event was not in it. Minibuffer window will be selected only when it is active. */ - if (WINDOWP(window) + if (WINDOWP (window) && !EQ (window, last_window) && !EQ (window, selected_window) /* For click-to-focus window managers @@ -4346,7 +4348,7 @@ w32_read_socket (sd, expected, hold_quit) inev.frame_or_window = window; } - last_window=window; + last_window = window; } if (!note_mouse_movement (f, &msg.msg)) help_echo_string = previous_help_echo_string; @@ -5485,8 +5487,8 @@ x_set_window_size (f, change_gravity, cols, rows) rect.right = pixelwidth; rect.bottom = pixelheight; - AdjustWindowRect(&rect, f->output_data.w32->dwStyle, - FRAME_EXTERNAL_MENU_BAR (f)); + AdjustWindowRect (&rect, f->output_data.w32->dwStyle, + FRAME_EXTERNAL_MENU_BAR (f)); my_set_window_pos (FRAME_W32_WINDOW (f), NULL, @@ -5739,8 +5741,8 @@ x_make_frame_visible (f) /* Adjust vertical window position in order to avoid being covered by a task bar placed at the bottom of the desktop. */ - SystemParametersInfo(SPI_GETWORKAREA, 0, &workarea_rect, 0); - GetWindowRect(FRAME_W32_WINDOW(f), &window_rect); + SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0); + GetWindowRect (FRAME_W32_WINDOW (f), &window_rect); if (window_rect.bottom > workarea_rect.bottom && window_rect.top > workarea_rect.top) f->top_pos = max (window_rect.top @@ -6310,7 +6312,7 @@ x_delete_display (dpyinfo) } dpyinfo->color_list = NULL; if (dpyinfo->palette) - DeleteObject(dpyinfo->palette); + DeleteObject (dpyinfo->palette); } xfree (dpyinfo->w32_id_name); |