Changeset 3996

Timestamp:

12/01/05 07:11:44 (3 years ago)

Author:

miyoshi

Message:

* mw32fns.c: Remove redundant spaces.

* mw32term.c: Ditto.

* mw32ime.c: Ditto.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/mw32fns.c (modified) (8 diffs)
• trunk/src/mw32ime.c (modified) (3 diffs)
• trunk/src/mw32term.c (modified) (24 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-12-01  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32fns.c: Remove redundant spaces.
+
+        * mw32term.c: Ditto.
+
+        * mw32ime.c: Ditto.
+
-2005-12-01  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32fns.c

@@ -1037 +1037 @@
-  else
-    wrong_type_argument (Qnumberp, (arg));
-
+
-  for (i = 0 ; i < NUM_OF_ALPHAS ; i++)
-    newalpha[i] = tmp;
@@ -1047 +1047 @@
-           i < NUM_OF_ALPHAS && CONSP (obj) ;
-           i++, obj = CDR (obj))
-      
+
-          if (NILP (CAR (obj)))
-            tmp = -1;
@@ -1061 +1061 @@
-        }
-    }
-
+
-  for (i = 0 ; i < NUM_OF_ALPHAS ; i++)
-    {
@@ -1980 +1980 @@
-              hdc = GET_FRAME_HDC (f);
-              mw32_setup_default_hdc (hdc);
-
+
-              GetClientRect (FRAME_MW32_WINDOW (f), &rc);
-
+
-              W32_BLOCK_INPUT;
-
+
-              expose_frame (f,
-                            rc.left, rc.top,
@@ -2929 +2929 @@
-    error ("Cannot create event object");
-  InitializeCriticalSection (&(f->output_data.mw32->hdc_critsec));
-
+
-  {
-    int i;
@@ -3093 +3093 @@
-      if (! EQ (value, Qunbound))
-        parameters = Fcons (Fcons (Qinternal_border_width, value),
-                        
+                       
-    }
-  x_default_parameter (f, parameters, Qinternal_border_width, make_number (1),
@@ -3144 +3144 @@
-                       "menuBar", "MenuBar", RES_TYPE_NUMBER);
-  x_default_parameter (f, parameters, Qtool_bar_lines, make_number (1),
-                
+               
-
-  x_default_parameter (f, parameters, Qbuffer_predicate, Qnil,
@@ -3151 +3151 @@
-                       "title", "Title", RES_TYPE_STRING);
-  x_default_parameter (f, parameters, Qfullscreen, Qnil,
-                
+               
-
-  f->output_data.mw32->dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;

trunk/src/mw32ime.c

@@ -315 +315 @@
-    {
-      Lisp_Object before = Fsub1 (start);
-
+
-      if (!NILP (Fget_text_property (before, Qread_only, Qnil))
-          && NILP (Fget_text_property (before,
@@ -325 +325 @@
-      && !NILP (Fget_text_property (end, intern ("front-sticky"), Qnil)))
-    return 0;  /* Cannot signal here. */
-
+
-  /* Examine read-only property of reconversion target. */
-  str = Fbuffer_substring (start, end);
@@ -332 +332 @@
-                                 str)))
-    return 0;  /* Cannot signal here */
-
+
-  str = Fsubstring_no_properties (str, Qnil, Qnil);
-  MW32_ENCODE_TEXT (str, Vlocale_coding_system, &lpstr, &len);

trunk/src/mw32term.c

@@ -554 +554 @@
-          pcount = &f->output_data.mw32->message_thread_hdc_refcount;
-        }
-        
-
-      if (*phdc != INVALID_HANDLE_VALUE)
@@ -563 +562 @@
-          return;
-        }
-
+
-      *phdc = GetDC (FRAME_MW32_WINDOW (f));
-      *pcount = 1;
@@ -585 +584 @@
-                           WM_EMACS_UPDATE_ALPHA, (WPARAM)f, (LPARAM)0);
-      return;
-  
-
+
+
-  oldalpha = f->output_data.mw32->current_alpha;
-
@@ -601 +600 @@
-    SetWindowLong (FRAME_MW32_WINDOW (f), GWL_EXSTYLE,
-                   GetWindowLong (FRAME_MW32_WINDOW (f), GWL_EXSTYLE)
-  
+
-  else if (newalpha >= 0)
-    {
@@ -616 +615 @@
-                                    LWA_ALPHA);
-    }
-
+
-  f->output_data.mw32->current_alpha = newalpha;
-}
@@ -672 +671 @@
-      if (*phdc == INVALID_HANDLE_VALUE || *pcount > 1)
-        abort();
-
+
-      ReleaseDC (FRAME_MW32_WINDOW (f), *phdc);
-      *phdc = INVALID_HANDLE_VALUE;
@@ -696 +695 @@
-
-  GET_FRAME_HDC (f);
-
+
-  if (f == display_info->mouse_face_mouse_frame)
-    {
@@ -3395 +3394 @@
-    }
-  XSETVECTOR (w->vertical_scroll_bar, bar);
-
+
-  RELEASE_FRAME_HDC (f);
-}
@@ -3627 +3626 @@
-  char *classname = NULL;
-  char *windowname = NULL;
-
+
-  if (STRINGP (class_name))
-    classname = SDATA (class_name);
-
+
-  if (STRINGP (window_name))
-    windowname = SDATA (window_name);
-
+
-  hwnd = FindWindow (classname, windowname);
-  if (hwnd == NULL) return Qnil;
-
+
-  if (! GetWindowRect (hwnd, &rc)) return Qnil;
-
@@ -4189 +4188 @@
-            break;
-          }
-
+
-        case WM_EMACS_EXPOSE_FRAME:
-          {
@@ -4195 +4194 @@
-            RECT rc;
-            struct frame *f = (struct frame *)msg.wParam;
-
+
-            hdc = GET_FRAME_HDC (f);
-            mw32_setup_default_hdc (hdc);
-
+
-            GetClientRect (FRAME_MW32_WINDOW (f), &rc);
-
+
-            W32_BLOCK_INPUT;
-            expose_frame (f,
@@ -4341 +4340 @@
-          last_mouse_movement_time = msg.time;
-
-          
-          if ((abs (LOWORD (msg.lParam) - lastpos.x)
-               > abs (insensitive_range))
@@ -4353 +4351 @@
-                }
-              if (dpyinfo->mouse_face_hidden)
-      
+
-                  dpyinfo->mouse_face_hidden = 0;
-                  WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo));
@@ -4370 +4368 @@
-              int extend_mills =
-                timeout - (msg.time - last_mouse_movement_time);
-
+
-              mouse_hide_timer = SetTimer (msg.hwnd, mouse_hide_timer,
-                                           extend_mills, NULL);
@@ -4378 +4376 @@
-              KillTimer (msg.hwnd, mouse_hide_timer);
-              mouse_hide_timer = 0;
-
+
-              if (dpyinfo->mouse_cursor_stat == 0)
-                {
@@ -4395 +4393 @@
-                          XINT (CAR (CDR (mw32_hide_mouse_timeout)));
-                    }
-
+
-                  lastpos.x = LOWORD (last_mouse_motion_message.lParam);
-                  lastpos.y = HIWORD (last_mouse_motion_message.lParam);
@@ -4418 +4416 @@
-          KillTimer (msg.hwnd, mouse_hide_timer);
-          mouse_hide_timer = 0;
-      
+
-      dpyinfo->mouse_face_hidden = 0;
-
+
-      SetCursor (FRAME_MW32_OUTPUT (XFRAME (selected_frame))->nontext_cursor);
-
@@ -4438 +4436 @@
-          WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo));
-        }
-
+
-      break;
-
@@ -4511 +4509 @@
-                  dpyinfo->mouse_face_hidden = 1;
-                }
-
+
-              POST_THREAD_INFORM_MESSAGE (main_thread_id,
-                                          WM_EMACS_HIDE_TOOLTIP,
@@ -4963 +4961 @@
-        case WM_EMACS_CLEAR_MOUSE_FACE:
-          WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo));
-
+
-          /* Generate a nil HELP_EVENT to cancel a help-echo.
-             Do it only if there's something to cancel.
@@ -5426 +5424 @@
-  int width, height;
-  RECT win_rect = {0, 0, FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f)};
-
+
-  /* Get size of frame including non-client region. */
-  AdjustWindowRectEx (&win_rect, f->output_data.mw32->dwStyle,
@@ -5441 +5439 @@
-      if (flags & XNegative)
-        f->left_pos = FRAME_MW32_DISPLAY_INFO (f)->width - width + f->left_pos;
-                      
-
-      if (flags & YNegative)
@@ -6309 +6306 @@
-    track_mouse_event_fn
-      = (TrackMouseEvent_Proc) GetProcAddress (user32_lib, "TrackMouseEvent");
-
+
-    /* Layered Window */
-    SetLayeredWindowAttributes = (SETLAYEREDWINDOWATTRPROC)
@@ -6563 +6560 @@
-
-  hdc = GET_TEMP_HDC (XFRAME (frame));
-
+
-  if (EQ (item, intern ("width-in-mm")))
-    {