Changeset 1645

Timestamp:

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

Author:

himi

Message:

Emacs 20.6 import

Files:

• branches/GNU/src/w32proc.c (modified) (10 diffs)
• branches/GNU/src/w32select.c (modified) (13 diffs)
• branches/GNU/src/xdisp.c (modified) (1 diff)
• branches/fsf/src/ccl.c (modified) (29 diffs)

branches/GNU/src/w32proc.c

@@ -304 +304 @@
-
-static BOOL 
- int is_gui_app,
+
-              int * pPid, child_process *cp)
-{
@@ -319 +319 @@
-  
-#ifdef HAVE_NTGUI
- && !is_gui_app
+
-    start.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-  else
@@ -569 +569 @@
-
-void
-, int * is_gui_app
+
-{
-  file_data executable;
@@ -577 +577 @@
-  *is_dos_app = FALSE;
-  *is_cygnus_app = FALSE;
-  *is_gui_app = FALSE;
-
-  if (!open_input_file (&executable, filename))
@@ -598 +597 @@
-      p = egetenv ("COMSPEC");
-      if (p)
-, is_gui_app
+
-    }
-  else
@@ -650 +649 @@
-                }
-            }
-
-          /* Check whether app is marked as a console or windowed (aka
-             GUI) app.  Accept Posix and OS2 subsytem apps as console
-             apps.  */
-          *is_gui_app = (nt_header->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI);
-        }
-    }
@@ -716 +710 @@
-  int pid;
-  child_process *cp;
-, is_gui_app
+
-  int do_quoting = 0;
-  char escape_char;
@@ -758 +752 @@
-     was compiled with the Cygnus GNU toolchain and hence relies on
-     cygwin.dll to parse the command line - we use this to decide how to
-
-
-
-
-
+
+
-
-  /* On Windows 95, if cmdname is a DOS app, we invoke a helper
@@ -987 +978 @@
-  
-  /* Now create the process.  */
-is_gui_app, 
+
-    {
-      delete_child (cp);
@@ -2149 +2140 @@
-               &Vw32_start_process_show_window,
-    "When nil, new child processes hide their windows.\n\
-
-
+
-  Vw32_start_process_show_window = Qnil;
-

branches/GNU/src/w32select.c

@@ -25 +25 @@
-#include "w32term.h"    /* for all of the w32 includes */
-#include "dispextern.h" /* frame.h seems to want this */
-#include "keyboard.h"
-#include "frame.h"      /* Need this to get the X window of selected_frame */
-#include "blockinput.h"
@@ -38 +37 @@
-static Lisp_Object Vselection_coding_system;
-
-Windows program
+X client
-static Lisp_Object Vnext_selection_coding_system;
-
-/* The last text we put into the clipboard.  This is used to prevent
-   passing back our own text from the clipboard, instead of using the
-   kill ring.  The former is undesirable because the clipboard data
-   could be MULEtilated by inappropriately chosen
-   (next-)selection-coding-system.  For this reason, we must store the
-   text *after* it was encoded/Unix-to-DOS-converted.  */
-static unsigned char *last_clipboard_text = NULL;
-static size_t clipboard_storage_size = 0;
-
-#if 0
@@ -137 +127 @@
-    /* Since we are now handling multilingual text, we must consider
-       encoding text for the clipboard.  */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      {
-        /* No multibyte character in OBJ.  We need not encode it.  */
@@ -184 +181 @@
-    else
-      {
-
-
+
+
+
+
-        int bufsize;
-        struct coding_system coding;
@@ -194 +193 @@
-        setup_coding_system
-          (Fcheck_coding_system (Vnext_selection_coding_system), &coding);
-        coding.src_multibyte = 1;
-        coding.dst_multibyte = 0;
-        Vnext_selection_coding_system = Qnil;
-        coding.mode |= CODING_MODE_LAST_BLOCK;
@@ -205 +202 @@
-        encode_coding (&coding, src, dst, nbytes, bufsize);
-        Vlast_coding_system_used = coding.symbol;
-
-        /* Stash away the data we are about to put into the clipboard, so we
-           could later check inside Fw32_get_clipboard_data whether
-           the clipboard still holds our data.  */
-        if (clipboard_storage_size < coding.produced)
-          {
-            clipboard_storage_size = coding.produced + 100;
-            last_clipboard_text = (char *) xrealloc (last_clipboard_text,
-                                                     clipboard_storage_size);
-          }
-        if (last_clipboard_text)
-          memcpy (last_clipboard_text, dst, coding.produced);
-
-        GlobalUnlock (htext);
-
-        /* Shrink data block to actual size.  */
-
-
+
-        if (htext2 != NULL) htext = htext2;
-      }
@@ -229 +211 @@
-  if (!OpenClipboard ((!NILP (frame) && FRAME_W32_P (XFRAME (frame))) ? FRAME_W32_WINDOW (XFRAME (frame)) : NULL))
-    goto error;
-
+
-  ok = EmptyClipboard () && SetClipboardData (CF_TEXT, htext);
-  
@@ -240 +222 @@
-  ok = FALSE;
-  if (htext) GlobalFree (htext);
-
-
-
+
- done:
-  UNBLOCK_INPUT;
@@ -280 +260 @@
-    nbytes = strlen (src);
-
-    /* If the text in clipboard is identical to what we put there
-       last time w32_set_clipboard_data was called, pretend there's no
-       data in the clipboard.  This is so we don't pass our own text
-       from the clipboard (which might be troublesome if the killed
-       text includes null characters).  */
-    if (last_clipboard_text
-        && clipboard_storage_size >= nbytes
-        && memcmp(last_clipboard_text, src, nbytes) == 0)
-      goto closeclip;
-
-    if (
-#if 1
@@ -298 +268 @@
-        )
-      {
+#if 1
+        /* We have to assume clipboard might contain "compound" text (to
+           use the X terminology), since Emacs itself will default to
+           using iso-2022 encoding which doesn't contain non-ascii
+           characters.  */
+        require_decoding = 1;
+#else
-        /* If the clipboard data contains any non-ascii code, we
-           need to decode it.  */
@@ -310 +287 @@
-              }
-          }
+#endif
-      }
-    
@@ -322 +300 @@
-        setup_coding_system
-          (Fcheck_coding_system (Vnext_selection_coding_system), &coding);
-        coding.src_multibyte = 0;
-        coding.dst_multibyte = 1;
-        Vnext_selection_coding_system = Qnil;
-        coding.mode |= CODING_MODE_LAST_BLOCK;
@@ -330 +306 @@
-        decode_coding (&coding, src, buf, nbytes, bufsize);
-        Vlast_coding_system_used = coding.symbol;
-
-
+
+
+
+
-        xfree (buf);
-      }

