Changeset 1687

Timestamp:

02/17/98 01:45:18 (11 years ago)

Author:

himi

Message:

Emacs 20.3.5 FSF import

Files:

• branches/GNU/src/w32inevt.c (modified) (4 diffs)
• branches/GNU/src/w32proc.c (modified) (3 diffs)
• branches/GNU/src/w32select.c (modified) (4 diffs)
• branches/GNU/src/w32term.c (modified) (26 diffs)
• branches/GNU/src/w32term.h (modified) (1 diff)
• branches/GNU/src/w32xfns.c (modified) (1 diff)
• branches/GNU/src/xdisp.c (modified) (8 diffs)

branches/GNU/src/w32inevt.c

@@ -49 +49 @@
-/* from dispnew.c */
-extern int change_frame_size (FRAME_PTR, int, int, int, int);
-
-/* from w32console.c */
-extern int w32_use_full_screen_buffer;
-
-/* from w32fns.c */
@@ -624 +621 @@
-}
-
-static void
-maybe_generate_resize_event ()
-{
-  CONSOLE_SCREEN_BUFFER_INFO info;
-  FRAME_PTR f = get_frame ();
-
-  GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
-
-  /* It is okay to call this unconditionally, since it will do nothing
-     if the size hasn't actually changed.  */
-  change_frame_size (f,
-                     1 + info.srWindow.Bottom - info.srWindow.Top,
-                     1 + info.srWindow.Right - info.srWindow.Left,
-                     0, 0);
-}
-
-int 
-w32_console_read_socket (int sd, struct input_event *bufp, int numchars,
@@ -693 +674 @@
-
-            case WINDOW_BUFFER_SIZE_EVENT:
-
-
+
-              break;
-            
@@ -710 +690 @@
-        break;
-    }
-
-
-
-
-
-
-
+
-  UNBLOCK_INPUT;
-  return ret;

branches/GNU/src/w32proc.c

@@ -1176 +1176 @@
-    }
-  
+  /* Wait for input or child death to be signalled.  */
-  start_time = GetTickCount ();
-
-
-
-
-
-
-
-
+
-
-  if (active == WAIT_FAILED)
@@ -1220 +1214 @@
-  do
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        {
-          cp = cps[active - nh];
@@ -1385 +1360 @@
-
-          foreground_window = GetForegroundWindow ();
-
+ && SetForegroundWindow (cp->hwnd)
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      /* Ctrl-Break is NT equivalent of SIGINT.  */
-      else if (!GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, pid))

branches/GNU/src/w32select.c

@@ -100 +100 @@
-  HANDLE htext;
-  int nbytes;
-, nlines = 0
+
-  unsigned char *src;
-  unsigned char *dst;
-
+
-  CHECK_STRING (string, 0);
-  
@@ -113 +113 @@
-  nbytes = STRING_BYTES (XSTRING (string)) + 1;
-  src = XSTRING (string)->data;
-  dst = src;
-
-  /* We need to know how many lines there are, since we need CRLF line
-     termination for compatibility with other Windows Programs.
-     avoid using strchr because it recomputes the length every time */
-  while ((dst = memchr (dst, '\n', nbytes - (dst - src))) != NULL)
-    {
-      nlines++;
-      dst++;
-    }
-
-  {
@@ -145 +135 @@
-           while Emacs uses just LF internally).  */
-
-
+
+
+
+
+
+
+
+
-
-        if ((htext = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, truelen)) == NULL)
@@ -195 +192 @@
-        Vnext_selection_coding_system = Qnil;
-        coding.mode |= CODING_MODE_LAST_BLOCK;
- + nlines
+
-        if ((htext = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, bufsize)) == NULL)
-          goto error;

branches/GNU/src/w32term.c

