Changeset 3957

Show
Ignore:
Timestamp:
2005年11月08日 08時04分09秒 (3 years ago)
Author:
miyoshi
Message:

(mw32_real_positions): Normalize coding style.
(mw32_check_fullscreen): Check if the full screen is required or
not strictly. When the full width or full height is required,
arrange the frame size on its own.
(mw32_WndProc<WM_WINDOWPOSCHANGED>): Check if the full screen is
required or not strictly.
Refer to ticket:196.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/ChangeLog.Meadow

    r3956 r3957  
     12005-11-08  MIYOSHI Masanori  <miyoshi@meadowy.org> 
     2 
     3        * mw32fns.c (mw32_real_positions): Normalize coding style. 
     4        (mw32_check_fullscreen): Check if the full screen is required or 
     5        not strictly.  When the full width or full height is required, 
     6        arrange the frame size on its own. 
     7        (mw32_WndProc<WM_WINDOWPOSCHANGED>): Check if the full screen is 
     8        required or not strictly. 
     9        Refer to ticket:196. 
     10 
    1112005-11-05  MIYOSHI Masanori  <miyoshi@meadowy.org> 
    212 
  • trunk/src/mw32fns.c

    r3944 r3957  
    169169  RECT rect; 
    170170 
    171   GetClientRect((HWND)FRAME_MW32_WINDOW(f), &rect); 
    172   AdjustWindowRect(&rect, f->output_data.mw32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f)); 
     171  GetClientRect ((HWND) FRAME_MW32_WINDOW (f), &rect); 
     172  AdjustWindowRect (&rect, f->output_data.mw32->dwStyle, 
     173                    FRAME_EXTERNAL_MENU_BAR (f)); 
    173174 
    174175  pt.x = rect.left; 
    175176  pt.y = rect.top; 
    176177 
    177   ClientToScreen ((HWND)FRAME_MW32_WINDOW(f), &pt); 
     178  ClientToScreen ((HWND) FRAME_MW32_WINDOW (f), &pt); 
    178179 
    179180  /* Remember x_pixels_diff and y_pixels_diff.  */ 
     
    191192     struct frame *f; 
    192193{ 
    193   if (f->want_fullscreen & FULLSCREEN_BOTH) 
    194     { 
    195 #if 0 
     194  if (f->want_fullscreen & FULLSCREEN_WIDTH 
     195      && f->want_fullscreen & FULLSCREEN_HEIGHT) 
     196    { 
     197      /* Turn this process over to Windows */ 
     198      f->async_visible = 1; 
     199      if (!f->async_iconified) 
     200        PostMessage (FRAME_MW32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0); 
     201    } 
     202  else if (f->want_fullscreen & FULLSCREEN_BOTH) 
     203    { 
    196204      int width, height, ign; 
    197205 
     
    201209 
    202210      /* We do not need to move the window, it shall be taken care of 
    203         when setting WM manager hints.  */ 
     211        when setting WM manager hints.  */ 
    204212      if (FRAME_COLS (f) != width || FRAME_LINES (f) != height) 
    205213        { 
     
    210218          /* Wait for the change of frame size to occur */ 
    211219          f->want_fullscreen |= FULLSCREEN_WAIT; 
     220 
     221          x_set_window_size (f, 0, width, height); 
    212222        } 
    213 #else /* Turn this process over to Windows.  */ 
    214       f->async_visible = 1; 
    215       if (!f->async_iconified) 
    216         PostMessage (FRAME_MW32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0); 
    217 #endif 
    218223    } 
    219224} 
     
    21282133              } 
    21292134 
    2130             if (!(f->want_fullscreen & FULLSCREEN_BOTH)) 
     2135            if (!(f->want_fullscreen & FULLSCREEN_WIDTH) 
     2136                || !(f->want_fullscreen & FULLSCREEN_HEIGHT)) 
    21312137              { 
    21322138                wdiff = ((width