branches/GNU/src/xdisp.c

@@ -1992 +1992 @@
-      XSETFASTINT (w->last_overlay_modified, 0);
-      if (startp < BEGV) startp = BEGV, startp_byte = BEGV_BYTE;
-_byte
+
-      try_window (window, startp);
-      if (cursor_vpos < 0)

branches/fsf/src/ccl.c

@@ -628 +628 @@
-#define CCL_NE          0x15    /* X = (X != Y) */
-
-
+
+
+
-                                   r[7] = LOWER_BYTE (SJIS (Y, Z) */
-#define CCL_DECODE_SJIS 0x17    /* X = HIGHER_BYTE (DE-SJIS (Y, Z))
-                                   r[7] = LOWER_BYTE (DE-SJIS (Y, Z)) */
-
-/* Terminate CCL program successfully.  */
@@ -637 +637 @@
-  do {                                  \
-    ccl->status = CCL_STAT_SUCCESS;     \
-    ccl->ic = CCL_HEADER_MAIN;          \
-    goto ccl_finish;                    \
-  } while (0)
@@ -671 +670 @@
-        if (dst + len <= (dst_bytes ? dst_end : src))   \
-          {                                             \
-
-
+
-          }                                             \
-        else                                            \
@@ -710 +708 @@
-
-
+/* Set C to the character code made from CHARSET and CODE.  This is
+   like MAKE_CHAR but check the validity of CHARSET and CODE.  If they
+   are not valid, set C to (CODE & 0xFF) because that is usually the
+   case that CCL_ReadMultibyteChar2 read an invalid code and it set
+   CODE to that invalid byte.  */
+
+#define CCL_MAKE_CHAR(charset, code, c)                         \
+  do {                                                          \
+    if (charset == CHARSET_ASCII)                               \
+      c = code & 0xFF;                                          \
+    else if (CHARSET_DEFINED_P (charset)                        \
+             && (code & 0x7F) >= 32                             \
+             && (code < 256 || ((code >> 7) & 0x7F) >= 32))     \
+      {                                                         \
+        int c1 = code & 0x7F, c2 = 0;                           \
+                                                                \
+        if (code >= 256)                                        \
+          c2 = c1, c1 = (code >> 7) & 0x7F;                     \
+        c = MAKE_NON_ASCII_CHAR (charset, c1, c2);              \
+      }                                                         \
+    else                                                        \
+      c = code & 0xFF;                                  \
+  } while (0)
+
+
-/* Execute CCL code on SRC_BYTES length text at SOURCE.  The resulting
-   text goes to a place pointed by DESTINATION, the length of which
@@ -729 +752 @@
-    int ic;                     /* Instruction Counter.  */
-  };
+
+/* For the moment, we only support depth 256 of stack.  */ 
+static struct ccl_prog_stack ccl_prog_stack_struct[256];
-
-int
@@ -745 +771 @@
-  int jump_address;
-  int i, j, op;
-0
-For the moment, we only support depth 256 of stack.  */ 
-struct ccl_prog_stack ccl_prog_stack_struct[256]
+ccl->stack_idx
+Instruction counter of the current CCL code. */
+int this_ic
-
-  if (ic >= ccl->eof_ic)
-    ic = CCL_HEADER_MAIN;
+
+  if (ccl->buf_magnification ==0) /* We can't produce any bytes.  */
+    dst = NULL;
-
-#ifdef CCL_DEBUG
@@ -777 +806 @@
-        }
-
+      this_ic = ic;
-      code = XINT (ccl_prog[ic]); ic++;
-      field1 = code >> 8;
@@ -898 +928 @@
-          j = XINT (ccl_prog[ic]);
-          op = field1 >> 6;
-ic++
+jump_address = ic + 1
-          goto ccl_set_expr;
-
@@ -918 +948 @@
-          j = reg[Rrr];
-          op = field1 >> 6;
+          jump_address = ic;
-          goto ccl_set_expr;
-
@@ -974 +1005 @@
-              break;
-            }
+          if (src)
+            src = src_end;
+          /* ccl->ic should points to this command code again to
+             suppress further processing.  */
+          ic--;
-          CCL_SUCCESS;
-
@@ -1069 +1105 @@
-            case CCL_GE: reg[rrr] = i >= j; break;
-            case CCL_NE: reg[rrr] = i != j; break;
+            case CCL_DECODE_SJIS: DECODE_SJIS (i, j, reg[rrr], reg[7]); break;
-            case CCL_ENCODE_SJIS: ENCODE_SJIS (i, j, reg[rrr], reg[7]); break;
-            case CCL_DECODE_SJIS: DECODE_SJIS (i, j, reg[rrr], reg[7]); break;
-            default: CCL_INVALID_CMD;
-            }
@@ -1078 +1114 @@
-              i = reg[rrr];
-              CCL_WRITE_CHAR (i);
+              ic = jump_address;
-            }
-          else if (!reg[rrr])
@@ -1089 +1126 @@
-              if (!src)
-                CCL_INVALID_CMD;
+
-              do {
-                if (src >= src_end)
@@ -1108 +1146 @@
-                    else
-                      ccl->private_state = COMPOSING_NO_RULE_HEAD;
+
+                    continue;
-                  }
-0
+COMPOSING_NO
-                  {
-                    /* composite character */
-*src
-0
+i
+COMPOSING_NO
-                    else
-                      {
+                        if (COMPOSING_WITH_RULE_RULE == ccl->private_state)
+                          {
+                            ccl->private_state = COMPOSING_WITH_RULE_HEAD;
+                            continue;
+                          }
+                        else if (COMPOSING_WITH_RULE_HEAD == ccl->private_state)
+                          ccl->private_state = COMPOSING_WITH_RULE_RULE;
+
-                        if (i == 0xA0)
-                          {
@@ -1124 +1172 @@
-                        else
-                          i -= 0x20;
-
-                        if (COMPOSING_WITH_RULE_RULE == ccl->private_state)
-                          {
-                            ccl->private_state = COMPOSING_WITH_RULE_HEAD;
-                            continue;
-                          }
-                        else if (COMPOSING_WITH_RULE_HEAD == ccl->private_state)
-                          ccl->private_state = COMPOSING_WITH_RULE_RULE;
-                      }
-                  }
+
-                if (i < 0x80)
-                  {
@@ -1176 +1217 @@
-                else
-                  {
-
-   Returned charset is -1.  */
-RRR] = -1
+.  Return a single byte character.  */
+reg[RRR] = CHARSET_ASCII;
+rrr] = i
-                  }
-
+
+
-              break;
-
@@ -1198 +1240 @@
-              i = reg[RRR]; /* charset */
-              if (i == CHARSET_ASCII)
-7
+F
-              else if (i == CHARSET_COMPOSITION)
-                i = MAKE_COMPOSITE_CHAR (reg[rrr]);
@@ -1214 +1256 @@
-            case CCL_TranslateCharacter:
-              i = reg[RRR]; /* charset */
-
-
-
+
-                {
-                  reg[RRR] = -1;
-                  break;
-                }
-
-
-
-
-
-
-
+
-              op = translate_char (GET_TRANSLATION_TABLE (reg[Rrr]),
-                                   i, -1, 0, 0);
@@ -1241 +1275 @@
-              ic++;
-              i = reg[RRR]; /* charset */
-
-
-
+
-                {
-                  reg[RRR] = -1;
-                  break;
-                }
-
-
-
-
-
-
-
+
-              op = translate_char (GET_TRANSLATION_TABLE (op), i, -1, 0, 0);
-              SPLIT_CHAR (op, reg[RRR], i, j);
@@ -1461 +1487 @@
-                    else if (EQ (content, Qlambda))
-                      {
+                        reg[RRR] = i;
-                        break;
-                      }
@@ -1503 +1530 @@
-                else
-                  {
+                    reg[RRR] = 0;
-                    content = XVECTOR (map)->contents[point];
-                    if (NILP (content))
@@ -1508 +1536 @@
-                    else if (NUMBERP (content))
-                      reg[rrr] = XINT (content);
-
-
+
-                    else if (CONSP (content))
-                      {
@@ -1544 +1571 @@
-      int msglen;
-
+      if (!dst)
+        dst = destination;
+
-      switch (ccl->status)
-        {
-        case CCL_STAT_INVALID_CMD:
-          sprintf(msg, "\nCCL: Invalid command %x (ccl_code = %x) at %d.",
-
+this_
-#ifdef CCL_DEBUG
-          {
@@ -1555 +1585 @@
-
-            msglen = strlen (msg);
-dst_end
+(dst_bytes ? dst_end : src)
-              {
-                bcopy (msg, dst, msglen);
@@ -1568 +1598 @@
-                sprintf(msg, " %d", ccl_backtrace_table[i]);
-                msglen = strlen (msg);
-dst_end
+(dst_bytes ? dst_end : src)
-                  break;
-                bcopy (msg, dst, msglen);
-                dst += msglen;
-              }
+            goto ccl_finish;
-          }
-#endif
-goto ccl_finish
+break
-
-        case CCL_STAT_QUIT:
@@ -1586 +1617 @@
-
-      msglen = strlen (msg);
-dst_end
+(dst_bytes ? dst_end : src)
-        {
-          bcopy (msg, dst, msglen);
@@ -1595 +1626 @@
- ccl_finish:
-  ccl->ic = ic;
+  ccl->stack_idx = stack_idx;
+  ccl->prog = ccl_prog;
-  if (consumed) *consumed = src - source;
-dst - destination
+(dst ? dst - destination : 0)
-}
-
-/* Setup fields of the structure pointed by CCL appropriately for the
-
+
+
-void
-setup_ccl_program (ccl, vec)
@@ -1608 +1642 @@
-  int i;
-
-
-
+
+
+
+
+
+
+
+
+
-  ccl->ic = CCL_HEADER_MAIN;
-  ccl->eof_ic = XINT (XVECTOR (vec)->contents[CCL_HEADER_EOF]);
-  ccl->buf_magnification = XINT (XVECTOR (vec)->contents[CCL_HEADER_BUF_MAG]);
-  for (i = 0; i < 8; i++)
-    ccl->reg[i] = 0;
@@ -1618 +1657 @@
-  ccl->private_state = 0;
-  ccl->status = 0;
+  ccl->stack_idx = 0;
-}
-