@@ -543 +543 @@
- (ch & 0x00ff)
-
-#define W32_TEXTOUT(start_offset,nchars)                             \
-{                                                                    \
-  int charset_dim = CHARSET_DIMENSION(charset);                      \
-  if (font->bdf)                                                     \
-    w32_BDF_TextOut (font->bdf, hdc, left + xoffset,                 \
-                     top + yoffset,                                  \
-                     x_1byte_buffer + start_offset,                  \
-                     charset_dim, nchars, 0);                        \
-  else if (print_via_unicode)                                        \
-    ExtTextOutW (hdc, left + xoffset, top + yoffset,                 \
-                 fuOptions, clip_region,                             \
-                 x_2byte_buffer + start_offset, nchars, NULL);       \
-  else                                                               \
-    ExtTextOut (hdc, left + xoffset, top + yoffset,                  \
-                fuOptions, clip_region,                              \
-                x_1byte_buffer + start_offset,                       \
-                nchars * charset_dim, NULL);                         \
-    start_offset += nchars * (print_via_unicode ? 1 : charset_dim ); \
-    xoffset += nchars * glyph_width;                                 \
-}
-
-/* Display a sequence of N glyphs found at GP.
@@ -710 +690 @@
-           3) Drawing a composite character.
-           4) Font has non-zero _MULE_BASELINE_OFFSET property.
-           5) Font is a bdf font.
-           After filling background, we draw glyphs by XDrawString16.  */
-        int background_filled;
@@ -720 +699 @@
-        /* 1 if we find no font or a font of inappropriate size.  */
-        int require_clipping;
-        RECT clip_rectangle;
-        LPRECT clip_region = NULL;
-        UINT fuOptions = 0;
-
-        int codepage = CP_DEFAULT;
-        BOOL print_via_unicode = FALSE;
@@ -770 +745 @@
-            font = (XFontStruct *) (fontp->font);
-            codepage = w32_codepage_for_font (fontp->name);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            if (cmpcharp && cmpcharp->cmp_rule == NULL)
@@ -824 +809 @@
-                    }
-              }
+            /* Japanese Kanji are a special case under w32, as they
+               must be printed in SJIS rather than EUC.  */
+            else if ((charset == charset_jisx0208)
+                     || (charset == charset_jisx0208_1978)
+                     || (charset == charset_id_internal ("japanese-jisx0212")))
+              {
+                int sjis1, sjis2;
+                for (cp = x_2byte_buffer; cp < x_2byte_buffer + len; cp++)
+                  {
+                    ENCODE_SJIS (BYTE1 (*cp), BYTE2 (*cp), sjis1, sjis2);
+                    *cp = BUILD_WCHAR_T (sjis1, sjis2);
+                  }
+              }
-            else if (fontp->encoding[charset])
-              {
@@ -834 +832 @@
-                  for (cp = x_2byte_buffer; cp < x_2byte_buffer + len; cp++)
-                    *cp = BUILD_WCHAR_T (BYTE1 (*cp), BYTE2 (*cp) | 0x80);
-                /* Special encoding for SJIS Kanji.  */
-                if (enc == 4)
-                  {
-                    if (CHARSET_DIMENSION (charset) == 2)
-                      {
-                        int sjis1, sjis2;
-                        for (cp = x_2byte_buffer;
-                             cp < x_2byte_buffer + len; cp++)
-                          {
-                            ENCODE_SJIS (BYTE1 (*cp), BYTE2 (*cp),
-                                         sjis1, sjis2);
-                            *cp = BUILD_WCHAR_T (sjis1, sjis2);
-                          }
-                      }
-                    else
-                      for (cp = x_2byte_buffer;
-                           cp < x_2byte_buffer + len; cp++)
-                        *cp = BUILD_WCHAR_T (BYTE1 (*cp),
-                                             BYTE2 (*cp) | 0x80);
-                  }
-              }
-          }
@@ -867 +845 @@
-                if (charset == charset_latin_iso8859_1)
-                  {
-!font->bdf && 
+
-                      /* This font can't display Latin1 characters.  */
-                      font = NULL;
@@ -934 +912 @@
-        if (font)
-          require_clipping = (!NILP (Vclip_large_size_font)
-
-
-
-
-
-
+
+
+
+
+
-
-        if (font && (just_foreground || (cmpcharp && gidx > 0)))
@@ -947 +924 @@
-
-        else if (!font
-                 || font->bdf
-                 || FONT_HEIGHT (font) < line_height
-                 || FONT_WIDTH (font) < glyph_width
@@ -971 +947 @@
-        SetTextColor (hdc, fg);
-        SetBkColor (hdc, bg);
-
-
-
+
+
-          n_chars = MultiByteToWideChar
-            (codepage, 0, x_1byte_buffer, n_chars,
@@ -980 +955 @@
-        if (font)
-          {
-            if (font->hfont)
-            SelectObject (hdc, font->hfont);
-
-            if (!cmpcharp)
-              {
-xoffset = 0, yoffset = baseline
+multibyte_pos_offset = 0
-                if (require_clipping || FONT_WIDTH (font) != glyph_width
-                    || FONT_MAX_WIDTH (font) != FONT_WIDTH (font))
-                  {
-
-
-
+
+
+
+
+
-                      {
-                        if (require_clipping)
@@ -1004 +980 @@
-                            clip_region = &clip_rectangle;
-                          }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                      }
-                  }
-                else
-                  {
-
-
+
+
+
+
+
+
+
-                  }
-              }
@@ -1038 +1043 @@
-                       HIGHEST is the highest position of glyphs ever
-                       written, LOWEST the lowest position.  */
-
-
-
+
-
-                    if (default_ascent
@@ -1049 +1052 @@
-                        lowest = 0;
-                      }
-
-
+
-                      {
-
-
+
+
+
+
-                      }
-
-                    if (cmpcharp->cmp_rule)
-
+_
-                                  * FONT_WIDTH (FRAME_FONT (f)));
-
@@ -1077 +1081 @@
-                        char_width = char_placement.abcA
-                          + char_placement.abcB + char_placement.abcC;
-
+_
-                      }
-                    /* Don't let characters go beyond the glyph
-                       boundary whatever their over/underhangs. */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    gidx++;
-                  }
@@ -1095 +1118 @@
-                  i = 0;
-
-
+i++, 
-                  {
-offset = 0, yoffset = FONT_BASE (font)
+_offset = 0, y_offset = 0
-
-                    if (relative_compose)
@@ -1106 +1129 @@
-                                            make_number (cmpcharp->glyph[gidx]))))
-                          {
-
-
+
-                              {
-                                /* Draw above the current glyphs.  */
-
-
+
+
+
-                              }
-FONT_BASE (font)
+font->tm.tmAscent
-                              {
-                                /* Draw beneath the current glyphs.  */
-
-
+
+
+
-                              }
-                          }
@@ -1125 +1149 @@
-                               it sticks out of HIGHEST or LOWEST,
-                               update them appropriately.  */
-
-
-
-
-
-
+
+
+
+
-                          }
-                      }
@@ -1149 +1171 @@
-                                   : gref == 2 ? lowest
-                                   : (highest + lowest) / 2)
-  - (nref == 0 ? FONT_HEIGHT (font)
-
-
+         - (nref == 0 ? font->tm.tmAscent
+
+
-                                     : nref == 2 ? 0
-
-
-
+
+
+
+
-                        if (top > highest)
-                          highest = top;
-                        if (bottom < lowest)
-                          lowest = bottom;
-offset = bottom + FONT_HEIGHT (font)
-
+_offset = bottom + font->tm.tmDescent
+_
-                                    * FONT_WIDTH (FRAME_FONT(f)));
-                      }
@@ -1180 +1203 @@
-                        char_width = char_placement.abcA
-                          + char_placement.abcB + char_placement.abcC;
-
+_
-                      }
-                    /* Don't let characters go beyond the glyph
-                       boundary whatever their over/underhangs. */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  }
-              }
@@ -1224 +1267 @@
-          int underline_position = 1;
-
-
-
-
-
+
+
-
-          if (face->underline)
@@ -1973 +2014 @@
-  result->modifiers = msg->dwModifiers;
-
-  hdrop = (HDROP) msg->msg.wParam;
-  DragQueryPoint (hdrop, &p);
-
-  p.x = LOWORD (msg->msg.lParam);
-  p.y = HIWORD (msg->msg.lParam);
@@ -1982 +2020 @@
-  XSETINT (result->y, p.y);
-
+  hdrop = (HDROP) msg->msg.wParam;
+  DragQueryPoint (hdrop, &p);
-  num_files = DragQueryFile (hdrop, 0xFFFFFFFF, NULL, 0);
-  files = Qnil;
@@ -4139 +4179 @@
-  FRAME_FONT (f) = (XFontStruct *) (fontp->font);
-  f->output_data.w32->font_baseline
-ONT_BASE (FRAME_FONT (f))
+RAME_FONT(f)->tm.tmAscent
-  FRAME_FONTSET (f) = -1;
-
@@ -5116 +5156 @@
-  w32_enable_unicode_output = 1;
-
+  /* w32-charset-to-codepage-alist is initialized in w32-win.el.  */
-  DEFVAR_LISP ("w32-charset-to-codepage-alist",
-               &Vw32_charset_to_codepage_alist,
@@ -5129 +5170 @@
-  XSETFASTINT (codepage, 949);
-  store_in_alist (&Vw32_charset_to_codepage_alist,
-
-
+
+
+
-  store_in_alist (&Vw32_charset_to_codepage_alist,
-ksc5601.1992
+jisx0212-sjis
-  XSETFASTINT (codepage, 932);
-  store_in_alist (&Vw32_charset_to_codepage_alist,

branches/GNU/src/w32term.h

@@ -29 +29 @@
-#define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-#define CHECK_W32_FRAME(f, frame)               \

branches/GNU/src/w32xfns.c

@@ -239 +239 @@
-  return (TRUE);
-}
-
-/* Process all messages in the current thread's queue.  */
-void
-drain_message_queue ()
-{
-  MSG msg;
-  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
-    {
-      TranslateMessage (&msg);
-      DispatchMessage (&msg);
-    }
-}
-
-
-/*

branches/GNU/src/xdisp.c

@@ -2090 +2090 @@
-                            - (last_point_x + hscroll - !! hscroll));
-
-1
+0
-                                 PT, height,
-                                 /* BUG FIX: See the comment of 
@@ -2899 +2899 @@
-
-  val.bytepos = pos_byte;
-  val.ovstring_chars_done = 0;
-
-  /* Redisplay the lines where the text was changed */
@@ -3458 +3457 @@
-                      ovlen -= ovstr_done;
-
- && p1 < endp
+
-                        {
-                          int charset, cols;
@@ -4558 +4557 @@
-   type of CODING_SYSTEM.  Return updated pointer into BUF.  */
-
-static char invalid_eol_type[] = "(*invalid*)";
-
-static char *
-decode_mode_spec_coding (coding_system, buf, eol_flag)
@@ -4568 +4565 @@
-  Lisp_Object val;
-  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
-  unsigned char *eol_str;
-  int eol_str_len;
-  /* The EOL conversion we are using.  */
-  Lisp_Object eoltype;
-
-  val = coding_system;
@@ -4580 +4573 @@
-        *buf++ = '-';
-      if (eol_flag)
-eoltype
+*buf++
-      /* Don't mention EOL conversion if it isn't decided.  */
-    }
@@ -4601 +4594 @@
-      if (eol_flag)
-        {
+          /* The EOL conversion we are using.  */
+          int eoltype;
-          /* The EOL conversion that is normal on this system.  */