ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.45 by pcg, Sat Feb 21 20:33:39 2004 UTC vs.
Revision 1.95 by pcg, Sun May 9 18:19:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
51 52
52#include <wchar.h> 53#include <wchar.h>
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
56/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
57void 63void
58rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
59{ 65{
60 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
61 unsigned int newlen; 67 unsigned int newlen;
62 KeySym keysym; 68 KeySym keysym;
63#ifdef DEBUG_CMD 69#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 70 static int debug_key = 1; /* accessible by a debugger only */
65#endif 71#endif
66 int valid_keysym; 72 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 73 unsigned char kbuf[KBUFSZ];
68 74
69 /* 75 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 77 * escape sequence to toggle the Keypad.
… …
87#ifdef USE_XIM 93#ifdef USE_XIM
88 if (Input_Context) 94 if (Input_Context)
89 { 95 {
90 Status status_return; 96 Status status_return;
91 97
98#if 0
92#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
96 else 103 else
97#endif 104#endif
98 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 110 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 115 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 116 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 117 SET_LOCALE (locale);
111 118
112 if (status_return == XLookupChars 119 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 120 || status_return == XLookupBoth)
114 { 121 {
122 /* make sure the user can type ctrl-@, i.e. NUL */
123 if (len == 1 && *wkbuf == 0)
124 {
125 kbuf[0] = 0;
126 len = 1;
127 }
128 else
129 {
115 wkbuf[len] = 0; 130 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 131 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 132 if (len < 0)
118 len = 0; 133 len = 0;
134 }
119 } 135 }
120 else 136 else
121 len = 0; 137 len = 0;
122 } 138 }
123 139
124 valid_keysym = status_return == XLookupKeySym 140 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 141 || status_return == XLookupBoth;
126 } 142 }
127 else 143 else
128#endif 144#endif
129
130 { 145 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 147 valid_keysym = keysym != NoSymbol;
133 } 148 }
134 149
135 if (valid_keysym) 150 if (valid_keysym)
136 { 151 {
137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL
140 if (ctrl)
141# else
142 if (meta)
143# endif
144 {
145 if (keysym == ks_bigfont)
146 {
147 change_font (0, FONT_UP);
148 return;
149 }
150 else if (keysym == ks_smallfont)
151 {
152 change_font (0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (TermWin.saveLines) 152 if (TermWin.saveLines)
159 { 153 {
160#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 155 if (!ctrl && !meta)
162 { 156 {
163#else 157#else
164 if (IS_SCROLL_MOD) 158 if (IS_SCROLL_MOD)
165 { 159 {
166#endif 160#endif
167 int lnsppg; 161 int lnsppg;
168 162
169#ifdef PAGING_CONTEXT_LINES 163#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 165#else
172 lnsppg = TermWin.nrow * 4 / 5; 166 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 204 scr_move_to (1, 0);
211 return; 205 return;
212 } 206 }
213 } 207 }
214#endif 208#endif
215
216 } 209 }
217 210
218 if (shft) 211 if (shft)
219 { 212 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 213 /* Shift + F1 - F10 generates F11 - F20 */
… …
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 224 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 225 selection_request (ev.time, 0, 0);
233 return; 226 return;
234 /* rxvt extras */ 227 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 229 change_font (FONT_UP);
237 return; 230 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 232 change_font (FONT_DN);
240 return; 233 return;
241 } 234 }
242 } 235 }
243 } 236 }
244#ifdef PRINTPIPE 237#ifdef PRINTPIPE
245 if (keysym == XK_Print) 238 if (keysym == XK_Print)
246 { 239 {
247 scr_printscreen (ctrl | shft); 240 scr_printscreen (ctrl | shft);
248 return;
249 }
250#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode () == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset ();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return; 241 return;
265 } 242 }
266#endif 243#endif
267 244
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
270#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
271 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 249 {
273 unsigned int l; 250 unsigned int l;
274 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC;
276 252
277 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
279 255
280 /* escape prefix */ 256 /* escape prefix */
281 if (meta) 257 if (meta
282# ifdef META8_OPTION 258# ifdef META8_OPTION
283 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
284# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
285 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
286 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
287 return; 268 return;
288 } 269 }
289 else 270 else
290#endif 271#endif
291
292 { 272 {
293 newlen = 1; 273 newlen = 1;
294 switch (keysym) 274 switch (keysym)
295 { 275 {
296#ifndef NO_BACKSPACE_KEY 276#ifndef NO_BACKSPACE_KEY
… …
301 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
303 } 283 }
304 else 284 else
305 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
311 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 }
317# endif
318 break; 286 break;
319#endif 287#endif
320#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
321 case XK_Delete: 289 case XK_Delete:
322 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN (kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 291 break;
336#endif 292#endif
337 case XK_Tab: 293 case XK_Tab:
338 if (shft) 294 if (shft)
339 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
349#endif 305#endif
350 newlen = 0; 306 newlen = 0;
351 } 307 }
352 break; 308 break;
353 309
354
355#ifdef XK_KP_Left 310#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 316 {
362 STRCPY (kbuf, "\033OZ"); 317 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 318 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 319 break;
365 } 320 }
366 else 321 else
367 /* translate to std. cursor key */ 322 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 323 keysym = XK_Left + (keysym - XK_KP_Left);
… …
371 case XK_Up: /* "\033[A" */ 326 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 327 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 328 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 329 case XK_Left: /* "\033[D" */
375 STRCPY (kbuf, "\033[Z"); 330 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 331 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 332 /* do Shift first */
378 if (shft) 333 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 334 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 335 else if (ctrl)
381 { 336 {
382 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 338 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 339 }
385 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 342 break;
423 343
424#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
426 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
482 STRCPY (kbuf, "\033OP"); 402 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 403 kbuf[2] += (keysym - XK_KP_F1);
484 break; 404 break;
485 405
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 406 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 407 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 408 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 409 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 410 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 411 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 412 case XK_KP_0: /* "\033Op" : "0" */
… …
615 break; 535 break;
616 } 536 }
617 if (newlen) 537 if (newlen)
618 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
619 } 539 }
540
620 /* 541 /*
621 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
622 */ 543 */
623#ifdef META8_OPTION 544#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
639 { 560 {
640 unsigned char *ch; 561 unsigned char *ch;
641 562
642 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 564 *ch |= 0x80;
565
644 meta = 0; 566 meta = 0;
645 } 567 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat (kbuf, len);
650#endif 568#endif
651 /* nil */ ; 569 /* nil */ ;
652 } 570 }
653 } 571 }
654 572
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 596
679 /* escape prefix */ 597 /* escape prefix */
680 if (meta 598 if (meta
681#ifdef META8_OPTION 599#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
683#endif 601#endif
684 ) 602 )
685 { 603 {
686 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
687
688 tt_write (&ch, 1); 605 tt_write (&ch, 1);
689 } 606 }
607
690#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
693 char *p; 610 unsigned char *p;
694 int i; 611 int i;
695 612
696 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf (stderr, "'\n"); 616 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
703} 619}
704/*}}} */ 620/*}}} */
705 621
… …
707/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
709unsigned int 625unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 627{
712 unsigned int n, s; 628 unsigned int n, s;
713 629
714 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
716 if (n > 0 && s < count) 633 if (n > 0 && s < count)
717 { 634 {
718 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
722 s += n; 639 s += n;
723 } 640 }
641
724 if (count > s) 642 if (count > s)
725 { 643 {
726 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 645 count = s;
728 } 646 }
647
729 for (; count--;) 648 for (; count--;)
730 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
731 return 0; 653 return 0;
732} 654}
733#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
734 656
735void 657void
… …
750 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
751 scrollbar_show (1); 673 scrollbar_show (1);
752#ifdef USE_XIM 674#ifdef USE_XIM
753 IMSendSpot (); 675 IMSendSpot ();
754#endif 676#endif
755
756 } 677 }
757 678
758 display->flush (); 679 display->flush ();
759} 680}
760 681
… …
794bool 715bool
795rxvt_term::pty_fill () 716rxvt_term::pty_fill ()
796{ 717{
797 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 718 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
798 719
720 if (CBUFSIZ == n)
721 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
723 n = 0;
724 }
725
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 726 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 727 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 728 cmdbuf_endp = cmdbuf_ptr + n;
802 729
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
804 731
805 if (n > 0) 732 if (n > 0)
806 { 733 {
807 cmdbuf_endp += n; 734 cmdbuf_endp += n;
808 return true; 735 return true;
809 } 736 }
810 else if (n < 0 && errno != EAGAIN) 737 else if (n < 0 && errno != EAGAIN)
811 destroy (); 738 destroy ();
812 739
813 return false; 740 return false;
814} 741}
815 742
816void 743void
817rxvt_term::pty_cb (io_watcher &w, short revents) 744rxvt_term::pty_cb (io_watcher &w, short revents)
… …
820 SET_LOCALE (locale); 747 SET_LOCALE (locale);
821 748
822 if (revents & EVENT_WRITE) 749 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 750 tt_write (0, 0);
824 else if (revents & EVENT_READ) 751 else if (revents & EVENT_READ)
825 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us 752 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ()) 753 while (pty_fill ())
831 { 754 if (cmd_parse ())
832 if (!seen_input)
833 {
834 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch ();
837 }
838
839 uint32_t ch = NOCHAR;
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break; 755 break;
848
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch;
858
859 for (;;)
860 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else
866 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (! (Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true;
878 flag = false;
879 ch = NOCHAR;
880 break;
881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 }
898 }
899
900 scr_add_lines (buf, nlines, str - buf);
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
914 refresh_limit++;
915
916 scr_refresh (refresh_type);
917 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 }
936 }
937 }
938 }
939}
940
941// read the next character, currently handles UTF-8
942// will probably handle all sorts of other stuff in the future
943uint32_t
944rxvt_term::next_char ()
945{
946 while (cmdbuf_ptr < cmdbuf_endp)
947 {
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++;
950
951 wchar_t wc;
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
953
954 if (len == (size_t)-2)
955 return NOCHAR;
956
957 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959
960 // assume wchar == unicode
961 cmdbuf_ptr += len;
962 return wc;
963 }
964
965 return NOCHAR;
966}
967
968/* rxvt_cmd_getc () - Return next input character */
969/*
970 * Return the next input character after first passing any keyboard input
971 * to the command.
972 */
973uint32_t
974rxvt_term::cmd_getc ()
975{
976 for (;;)
977 {
978 uint32_t c = next_char ();
979 if (c != NOCHAR)
980 return c;
981
982 // incomplete sequences should occur rarely, still, a better solution
983 // would be preferred. either setjmp/longjmp or better design.
984 fcntl (cmd_fd, F_SETFL, 0);
985 pty_fill ();
986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
987 }
988} 756}
989 757
990#ifdef POINTER_BLANK 758#ifdef POINTER_BLANK
991void 759void
992rxvt_term::pointer_unblank () 760rxvt_term::pointer_unblank ()
… …
1021 pointer_blank (); 789 pointer_blank ();
1022} 790}
1023#endif 791#endif
1024 792
1025void 793void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 794rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 795{
1028 int button_number, key_state = 0; 796 int button_number, key_state = 0;
1029 int x, y; 797 int x, y;
1030 798
1031 x = ev.x; 799 x = ev.x;
1032 y = ev.y; 800 y = ev.y;
1033 pixel_position (&x, &y); 801 pixel_position (&x, &y);
1034 802
… …
1237 && (ev.xclient.data.l[0] == DndFile 1005 && (ev.xclient.data.l[0] == DndFile
1238 || ev.xclient.data.l[0] == DndDir 1006 || ev.xclient.data.l[0] == DndDir
1239 || ev.xclient.data.l[0] == DndLink)) 1007 || ev.xclient.data.l[0] == DndLink))
1240 { 1008 {
1241 /* Get Dnd data */ 1009 /* Get Dnd data */
1242 Atom ActualType; 1010 Atom ActualType;
1243 int ActualFormat; 1011 int ActualFormat;
1244 unsigned char *data; 1012 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1013 unsigned long Size, RemainingBytes;
1246 1014
1247 XGetWindowProperty (display->display, display->root, 1015 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1016 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1017 0L, 1000000L,
1250 False, AnyPropertyType, 1018 False, AnyPropertyType,
… …
1253 &data); 1021 &data);
1254 XChangeProperty (display->display, display->root, 1022 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1023 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1024 8, PropModeReplace,
1257 data, STRLEN (data)); 1025 data, STRLEN (data));
1026 XFree (data);
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1027 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1029 }
1261#endif /* OFFIX_DND */ 1030#endif /* OFFIX_DND */
1262 break; 1031 break;
… …
1355 check_our_parents (); 1124 check_our_parents ();
1356 if (am_transparent) 1125 if (am_transparent)
1357 want_full_refresh = 1; 1126 want_full_refresh = 1;
1358 } 1127 }
1359#endif 1128#endif
1360
1361 } 1129 }
1362 break; 1130 break;
1363 1131
1364 case SelectionClear: 1132 case SelectionClear:
1365 display->set_selection_owner (0); 1133 selection_clear ();
1366 break; 1134 break;
1367 1135
1368 case SelectionNotify: 1136 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1137 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1138 selection_paste (ev.xselection.requestor,
… …
1401 { 1169 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1170#ifdef NO_SLOW_LINK_SUPPORT
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1171 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1172 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1173#else
1406 // don't understand this, so commented it out 1174 // I don't understand this, so I changed it :)
1407 scr_expose (ev.xexpose.x, ev.xexpose.y, 1175 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev.xexpose.width, ev.xexpose.height, False); 1176 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev.xexpose.x, 0, 1177 //scr_expose (ev.xexpose.x, 0,
1410 // ev.xexpose.width, TermWin.height, False); 1178 // ev.xexpose.width, TermWin.height, False);
1411#endif 1179#endif
… …
1413 } 1181 }
1414 else 1182 else
1415 { 1183 {
1416 XEvent unused_event; 1184 XEvent unused_event;
1417 1185
1418 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1419 Expose, 1187 ;
1420 &unused_event)) ;
1421 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1422 GraphicsExpose, 1189 ;
1423 &unused_event)) ; 1190
1424 if (isScrollbarWindow (ev.xany.window)) 1191 if (isScrollbarWindow (ev.xany.window))
1425 { 1192 {
1426 scrollBar.setIdle (); 1193 scrollBar.setIdle ();
1427 scrollbar_show (0); 1194 scrollbar_show (0);
1428 } 1195 }
1429#ifdef MENUBAR 1196#ifdef MENUBAR
1430 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1431 menubar_expose (); 1198 menubar_expose ();
1432#endif 1199#endif
1433#ifdef RXVT_GRAPHICS
1434 Gr_expose (ev.xany.window);
1435#endif
1436
1437 } 1200 }
1438 break; 1201 break;
1439 1202
1440 case MotionNotify: 1203 case MotionNotify:
1441#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
… …
1443 pointer_unblank (); 1206 pointer_unblank ();
1444#endif 1207#endif
1445#if MENUBAR 1208#if MENUBAR
1446 if (isMenuBarWindow (ev.xany.window)) 1209 if (isMenuBarWindow (ev.xany.window))
1447 { 1210 {
1448 menubar_control (& (ev.xbutton)); 1211 menubar_control (ev.xbutton);
1449 break; 1212 break;
1450 } 1213 }
1451#endif 1214#endif
1452 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1453 break; 1216 break;
… …
1573 return; 1336 return;
1574 } 1337 }
1575 1338
1576 /* FALLTHROUGH */ 1339 /* FALLTHROUGH */
1577 case ReparentNotify: 1340 case ReparentNotify:
1578 if ((Options & Opt_transparent) && check_our_parents ()) 1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1579 if (am_transparent)
1580 want_full_refresh = 1; 1342 want_full_refresh = 1;
1581 break; 1343 break;
1582#endif 1344#endif
1583 } 1345 }
1584} 1346}
1585 1347
1586void 1348void
1587rxvt_term::button_press (const XButtonEvent &ev) 1349rxvt_term::button_press (XButtonEvent &ev)
1588{ 1350{
1589 int reportmode = 0, clickintime; 1351 int reportmode = 0, clickintime;
1590 1352
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1354 if (!bypass_keystate)
… …
1594 /* 1356 /*
1595 * VT window processing of button press 1357 * VT window processing of button press
1596 */ 1358 */
1597 if (ev.window == TermWin.vt) 1359 if (ev.window == TermWin.vt)
1598 { 1360 {
1599#if RXVT_GRAPHICS
1600 if (ev.subwindow != None)
1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else
1603#endif
1604
1605 {
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1362 if (reportmode)
1363 {
1364 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state;
1367#ifdef MOUSE_REPORT_DOUBLECLICK
1368 if (ev.button == MEvent.button && clickintime)
1608 { 1369 {
1609 /* mouse report from vt window */ 1370 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1371 MEvent.clicks++;
1611 MEvent.state = ev.state; 1372 if (MEvent.clicks > 1)
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1373 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1374 /* only report double clicks */
1620 MEvent.clicks = 2; 1375 MEvent.clicks = 2;
1621 mouse_report (ev); 1376 mouse_report (ev);
1622 1377
1623 /* don't report the release */ 1378 /* don't report the release */
1624 MEvent.clicks = 0; 1379 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1380 MEvent.button = AnyButton;
1626 }
1627 } 1381 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev.button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 } 1382 }
1641 else 1383 else
1642 { 1384 {
1385 /* different button, or time expired */
1386 MEvent.clicks = 1;
1387 MEvent.button = ev.button;
1388 mouse_report (ev);
1389 }
1390#else
1391 MEvent.button = ev.button;
1392 mouse_report (ev);
1393#endif /* MOUSE_REPORT_DOUBLECLICK */
1394
1395 }
1396 else
1397 {
1643 if (ev.button != MEvent.button) 1398 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1399 MEvent.clicks = 0;
1645 switch (ev.button) 1400 switch (ev.button)
1646 { 1401 {
1647 case Button1: 1402 case Button1:
1648 /* allow shift+left click to extend selection */ 1403 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1405 {
1651 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev.x, ev.y, 1);
1655 }
1656 else
1657 {
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev.x, ev.y);
1664 }
1665
1666 MEvent.button = Button1;
1667 break;
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1406 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1407 selection_rotate (ev.x, ev.y);
1672 else 1408 else
1673 selection_extend (ev.x, ev.y, 1); 1409 selection_extend (ev.x, ev.y, 1);
1410 }
1411 else
1412 {
1413 if (MEvent.button == Button1 && clickintime)
1414 MEvent.clicks++;
1415 else
1416 MEvent.clicks = 1;
1417
1418 selection_click (MEvent.clicks, ev.x, ev.y);
1419 }
1420
1421 MEvent.button = Button1;
1422 break;
1423
1424 case Button3:
1425 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y);
1427 else
1428 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1429 MEvent.button = Button3;
1675 break; 1430 break;
1676 }
1677 } 1431 }
1432 }
1678 MEvent.time = ev.time; 1433 MEvent.time = ev.time;
1679 return; 1434 return;
1680 }
1681 } 1435 }
1682 1436
1683 /* 1437 /*
1684 * Scrollbar window processing of button press 1438 * Scrollbar window processing of button press
1685 */ 1439 */
… …
1828 menubar_control (ev); 1582 menubar_control (ev);
1829#endif 1583#endif
1830} 1584}
1831 1585
1832void 1586void
1833rxvt_term::button_release (const XButtonEvent &ev) 1587rxvt_term::button_release (XButtonEvent &ev)
1834{ 1588{
1835 int reportmode = 0; 1589 int reportmode = 0;
1836 1590
1837 csrO = 0; /* reset csr Offset */ 1591 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1592 if (!bypass_keystate)
… …
1850#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1605 pending_scroll_selection=0;
1852#endif 1606#endif
1853 if (ev.window == TermWin.vt) 1607 if (ev.window == TermWin.vt)
1854 { 1608 {
1855#ifdef RXVT_GRAPHICS
1856 if (ev.subwindow != None)
1857 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1858 else
1859#endif
1860
1861 {
1862 if (reportmode) 1609 if (reportmode)
1610 {
1611 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4)
1614 return;
1615#ifdef MOUSE_REPORT_DOUBLECLICK
1616 /* only report the release of 'slow' single clicks */
1617 if (MEvent.button != AnyButton
1618 && (ev.button != MEvent.button
1619 || (ev.time - MEvent.time
1620 > MULTICLICK_TIME / 2)))
1863 { 1621 {
1864 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */
1866 if (ev.button >= 4)
1867 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev.button != MEvent.button
1872 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1874 {
1875 MEvent.clicks = 0; 1622 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 1623 MEvent.button = AnyButton;
1881 mouse_report (ev); 1624 mouse_report (ev);
1625 }
1626#else /* MOUSE_REPORT_DOUBLECLICK */
1627 MEvent.button = AnyButton;
1628 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 1629#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 1630 return;
1884 } 1631 }
1885 /* 1632 /*
1886 * dumb hack to compensate for the failure of click-and-drag 1633 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1634 * when overriding mouse reporting
1888 */ 1635 */
1889 if (PrivateModes & PrivMode_mouse_report 1636 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1637 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1) 1638 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0); 1639 selection_extend (ev.x, ev.y, 0);
1893 1640
1894 switch (ev.button) 1641 switch (ev.button)
1642 {
1643 case Button1:
1644 case Button3:
1645 selection_make (ev.time);
1646 break;
1647 case Button2:
1648 selection_request (ev.time, ev.x, ev.y);
1649 break;
1650#ifdef MOUSE_WHEEL
1651 case Button4:
1652 case Button5:
1895 { 1653 {
1896 case Button1: 1654 int i;
1897 case Button3: 1655 page_dirn v;
1898 selection_make (ev.time); 1656
1657 v = (ev.button == Button4) ? UP : DN;
1658 if (ev.state & ShiftMask)
1899 break; 1659 i = 1;
1900 case Button2: 1660 else if ((Options & Opt_mouseWheelScrollPage))
1901 selection_request (ev.time, ev.x, ev.y); 1661 i = TermWin.nrow - 1;
1662 else
1902 break; 1663 i = 5;
1903#ifdef MOUSE_WHEEL 1664# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 1665 if (ev.state & ControlMask)
1905 case Button5:
1906 { 1666 {
1907 int i;
1908 page_dirn v;
1909
1910 v = (ev.button == Button4) ? UP : DN;
1911 if (ev.state & ShiftMask)
1912 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1;
1915 else
1916 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING
1918 if (ev.state & ControlMask)
1919 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1); 1667 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 } 1669 }
1923# endif 1670# endif
1924# ifdef JUMP_MOUSE_WHEEL 1671# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1925 scr_page (v, i); 1678 scr_page (v, 1);
1926 scr_refresh (SMOOTH_REFRESH); 1679 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 1680 scrollbar_show (1);
1928# else
1929 while (i--)
1930 {
1931 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1);
1934 } 1681 }
1935# endif 1682# endif
1936 1683
1937 }
1938 break;
1939#endif
1940
1941 } 1684 }
1685 break;
1686#endif
1687
1942 } 1688 }
1943 } 1689 }
1944#ifdef MENUBAR 1690#ifdef MENUBAR
1945 else if (isMenuBarWindow (ev.window)) 1691 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1692 menubar_control (ev);
1947#endif 1693#endif
1948} 1694}
1949 1695
1950
1951#ifdef TRANSPARENT 1696#ifdef TRANSPARENT
1697#if TINTING
1698/* shading taken from eterm-0.9.2 */
1699/* RGB 15 */
1700
1701static void
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1709 /* No saturation */
1710 for (y = h; --y >= 0;) {
1711 for (x = -w; x < 0; x++) {
1712 int r, g, b;
1713
1714 b = ((uint16_t *) ptr)[x];
1715 r = (b & 0x7c00) * rm;
1716 g = (b & 0x3e0) * gm;
1717 b = (b & 0x1f) * bm;
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1719 | ((g >> 8) & 0x3e0)
1720 | ((b >> 8) & 0x1f);
1721 }
1722 ptr += bpl;
1723 }
1724 } else {
1725 for (y = h; --y >= 0;) {
1726 for (x = -w; x < 0; x++) {
1727 int r, g, b;
1728
1729 b = ((uint16_t *) ptr)[x];
1730 r = (b & 0x7c00) * rm;
1731 g = (b & 0x3e0) * gm;
1732 b = (b & 0x1f) * bm;
1733 r |= (!(r >> 15) - 1);
1734 g |= (!(g >> 10) - 1);
1735 b |= (!(b >> 5) - 1);
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1737 | ((g >> 8) & 0x3e0)
1738 | ((b >> 8) & 0x1f);
1739 }
1740 ptr += bpl;
1741 }
1742 }
1743}
1744
1745/* RGB 16 */
1746static void
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 24 */
1791static void
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 }
1822 } else {
1823 for (y = h; --y >= 0;) {
1824 for (x = -(w * 3); x < 0; x += 3) {
1825 int r, g, b;
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 }
1853 ptr += bpl;
1854 }
1855 }
1856}
1857
1858/* RGB 32 */
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928}
1929
1930#endif
1931
1952/* 1932/*
1953 * Check our parents are still who we think they are. 1933 * Check our parents are still who we think they are.
1954 * Do transparency updates if required 1934 * Do transparency updates if required
1955 */ 1935 */
1956int 1936int
1957rxvt_term::check_our_parents () 1937rxvt_term::check_our_parents ()
1958{ 1938{
1959 int i, pchanged, aformat, have_pixmap, rootdepth; 1939 int i, pchanged, aformat, have_pixmap, rootdepth;
1960 unsigned long nitems, bytes_after; 1940 unsigned long nitems, bytes_after;
1961 Atom atype; 1941 Atom atype;
1962 unsigned char *prop = NULL; 1942 unsigned char *prop = NULL;
1963 Window root, oldp, *list; 1943 Window root, oldp, *list;
1964 Pixmap rootpixmap = None; 1944 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 1945 XWindowAttributes wattr, wrootattr;
1966 1946
1967 pchanged = 0; 1947 pchanged = 0;
1968 1948
1969 if (! (Options & Opt_transparent)) 1949 if (!(Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 1950 return pchanged; /* Don't try any more */
1971 1951
1972 XGetWindowAttributes (display->display, display->root, &wrootattr); 1952 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 1953 rootdepth = wrootattr.depth;
1974 1954
1975 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1956
1976 if (rootdepth != wattr.depth) 1957 if (rootdepth != wattr.depth)
1977 { 1958 {
1978 if (am_transparent) 1959 if (am_transparent)
1979 { 1960 {
1980 pchanged = 1; 1961 pchanged = 1;
1981 XSetWindowBackground (display->display, TermWin.vt, 1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1982 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 1963 am_transparent = am_pixmap_trans = 0;
1984 } 1964 }
1965
1985 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1986 } 1967 }
1987 1968
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 1969 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync (display->display, False); 1970 XSync (display->display, False);
… …
1991 /* 1972 /*
1992 * Make the frame window set by the window manager have 1973 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 1974 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 1975 * windows for each client, so we have to take care about that.
1995 */ 1976 */
1996 i = (xa[XA_XROOTPMAPID] != 0 1977 i = (xa[XA_XROOTPMAPID]
1997 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 1980 &nitems, &bytes_after, &prop) == Success);
1981
1982 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success);
1987
2000 if (!i || prop == NULL) 1988 if (!i || prop == NULL)
2001 have_pixmap = 0; 1989 have_pixmap = 0;
2002 else 1990 else
2003 { 1991 {
2004 have_pixmap = 1; 1992 have_pixmap = 1;
2005 rootpixmap = * ((Pixmap *)prop); 1993 rootpixmap = *(Pixmap *)prop;
2006 XFree (prop); 1994 XFree (prop);
2007 } 1995 }
1996
2008 if (have_pixmap) 1997 if (have_pixmap)
2009 { 1998 {
2010 /* 1999 /*
2011 * Copy display->root pixmap transparency 2000 * Copy display->root pixmap transparency
2012 */ 2001 */
2013 int sx, sy, nx, ny; 2002 int sx, sy, nx, ny;
2014 unsigned int nw, nh; 2003 unsigned int nw, nh;
2015 Window cr; 2004 Window cr;
2016 XImage *image; 2005 XImage *image;
2017 GC gc; 2006 GC gc;
2018 XGCValues gcvalue; 2007 XGCValues gcvalue;
2019 2008
2020 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 2010 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 2011 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 2012 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 2013 nx = ny = 0;
2014
2025 if (sx < 0) 2015 if (sx < 0)
2026 { 2016 {
2027 nw += sx; 2017 nw += sx;
2028 nx = -sx; 2018 nx = -sx;
2029 sx = 0; 2019 sx = 0;
2030 } 2020 }
2021
2031 if (sy < 0) 2022 if (sy < 0)
2032 { 2023 {
2033 nh += sy; 2024 nh += sy;
2034 ny = -sy; 2025 ny = -sy;
2035 sy = 0; 2026 sy = 0;
2036 } 2027 }
2028
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 2031 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 ZPixmap); 2033
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2035 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2036 allowedxerror = 0;
2037
2045 if (image == NULL) 2038 if (image == NULL)
2046 { 2039 {
2047 if (am_transparent && am_pixmap_trans) 2040 if (am_transparent && am_pixmap_trans)
2048 { 2041 {
2049 pchanged = 1; 2042 pchanged = 1;
… …
2051 { 2044 {
2052 XFreePixmap (display->display, TermWin.pixmap); 2045 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 2046 TermWin.pixmap = None;
2054 } 2047 }
2055 } 2048 }
2049
2056 am_pixmap_trans = 0; 2050 am_pixmap_trans = 0;
2057 } 2051 }
2058 else 2052 else
2059 { 2053 {
2060 if (TermWin.pixmap != None) 2054 if (TermWin.pixmap != None)
2061 XFreePixmap (display->display, TermWin.pixmap); 2055 XFreePixmap (display->display, TermWin.pixmap);
2056
2057#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint))
2059 {
2060 unsigned short shade, rm, gm, bm;
2061
2062 PixColors[Color_tint].get (display, rm, gm, bm);
2063
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 }
2075#endif
2076
2062 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 2078 szHint.width, szHint.height, image->depth);
2065 (unsigned int)image->depth);
2066 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 2081 nx, ny, image->width, image->height);
2070 XFreeGC (display->display, gc); 2082 XFreeGC (display->display, gc);
2071 XDestroyImage (image); 2083 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap); 2085 TermWin.pixmap);
2086
2074 if (!am_transparent || !am_pixmap_trans) 2087 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 2088 pchanged = 1;
2089
2076 am_transparent = am_pixmap_trans = 1; 2090 am_transparent = am_pixmap_trans = 1;
2077 } 2091 }
2078 } 2092 }
2093
2079 if (!am_pixmap_trans) 2094 if (!am_pixmap_trans)
2080 { 2095 {
2081 unsigned int n; 2096 unsigned int n;
2082 /* 2097 /*
2083 * InheritPixmap transparency 2098 * InheritPixmap transparency
2084 */ 2099 */
2085 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2087 i++)
2088 { 2102 {
2089 oldp = TermWin.parent[i]; 2103 oldp = TermWin.parent[i];
2090 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2104 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2105 &TermWin.parent[i], &list, &n);
2092 XFree (list); 2106 XFree (list);
2093 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108
2094 if (TermWin.parent[i] == display->root) 2109 if (TermWin.parent[i] == display->root)
2095 { 2110 {
2096 if (oldp != None) 2111 if (oldp != None)
2097 pchanged = 1; 2112 pchanged = 1;
2113
2098 break; 2114 break;
2099 } 2115 }
2116
2100 if (oldp != TermWin.parent[i]) 2117 if (oldp != TermWin.parent[i])
2101 pchanged = 1; 2118 pchanged = 1;
2102 } 2119 }
2120
2103 n = 0; 2121 n = 0;
2122
2104 if (pchanged) 2123 if (pchanged)
2105 { 2124 {
2106 for (; n < (unsigned int)i; n++) 2125 for (; n < (unsigned int)i; n++)
2107 { 2126 {
2108 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2112 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2132 break;
2114 } 2133 }
2115 } 2134 }
2116 } 2135 }
2117 if (n > (int) (sizeof (TermWin.parent) 2136
2118 / sizeof (TermWin.parent[0]))) 2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2119 { 2138 {
2120 D_X ((stderr, "InheritPixmap Turning off")); 2139 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground (display->display, TermWin.parent[0], 2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2122 PixColors[Color_fg]);
2123 XSetWindowBackground (display->display, TermWin.vt, 2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2124 PixColors[Color_bg]);
2125 am_transparent = 0; 2142 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2143 /* XXX: also turn off Opt_transparent? */
2127 } 2144 }
2128 else 2145 else
2129 { 2146 {
2147#if WAIT_FOR_WM
2130 /* wait (an arbitrary period) for the WM to do its thing 2148 /* wait (an arbitrary period) for the WM to do its thing
2131 * needed for fvwm2.2.2 (and before?) */ 2149 * needed for fvwm2.2.2 (and before?) */
2132# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt;
2134
2135 rqt.tv_sec = 1;
2136 rqt.tv_nsec = 0;
2137 nanosleep (&rqt, NULL);
2138# else
2139 sleep (1); 2150 sleep (1);
2140# endif 2151#endif
2141 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2153 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2144 ParentRelative); 2155
2145 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2146 ParentRelative);
2147 am_transparent = 1; 2157 am_transparent = 1;
2148 } 2158 }
2159
2149 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2161 TermWin.parent[i] = None;
2151 } 2162 }
2163
2152 return pchanged; 2164 return pchanged;
2153} 2165}
2154#endif 2166#endif
2155 2167
2156/*}}} */ 2168/*}}} */
2169
2170bool
2171rxvt_term::cmd_parse ()
2172{
2173 bool flag = false;
2174 unicode_t ch = NOCHAR;
2175 unsigned char *seq_begin; // remember start of esc-sequence here
2176
2177 for (;;)
2178 {
2179 if (ch == NOCHAR)
2180 {
2181 seq_begin = cmdbuf_ptr;
2182 ch = next_char ();
2183 }
2184
2185 if (ch == NOCHAR) // TODO: improve
2186 break;
2187
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 {
2190 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false;
2193 int nlines = 0;
2194 unicode_t *str = buf;
2195
2196 *str++ = ch;
2197
2198 for (;;)
2199 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break;
2205
2206 *str++ = ch;
2207
2208 if (ch == C0_LF)
2209 {
2210 nlines++;
2211 refresh_count++;
2212
2213 if (! (Options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2215 {
2216 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR;
2219 break;
2220 }
2221
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1)
2224 {
2225 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0;
2227 str = buf;
2228 }
2229 }
2230
2231 if (str >= buf + UBUFSIZ)
2232 {
2233 ch = NOCHAR;
2234 break;
2235 }
2236 }
2237
2238 scr_add_lines (buf, nlines, str - buf);
2239
2240 /*
2241 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */
2249 if (refreshnow)
2250 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++;
2253 else
2254 scr_refresh (refresh_type);
2255 }
2256
2257 }
2258 else
2259 {
2260 try
2261 {
2262 process_nonprinting (ch);
2263 }
2264 catch (const class out_of_input &o)
2265 {
2266 // we ran out of input, retry later
2267 cmdbuf_ptr = seq_begin;
2268 break;
2269 }
2270
2271 ch = NOCHAR;
2272 }
2273 }
2274
2275 return flag;
2276}
2277
2278// read the next character
2279unicode_t
2280rxvt_term::next_char ()
2281{
2282 while (cmdbuf_ptr < cmdbuf_endp)
2283 {
2284 // assume 7-bit to be ascii ALWAYS
2285 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2286 return *cmdbuf_ptr++;
2287
2288 wchar_t wc;
2289 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2290
2291 if (len == (size_t)-2)
2292 {
2293 // the mbstate stores incomplete sequences. didn't know this :/
2294 cmdbuf_ptr = cmdbuf_endp;
2295 break;
2296 }
2297
2298 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300
2301 // assume wchar == unicode
2302 cmdbuf_ptr += len;
2303 return wc;
2304 }
2305
2306 return NOCHAR;
2307}
2308
2309/* rxvt_cmd_getc () - Return next input character */
2310/*
2311 * Return the next input character after first passing any keyboard input
2312 * to the command.
2313 */
2314unicode_t
2315rxvt_term::cmd_getc ()
2316{
2317 unicode_t c = next_char ();
2318
2319 if (c == NOCHAR)
2320 throw out_of_input;
2321
2322 return c;
2323}
2157 2324
2158/*{{{ print pipe */ 2325/*{{{ print pipe */
2159/*----------------------------------------------------------------------*/ 2326/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2327#ifdef PRINTPIPE
2161FILE * 2328FILE *
2162rxvt_term::popen_printer () 2329rxvt_term::popen_printer ()
2163{ 2330{
2164 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2331 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2332
2166 if (stream == NULL) 2333 if (stream == NULL)
2167 rxvt_print_error ("can't open printer pipe"); 2334 rxvt_warn ("can't open printer pipe, not printing.\n");
2335
2168 return stream; 2336 return stream;
2169} 2337}
2170 2338
2171int 2339int
2172rxvt_term::pclose_printer (FILE *stream) 2340rxvt_term::pclose_printer (FILE *stream)
2173{ 2341{
2174 fflush (stream); 2342 fflush (stream);
2175 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */
2179# else
2180 return pclose (stream); 2343 return pclose (stream);
2181# endif
2182} 2344}
2183 2345
2184/* 2346/*
2185 * simulate attached vt100 printer 2347 * simulate attached vt100 printer
2186 */ 2348 */
2187void 2349void
2188rxvt_term::process_print_pipe () 2350rxvt_term::process_print_pipe ()
2189{ 2351{
2190 int done; 2352 int done;
2191 FILE *fd; 2353 FILE *fd;
2192 2354
2193 if ((fd = popen_printer ()) == NULL) 2355 if ((fd = popen_printer ()) == NULL)
2194 return; 2356 return;
2195 2357
2196 /* 2358 /*
2197 * Send all input to the printer until either ESC[4i or ESC[?4i 2359 * Send all input to the printer until either ESC[4i or ESC[?4i
2198 * is received. 2360 * is received.
2199 */ 2361 */
2200 for (done = 0; !done;) 2362 for (done = 0; !done;)
2201 { 2363 {
2202 unsigned char buf[8]; 2364 unsigned char buf[8];
2203 unsigned char ch; 2365 unicode_t ch;
2204 unsigned int i, len; 2366 unsigned int i, len;
2205 2367
2206 if ((ch = cmd_getc ()) != C0_ESC) 2368 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2369 {
2208 if (putc (ch, fd) == EOF) 2370 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2371 break; /* done = 1 */
… …
2224 { 2386 {
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2387 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2388 break; /* done = 1 */
2227 } 2389 }
2228 } 2390 }
2391
2229 for (i = 0; i < len; i++) 2392 for (i = 0; i < len; i++)
2230 if (putc (buf[i], fd) == EOF) 2393 if (putc (buf[i], fd) == EOF)
2231 { 2394 {
2232 done = 1; 2395 done = 1;
2233 break; 2396 break;
2234 } 2397 }
2235 } 2398 }
2236 } 2399 }
2400
2237 pclose_printer (fd); 2401 pclose_printer (fd);
2238} 2402}
2239#endif /* PRINTPIPE */ 2403#endif /* PRINTPIPE */
2240/*}}} */ 2404/*}}} */
2241 2405
2242/* *INDENT-OFF* */ 2406/* *INDENT-OFF* */
2243enum { 2407enum {
2244 C1_40 = 0x40, 2408 C1_40 = 0x40,
2245 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2409 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2246 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2410 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2247 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2411 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2248 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2412 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2249}; 2413};
2250/* *INDENT-ON* */ 2414/* *INDENT-ON* */
2251 2415
2252/*{{{ process non-printing single characters */ 2416/*{{{ process non-printing single characters */
2253void 2417void
2254rxvt_term::process_nonprinting (unsigned char ch) 2418rxvt_term::process_nonprinting (unicode_t ch)
2255{ 2419{
2256 switch (ch) 2420 switch (ch)
2257 { 2421 {
2422 case C0_ESC:
2423 process_escape_seq ();
2424 break;
2258 case C0_ENQ: /* terminal Status */ 2425 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2426 if (rs[Rs_answerbackstring])
2260 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2429 else
2264 tt_write ((unsigned char *)VT100_ANS, 2430 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN (VT100_ANS)); 2431 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2432 break;
2267 case C0_BEL: /* bell */ 2433 case C0_BEL: /* bell */
2268 scr_bell (); 2434 scr_bell ();
2269 break; 2435 break;
2270 case C0_BS: /* backspace */ 2436 case C0_BS: /* backspace */
… …
2285 scr_charset_choose (1); 2451 scr_charset_choose (1);
2286 break; 2452 break;
2287 case C0_SI: /* shift in - acs */ 2453 case C0_SI: /* shift in - acs */
2288 scr_charset_choose (0); 2454 scr_charset_choose (0);
2289 break; 2455 break;
2456
2457 // 8-bit controls
2458 case 0x90: /* DCS */
2459 process_dcs_seq ();
2460 break;
2461 case 0x9b: /* CSI */
2462 process_csi_seq ();
2463 break;
2464 case 0x9d: /* CSI */
2465 process_osc_seq ();
2466 break;
2290 } 2467 }
2291} 2468}
2292/*}}} */ 2469/*}}} */
2293 2470
2294 2471
2295/*{{{ process VT52 escape sequences */ 2472/*{{{ process VT52 escape sequences */
2296void 2473void
2297rxvt_term::process_escape_vt52 (unsigned char ch) 2474rxvt_term::process_escape_vt52 (unicode_t ch)
2298{ 2475{
2299 int row, col; 2476 int row, col;
2300 2477
2301 switch (ch) 2478 switch (ch)
2302 { 2479 {
… …
2354 2531
2355/*{{{ process escape sequences */ 2532/*{{{ process escape sequences */
2356void 2533void
2357rxvt_term::process_escape_seq () 2534rxvt_term::process_escape_seq ()
2358{ 2535{
2359 unsigned char ch = cmd_getc (); 2536 unicode_t ch = cmd_getc ();
2360 2537
2361 if (PrivateModes & PrivMode_vt52) 2538 if (PrivateModes & PrivMode_vt52)
2362 { 2539 {
2363 process_escape_vt52 (ch); 2540 process_escape_vt52 (ch);
2364 return; 2541 return;
… …
2381 scr_charset_set (2, (unsigned int)cmd_getc ()); 2558 scr_charset_set (2, (unsigned int)cmd_getc ());
2382 break; 2559 break;
2383 case '+': 2560 case '+':
2384 scr_charset_set (3, (unsigned int)cmd_getc ()); 2561 scr_charset_set (3, (unsigned int)cmd_getc ());
2385 break; 2562 break;
2386#ifdef MULTICHAR_SET
2387 case '$':
2388 scr_charset_set (-2, (unsigned int)cmd_getc ());
2389 break;
2390#endif
2391#ifndef NO_FRILLS 2563#ifndef NO_FRILLS
2392 case '6': 2564 case '6':
2393 scr_backindex (); 2565 scr_backindex ();
2394 break; 2566 break;
2395#endif 2567#endif
… …
2417 break; 2589 break;
2418 2590
2419 /* 8.3.87: NEXT LINE */ 2591 /* 8.3.87: NEXT LINE */
2420 case C1_NEL: /* ESC E */ 2592 case C1_NEL: /* ESC E */
2421 { 2593 {
2422 uint32_t nlcr[] = { '\n', '\r' }; 2594 unicode_t nlcr[] = { C0_LF, C0_CR };
2423 scr_add_lines (nlcr, 1, 2); 2595 scr_add_lines (nlcr, 1, 2);
2424 } 2596 }
2425 break; 2597 break;
2426 2598
2427 /* kidnapped escape sequence: Should be 8.3.48 */ 2599 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2438 case C1_RI: /* ESC M */ 2610 case C1_RI: /* ESC M */
2439 scr_index (DN); 2611 scr_index (DN);
2440 break; 2612 break;
2441 2613
2442 /* 8.3.142: SINGLE-SHIFT TWO */ 2614 /* 8.3.142: SINGLE-SHIFT TWO */
2443 /*case C1_SS2: scr_single_shift (2); break; */ 2615 /*case C1_SS2: scr_single_shift (2); break; */
2444 2616
2445 /* 8.3.143: SINGLE-SHIFT THREE */ 2617 /* 8.3.143: SINGLE-SHIFT THREE */
2446 /*case C1_SS3: scr_single_shift (3); break; */ 2618 /*case C1_SS3: scr_single_shift (3); break; */
2447 2619
2448 /* 8.3.27: DEVICE CONTROL STRING */ 2620 /* 8.3.27: DEVICE CONTROL STRING */
2449 case C1_DCS: /* ESC P */ 2621 case C1_DCS: /* ESC P */
2450 process_dcs_seq (); 2622 process_dcs_seq ();
2451 break; 2623 break;
… …
2466 process_osc_seq (); 2638 process_osc_seq ();
2467 break; 2639 break;
2468 2640
2469 /* 8.3.106: RESET TO INITIAL STATE */ 2641 /* 8.3.106: RESET TO INITIAL STATE */
2470 case 'c': 2642 case 'c':
2643 mbstate.reset ();
2471 scr_poweron (); 2644 scr_poweron ();
2472 scrollbar_show (1); 2645 scrollbar_show (1);
2473 break; 2646 break;
2474 2647
2475 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2648 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2487 2660
2488/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2661/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2489/* *INDENT-OFF* */ 2662/* *INDENT-OFF* */
2490enum { 2663enum {
2491 CSI_ICH = 0x40, 2664 CSI_ICH = 0x40,
2492 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2665 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2493 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2666 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2494 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2667 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2495 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2668 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2496 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2669 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2497 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2670 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2512 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2685 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2686 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2687 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2688 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2689 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2690 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2518 }; 2691 };
2519/* *INDENT-ON* */ 2692/* *INDENT-ON* */
2520 2693
2521void 2694void
2522rxvt_term::process_csi_seq () 2695rxvt_term::process_csi_seq ()
2523{ 2696{
2524 unsigned char ch, priv, i; 2697 unicode_t ch, priv, i;
2525 unsigned int nargs, p; 2698 unsigned int nargs, p;
2526 int n, ndef; 2699 int n, ndef;
2527 int arg[ESC_ARGS]; 2700 int arg[ESC_ARGS];
2528 2701
2529 for (nargs = ESC_ARGS; nargs > 0;) 2702 for (nargs = ESC_ARGS; nargs > 0;)
2530 arg[--nargs] = 0; 2703 arg[--nargs] = 0;
2531 2704
2532 priv = 0; 2705 priv = 0;
… …
2534 if (ch >= '<' && ch <= '?') 2707 if (ch >= '<' && ch <= '?')
2535 { /* '<' '=' '>' '?' */ 2708 { /* '<' '=' '>' '?' */
2536 priv = ch; 2709 priv = ch;
2537 ch = cmd_getc (); 2710 ch = cmd_getc ();
2538 } 2711 }
2712
2539 /* read any numerical arguments */ 2713 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2714 for (n = -1; ch < CSI_ICH; )
2541 { 2715 {
2542 if (isdigit (ch)) 2716 if (isdigit (ch))
2543 { 2717 {
… …
2550 { 2724 {
2551 if (nargs < ESC_ARGS) 2725 if (nargs < ESC_ARGS)
2552 arg[nargs++] = n; 2726 arg[nargs++] = n;
2553 n = -1; 2727 n = -1;
2554 } 2728 }
2555 else if (ch == '\b') 2729 else if (IS_CONTROL (ch))
2556 {
2557 scr_backspace ();
2558 }
2559 else if (ch == C0_ESC)
2560 {
2561 process_escape_seq ();
2562 return;
2563 }
2564 else if (ch < ' ')
2565 {
2566 process_nonprinting (ch); 2730 process_nonprinting (ch);
2567 } 2731
2568 ch = cmd_getc (); 2732 ch = cmd_getc ();
2569 } 2733 }
2570 2734
2571 if (ch > CSI_7F) 2735 if (ch > CSI_7F)
2572 return; 2736 return;
… …
2730 tt_printf ("\033[0n"); 2894 tt_printf ("\033[0n");
2731 break; 2895 break;
2732 case 6: /* CPR requested */ 2896 case 6: /* CPR requested */
2733 scr_report_position (); 2897 scr_report_position ();
2734 break; 2898 break;
2735#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2899 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure)
2737 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2901 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 2902 break;
2739#endif
2740 case 8: /* unofficial extension */ 2903 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2742 break; 2905 break;
2743 } 2906 }
2744 break; 2907 break;
2745 2908
2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2909 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2814#endif 2977#endif
2815 2978
2816 case CSI_78: /* DECREQTPARM */ 2979 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 2980 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2981 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 2982 break;
2820 2983
2821 default: 2984 default:
2822 break; 2985 break;
2823 } 2986 }
2824} 2987}
… …
2827#ifndef NO_FRILLS 2990#ifndef NO_FRILLS
2828/* ARGSUSED */ 2991/* ARGSUSED */
2829void 2992void
2830rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2993rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2831{ 2994{
2832 int x, y; 2995 int x, y;
2833#if 0
2834 char *s;
2835#endif
2836 XWindowAttributes wattr; 2996 XWindowAttributes wattr;
2837 Window wdummy; 2997 Window wdummy;
2838 2998
2839 if (nargs == 0) 2999 if (nargs == 0)
2840 return; 3000 return;
3001
2841 switch (args[0]) 3002 switch (args[0])
2842 { 3003 {
2843 /* 3004 /*
2844 * commands 3005 * commands
2845 */ 3006 */
2846 case 1: /* deiconify window */ 3007 case 1: /* deiconify window */
2847 XMapWindow (display->display, TermWin.parent[0]); 3008 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 3009 break;
2849 case 2: /* iconify window */ 3010 case 2: /* iconify window */
2850 XIconifyWindow (display->display, TermWin.parent[0], 3011 XIconifyWindow (display->display, TermWin.parent[0],
… …
2867 break; 3028 break;
2868 case 8: /* set size (chars) */ 3029 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int) (args[1] * TermWin.fheight)); 3031 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 3032 break;
3033
3034 //case 9: NYI, TODO, restore maximized window or maximize window
2872 default: 3035 default:
2873 if (args[0] >= 24) /* set height (chars) */ 3036 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 3037 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int) (args[1] * TermWin.fheight)); 3038 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 3039 break;
3040
3041
2877 /* 3042 /*
2878 * reports - some output format copied from XTerm 3043 * reports - some output format copied from XTerm
2879 */ 3044 */
2880 case 11: /* report window state */ 3045 case 11: /* report window state */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 3048 break;
2884 case 13: /* report window position */ 3049 case 13: /* report window position */
2885 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 3052 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 3053 &x, &y, &wdummy);
2889 tt_printf ("\033[3;%d;%dt", x, y); 3054 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 3055 break;
2891 case 14: /* report window size (pixels) */ 3056 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 3059 break;
2895 case 18: /* report window size (chars) */ 3060 case 18: /* report text area size (chars) */
2896 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 3062 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 3063 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3065 break;
2899 case 20: /* report icon label */ 3066 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 {
3069 char *s;
2900 XGetIconName (display->display, TermWin.parent[0], &s); 3070 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3072 }
2902 break; 3073 break;
2903 case 21: /* report window title */ 3074 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2904 XFetchName (display->display, TermWin.parent[0], &s); 3078 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2906 break; 3081 break;
2907#endif
2908
2909 } 3082 }
2910} 3083}
2911#endif 3084#endif
2912 3085
2913/*----------------------------------------------------------------------*/ 3086/*----------------------------------------------------------------------*/
2914/* 3087/*
2915 * get input up until STRING TERMINATOR (or BEL) 3088 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free ()d 3089 * ends_how is terminator used. returned input must be free()'d
2917 */ 3090 */
2918unsigned char * 3091unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 3092rxvt_term::get_to_st (unicode_t &ends_how)
2920{ 3093{
2921 int seen_esc = 0; /* seen escape? */ 3094 int seen_esc = 0; /* seen escape? */
2922 unsigned int n = 0; 3095 unsigned int n = 0;
2923 unsigned char *s; 3096 unsigned char *s;
3097 unicode_t ch;
2924 unsigned char ch, string[STRING_MAX]; 3098 unsigned char string[STRING_MAX];
2925 3099
2926 for (; (ch = cmd_getc ());) 3100 while ((ch = cmd_getc ()))
2927 { 3101 {
2928 if (ch == C0_BEL 3102 if (ch == C0_BEL || ch == CHAR_ST)
2929 || ch == CHAR_ST 3103 break;
3104
3105 if (seen_esc)
2930 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3106 if (ch == 0x5c) /* 7bit ST */
2931 break; 3107 break;
3108 else
3109 return NULL;
3110
2932 if (ch == C0_ESC) 3111 if (ch == C0_ESC)
2933 { 3112 {
2934 seen_esc = 1; 3113 seen_esc = 1;
2935 continue; 3114 continue;
2936 } 3115 }
2937 else if (ch == '\t') 3116 else if (ch == C0_HT)
2938 ch = ' '; /* translate '\t' to space */ 3117 ch = ' '; /* translate '\t' to space */
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
2940 return NULL; /* other control character - exit */ 3119 return NULL; /* other control character - exit */
3120
2941 if (n < sizeof (string) - 1) 3121 if (n >= sizeof (string) - 1)
3122 // stop at some sane length
3123 return NULL;
3124
2942 string[n++] = ch; 3125 string[n++] = ch;
2943 seen_esc = 0; 3126 seen_esc = 0;
2944 } 3127 }
3128
2945 string[n++] = '\0'; 3129 string[n++] = '\0';
3130
2946 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 3132 return NULL;
3133
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3134 ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY (s, string, n); 3135 STRNCPY (s, string, n);
2950 return s; 3136 return s;
2951} 3137}
2952 3138
2953/*----------------------------------------------------------------------*/ 3139/*----------------------------------------------------------------------*/
… …
2955 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2956 */ 3142 */
2957void 3143void
2958rxvt_term::process_dcs_seq () 3144rxvt_term::process_dcs_seq ()
2959{ 3145{
2960 unsigned char eh, *s; 3146 unsigned char *s;
3147 unicode_t eh;
3148
2961 /* 3149 /*
2962 * Not handled yet 3150 * Not handled yet
2963 */ 3151 */
2964 s = get_to_st (&eh); 3152 s = get_to_st (eh);
2965 if (s) 3153 if (s)
2966 free (s); 3154 free (s);
3155
2967 return; 3156 return;
2968} 3157}
2969 3158
2970/*----------------------------------------------------------------------*/ 3159/*----------------------------------------------------------------------*/
2971/* 3160/*
2972 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3161 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2973 */ 3162 */
2974void 3163void
2975rxvt_term::process_osc_seq () 3164rxvt_term::process_osc_seq ()
2976{ 3165{
2977 unsigned char ch, eh, *s; 3166 unicode_t ch, eh;
2978 int arg; 3167 int arg;
2979 3168
2980 ch = cmd_getc (); 3169 ch = cmd_getc ();
2981 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3170 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 3171 arg = arg * 10 + (ch - '0');
2983 3172
2984 if (ch == ';') 3173 if (ch == ';')
2985 { 3174 {
2986 s = get_to_st (&eh); 3175 unsigned char *s = get_to_st (eh);
3176
2987 if (s) 3177 if (s)
2988 { 3178 {
2989 /*
2990 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here
2992 */
2993 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s);
2996#else
2997 (void)0;
2998#endif
2999 else
3000 xterm_seq (arg, (char *)s, eh); 3179 process_xterm_seq (arg, (char *)s, eh);
3001 free (s); 3180 free (s);
3002 } 3181 }
3003 } 3182 }
3004} 3183}
3184
3185void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{
3188 if (str[0] == '?' && !str[1])
3189 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 }
3197 else
3198 set_window_color (color, str);
3199}
3200
3005/* 3201/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3007 * 0 = change iconName/title 3203 * 0 = change iconName/title
3008 * 1 = change iconName 3204 * 1 = change iconName
3009 * 2 = change title 3205 * 2 = change title
3010 * 4 = change color 3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
3011 * 12 = change text color 3209 * 12 = change text color
3012 * 13 = change mouse foreground color 3210 * 13 = change mouse foreground color
3013 * 17 = change highlight character colour 3211 * 17 = change highlight character colour
3014 * 18 = change bold character color 3212 * 18 = change bold character color
3015 * 19 = change underlined character color 3213 * 19 = change underlined character color
3016 * 46 = change logfile (not implemented) 3214 * 46 = change logfile (not implemented)
3017 * 50 = change font 3215 * 50 = change font
3018 * 3216 *
3019 * rxvt extensions: 3217 * rxvt extensions:
3020 * 10 = menu (may change in future)
3021 * 20 = bg pixmap 3218 * 20 = bg pixmap
3022 * 39 = change default fg color 3219 * 39 = change default fg color
3023 * 49 = change default bg color 3220 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 3221 * 55 = dump scrollback buffer and all of screen
3222 * 701 = change locale
3223 * 702 = find font
3224 * 703 = menu
3025 */ 3225 */
3026void 3226void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3227rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3028{ 3228{
3029 int changed = 0; 3229 int changed = 0;
3030 int color; 3230 int color;
3031 char *buf, *name; 3231 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1];
3032 3233
3033 assert (str != NULL); 3234 assert (str != NULL);
3034 switch (op) 3235 switch (op)
3035 { 3236 {
3036 case XTerm_name: 3237 case XTerm_name:
3037 set_title (str); 3238 set_title (str);
3038 /* FALLTHROUGH */ 3239 /* FALLTHROUGH */
3039 case XTerm_iconName: 3240 case XTerm_iconName:
3040 set_iconName (str); 3241 set_icon_name (str);
3041 break; 3242 break;
3042 case XTerm_title: 3243 case XTerm_title:
3043 set_title (str); 3244 set_title (str);
3044 break; 3245 break;
3246 case XTerm_property:
3247 if (str[0] == '?')
3248 {
3249 Atom prop = XInternAtom (display->display, str + 1, True);
3250 Atom actual_type;
3251 int actual_format;
3252 unsigned long nitems;
3253 unsigned long bytes_after;
3254 unsigned char *value = 0;
3255 const char *str = "";
3256
3257 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None
3263 && actual_format == 8)
3264 str = (const char *)(value);
3265
3266 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3267
3268 XFree (value);
3269 }
3270 else
3271 {
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273
3274 if (eq)
3275 {
3276 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0],
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 }
3282 else
3283 XDeleteProperty (display->display, TermWin.parent[0],
3284 display->atom (str));
3285 }
3286 break;
3287
3045 case XTerm_Color: 3288 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3289 for (buf = (char *)str; buf && *buf;)
3047 { 3290 {
3048 if ((name = STRCHR (buf, ';')) == NULL) 3291 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 3292 break;
3293
3050 *name++ = '\0'; 3294 *name++ = '\0';
3051 color = atoi (buf); 3295 color = atoi (buf);
3296
3052 if (color < 0 || color >= TOTAL_COLORS) 3297 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 3298 break;
3299
3054 if ((buf = STRCHR (name, ';')) != NULL) 3300 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 3301 *buf++ = '\0';
3302
3303 if (name[0] == '?' && !name[1])
3304 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 }
3312 else
3056 set_window_color (color + minCOLOR, name); 3313 set_window_color (color + minCOLOR, name);
3057 } 3314 }
3315 break;
3316 case XTerm_Color00:
3317 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3318 break;
3319 case XTerm_Color01:
3320 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3058 break; 3321 break;
3059#ifndef NO_CURSORCOLOR 3322#ifndef NO_CURSORCOLOR
3060 case XTerm_Color_cursor: 3323 case XTerm_Color_cursor:
3061 set_window_color (Color_cursor, str); 3324 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3062 break; 3325 break;
3063#endif 3326#endif
3064 case XTerm_Color_pointer: 3327 case XTerm_Color_pointer_fg:
3065 set_window_color (Color_pointer, str); 3328 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3329 break;
3330 case XTerm_Color_pointer_bg:
3331 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3066 break; 3332 break;
3067#ifndef NO_BOLD_UNDERLINE_REVERSE 3333#ifndef NO_BOLD_UNDERLINE_REVERSE
3068 case XTerm_Color_BD: 3334 case XTerm_Color_BD:
3069 set_window_color (Color_BD, str); 3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3070 break; 3336 break;
3071 case XTerm_Color_UL: 3337 case XTerm_Color_UL:
3072 set_window_color (Color_UL, str); 3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3073 break; 3339 break;
3074 case XTerm_Color_RV: 3340 case XTerm_Color_RV:
3075 set_window_color (Color_RV, str); 3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3076 break; 3342 break;
3077#endif 3343#endif
3078 3344
3079 case XTerm_Menu:
3080 /*
3081 * rxvt_menubar_dispatch () violates the constness of the string,
3082 * so DON'T do it here
3083 */
3084 break;
3085 case XTerm_Pixmap: 3345 case XTerm_Pixmap:
3086 if (*str != ';') 3346 if (*str != ';')
3087 { 3347 {
3088#if XPM_BACKGROUND 3348#if XPM_BACKGROUND
3089 scale_pixmap (""); /* reset to default scaling */ 3349 scale_pixmap (""); /* reset to default scaling */
… …
3112 set_window_color (Color_fg, str); 3372 set_window_color (Color_fg, str);
3113 break; 3373 break;
3114 case XTerm_restoreBG: 3374 case XTerm_restoreBG:
3115 set_window_color (Color_bg, str); 3375 set_window_color (Color_bg, str);
3116 break; 3376 break;
3377
3117 case XTerm_logfile: 3378 case XTerm_logfile:
3379 // TODO, when secure mode?
3118 break; 3380 break;
3381
3119 case XTerm_font: 3382 case XTerm_font:
3383 if (query)
3384 {
3385 if (Options & Opt_insecure)
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3387 TermWin.fontset->fontdesc
3388 ? TermWin.fontset->fontdesc
3389 : "",
3390 resp);
3391 }
3392 else
3120 change_font (0, str); 3393 change_font (str);
3394 break;
3395
3396#ifndef NO_FRILLS
3397 case XTerm_locale:
3398 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3402 }
3403 else
3404 {
3405 set_locale (str);
3406# ifdef USE_XIM
3407 im_cb ();
3408# endif
3409 }
3410 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif
3421
3422#ifdef MENUBAR
3423 case XTerm_Menu:
3424 if (Options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3121 break; 3426 break;
3427#endif
3122#if 0 3428#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3429 case XTerm_dumpscreen: /* no error notices */
3124 { 3430 {
3125 int fd; 3431 int fd;
3126 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3432 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3433 {
3128 scr_dump (fd); 3434 scr_dump (fd);
3129 close (fd); 3435 close (fd);
3130 } 3436 }
3131 } 3437 }
3132 break; 3438 break;
3133#endif 3439#endif
3134
3135 } 3440 }
3136} 3441}
3137/*----------------------------------------------------------------------*/ 3442/*----------------------------------------------------------------------*/
3138 3443
3139/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3444/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3147 * so no need for fancy checking 3452 * so no need for fancy checking
3148 */ 3453 */
3149int 3454int
3150rxvt_term::privcases (int mode, unsigned long bit) 3455rxvt_term::privcases (int mode, unsigned long bit)
3151{ 3456{
3152 int state; 3457 int state;
3153 3458
3154 if (mode == 's') 3459 if (mode == 's')
3155 { 3460 {
3156 SavedModes |= (PrivateModes & bit); 3461 SavedModes |= (PrivateModes & bit);
3157 return -1; 3462 return -1;
… …
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3468 else
3164 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode (state, bit); 3470 PrivMode (state, bit);
3166 } 3471 }
3472
3167 return state; 3473 return state;
3168} 3474}
3169 3475
3170/* we're not using priv _yet_ */ 3476/* we're not using priv _yet_ */
3171void 3477void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3478rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3479{
3174 unsigned int i, j; 3480 unsigned int i, j;
3175 int state; 3481 int state;
3482
3176 static const struct 3483 static const struct
3177 { 3484 {
3178 const int argval; 3485 const int argval;
3179 const unsigned long bit; 3486 const unsigned long bit;
3180 } 3487 }
3488
3181 argtopriv[] = { 3489 argtopriv[] = {
3182 { 1, PrivMode_aplCUR }, 3490 { 1, PrivMode_aplCUR },
3183 { 2, PrivMode_vt52 }, 3491 { 2, PrivMode_vt52 },
3184 { 3, PrivMode_132 }, 3492 { 3, PrivMode_132 },
3185 { 4, PrivMode_smoothScroll }, 3493 { 4, PrivMode_smoothScroll },
… …
3191 { menuBar_esc, PrivMode_menuBar }, 3499 { menuBar_esc, PrivMode_menuBar },
3192#endif 3500#endif
3193#ifdef scrollBar_esc 3501#ifdef scrollBar_esc
3194 { scrollBar_esc, PrivMode_scrollBar }, 3502 { scrollBar_esc, PrivMode_scrollBar },
3195#endif 3503#endif
3504 // 18, 19 printing-related
3196 { 25, PrivMode_VisibleCursor }, 3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3197 { 35, PrivMode_ShiftKeys }, 3507 { 35, PrivMode_ShiftKeys }, // rxvt extension
3198 { 40, PrivMode_132OK }, 3508 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI
3511 // 46 start logging
3199 { 47, PrivMode_Screen }, 3512 { 47, PrivMode_Screen },
3200 { 66, PrivMode_aplKP }, 3513 { 66, PrivMode_aplKP },
3201#ifndef NO_BACKSPACE_KEY 3514#ifndef NO_BACKSPACE_KEY
3202 { 67, PrivMode_BackSpace }, 3515 { 67, PrivMode_BackSpace },
3203#endif 3516#endif
3204 { 1000, PrivMode_MouseX11 }, 3517 { 1000, PrivMode_MouseX11 },
3518 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3519 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3520 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3205 { 1010, PrivMode_TtyOutputInh }, 3521 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3206 { 1011, PrivMode_Keypress }, 3522 { 1011, PrivMode_Keypress }, // rxvt extension
3523 // 1035 enable modifiers for alt, numlock NYI
3524 // 1036 send ESC for meta keys NYI
3525 // 1037 send DEL for keypad delete NYI
3207 { 1047, PrivMode_Screen }, 3526 { 1047, PrivMode_Screen },
3527 // 1048 save and restore cursor
3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3528 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3529 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3209 }; 3530 };
3210 3531
3211 if (nargs == 0) 3532 if (nargs == 0)
3212 return; 3533 return;
3213 3534
… …
3228 state = privcases (mode, argtopriv[j].bit); 3549 state = privcases (mode, argtopriv[j].bit);
3229 break; 3550 break;
3230 } 3551 }
3231 3552
3232 /* extra handling for values with state unkept */ 3553 /* extra handling for values with state unkept */
3233 if (state == -1)
3234 switch (arg[i]) 3554 switch (arg[i])
3235 { 3555 {
3236 case 1048: /* alternative cursor save */ 3556 case 1048: /* alternative cursor save */
3557 if (Options & Opt_secondaryScreen)
3237 if (mode == 0) 3558 if (mode == 0)
3238 scr_cursor (RESTORE); 3559 scr_cursor (RESTORE);
3239 else if (mode == 1) 3560 else if (mode == 1)
3240 scr_cursor (SAVE); 3561 scr_cursor (SAVE);
3241 /* FALLTHROUGH */
3242 default:
3243 continue; /* for (;i;) */
3244 }
3245
3246 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i])
3248 {
3249 /* case 1: - application cursor keys */
3250 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode
3254 */
3255 PrivMode (1, PrivMode_vt52);
3256 break; 3562 break;
3563 }
3564
3565 if (state >= 0)
3566 /* extra handling for values with valid 0 or 1 state */
3567 switch (arg[i])
3568 {
3569 /* case 1: - application cursor keys */
3570 case 2: /* VT52 mode */
3571 /* oddball mode. should be set regardless of set/reset
3572 * parameter. Return from VT52 mode with an ESC < from
3573 * within VT52 mode
3574 */
3575 PrivMode (1, PrivMode_vt52);
3576 break;
3257 case 3: /* 80/132 */ 3577 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3578 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3260 (unsigned int)TermWin.height);
3261 break; 3580 break;
3262 case 4: /* smooth scrolling */ 3581 case 4: /* smooth scrolling */
3263 if (state) 3582 if (state)
3264 Options &= ~Opt_jumpScroll; 3583 Options &= ~Opt_jumpScroll;
3265 else 3584 else
3266 Options |= Opt_jumpScroll; 3585 Options |= Opt_jumpScroll;
3267 break; 3586 break;
3268 case 5: /* reverse video */ 3587 case 5: /* reverse video */
3269 scr_rvideo_mode (state); 3588 scr_rvideo_mode (state);
3270 break; 3589 break;
3271 case 6: /* relative/absolute origins */ 3590 case 6: /* relative/absolute origins */
3272 scr_relative_origin (state); 3591 scr_relative_origin (state);
3273 break; 3592 break;
3274 case 7: /* autowrap */ 3593 case 7: /* autowrap */
3275 scr_autowrap (state); 3594 scr_autowrap (state);
3276 break; 3595 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3596 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3597 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3598 if (state) /* orthogonal */
3280 PrivateModes &= ~ (PrivMode_MouseX11); 3599 PrivateModes &= ~PrivMode_MouseX11;
3281 break; 3600 break;
3282#ifdef menuBar_esc 3601#ifdef menuBar_esc
3283 case menuBar_esc: 3602 case menuBar_esc:
3284#ifdef MENUBAR 3603#ifdef MENUBAR
3285 map_menuBar (state); 3604 map_menuBar (state);
3286#endif 3605#endif
3287 break; 3606 break;
3288#endif 3607#endif
3289#ifdef scrollBar_esc 3608#ifdef scrollBar_esc
3290 case scrollBar_esc: 3609 case scrollBar_esc:
3291 if (scrollbar_mapping (state)) 3610 if (scrollbar_mapping (state))
3292 { 3611 {
3293 resize_all_windows (0, 0, 0); 3612 resize_all_windows (0, 0, 0);
3294 scr_touch (true); 3613 scr_touch (true);
3295 } 3614 }
3296 break; 3615 break;
3297#endif 3616#endif
3298 case 25: /* visible/invisible cursor */ 3617 case 25: /* visible/invisible cursor */
3299 scr_cursor_visible (state); 3618 scr_cursor_visible (state);
3300 break; 3619 break;
3301 /* case 35: - shift keys */ 3620 /* case 35: - shift keys */
3302 /* case 40: - 80 <--> 132 mode */ 3621 /* case 40: - 80 <--> 132 mode */
3303 case 47: /* secondary screen */ 3622 case 47: /* secondary screen */
3304 scr_change_screen (state); 3623 scr_change_screen (state);
3305 break; 3624 break;
3306 /* case 66: - application key pad */ 3625 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3626 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3627 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3628 if (state) /* orthogonal */
3310 PrivateModes &= ~ (PrivMode_MouseX10); 3629 PrivateModes &= ~PrivMode_MouseX10;
3311 break; 3630 break;
3312#if 0 3631#if 0
3313 case 1001: 3632 case 1001:
3314 break; /* X11 mouse highlighting */ 3633 break; /* X11 mouse highlighting */
3315#endif 3634#endif
3316 case 1010: /* scroll to bottom on TTY output inhibit */ 3635 case 1010: /* scroll to bottom on TTY output inhibit */
3317 if (state) 3636 if (state)
3318 Options &= ~Opt_scrollTtyOutput; 3637 Options &= ~Opt_scrollTtyOutput;
3319 else 3638 else
3320 Options |= Opt_scrollTtyOutput; 3639 Options |= Opt_scrollTtyOutput;
3321 break; 3640 break;
3322 case 1011: /* scroll to bottom on key press */ 3641 case 1011: /* scroll to bottom on key press */
3323 if (state) 3642 if (state)
3324 Options |= Opt_scrollTtyKeypress; 3643 Options |= Opt_scrollTtyKeypress;
3325 else 3644 else
3326 Options &= ~Opt_scrollTtyKeypress; 3645 Options &= ~Opt_scrollTtyKeypress;
3327 break; 3646 break;
3328 case 1047: /* secondary screen w/ clearing */ 3647 case 1047: /* secondary screen w/ clearing last */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3648 if (Options & Opt_secondaryScreen)
3330 if (current_screen != PRIMARY) 3649 if (current_screen != PRIMARY)
3331 scr_erase_screen (2); 3650 scr_erase_screen (2);
3332 scr_change_screen (state); 3651 scr_change_screen (state);
3333 /* FALLTHROUGH */
3334 default:
3335 break; 3652 break;
3653 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen)
3656 if (current_screen != PRIMARY)
3657 scr_erase_screen (2);
3658 break;
3659 default:
3660 break;
3336 } 3661 }
3337 } 3662 }
3338} 3663}
3339/*}}} */ 3664/*}}} */
3340 3665
3341/*{{{ process sgr sequences */ 3666/*{{{ process sgr sequences */
3342void 3667void
3343rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3668rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3344{ 3669{
3345 unsigned int i; 3670 unsigned int i;
3346 short rendset; 3671 short rendset;
3347 int rendstyle; 3672 int rendstyle;
3348 3673
3349 if (nargs == 0) 3674 if (nargs == 0)
3350 { 3675 {
3351 scr_rendition (0, ~RS_None); 3676 scr_rendition (0, ~RS_None);
3352 return; 3677 return;
3353 } 3678 }
3679
3354 for (i = 0; i < nargs; i++) 3680 for (i = 0; i < nargs; i++)
3355 { 3681 {
3356 rendset = -1; 3682 rendset = -1;
3357 switch (arg[i]) 3683 switch (arg[i])
3358 { 3684 {
… …
3366 rendset = 1, rendstyle = RS_Uline; 3692 rendset = 1, rendstyle = RS_Uline;
3367 break; 3693 break;
3368 case 5: 3694 case 5:
3369 rendset = 1, rendstyle = RS_Blink; 3695 rendset = 1, rendstyle = RS_Blink;
3370 break; 3696 break;
3697 //case 6: // scoansi light background
3371 case 7: 3698 case 7:
3372 rendset = 1, rendstyle = RS_RVid; 3699 rendset = 1, rendstyle = RS_RVid;
3700 break;
3701 case 8:
3702 // invisible. NYI
3703 break;
3704 //case 10: // scoansi acs off
3705 //case 11: // scoansi acs on
3706 //case 12: // scoansi acs on, |0x80
3707 case 21: // disable bold, blink and invis (some terminals use this)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink;
3373 break; 3709 break;
3374 case 22: 3710 case 22:
3375 rendset = 0, rendstyle = RS_Bold; 3711 rendset = 0, rendstyle = RS_Bold;
3376 break; 3712 break;
3377 case 24: 3713 case 24:
… …
3381 rendset = 0, rendstyle = RS_Blink; 3717 rendset = 0, rendstyle = RS_Blink;
3382 break; 3718 break;
3383 case 27: 3719 case 27:
3384 rendset = 0, rendstyle = RS_RVid; 3720 rendset = 0, rendstyle = RS_RVid;
3385 break; 3721 break;
3722 case 28:
3723 // visible. NYI
3724 break;
3386 } 3725 }
3726
3387 if (rendset != -1) 3727 if (rendset != -1)
3388 { 3728 {
3389 scr_rendition (rendset, rendstyle); 3729 scr_rendition (rendset, rendstyle);
3390 continue; /* for (;i;) */ 3730 continue; /* for (;i;) */
3391 } 3731 }
… …
3398 case 33: 3738 case 33:
3399 case 34: 3739 case 34:
3400 case 35: 3740 case 35:
3401 case 36: 3741 case 36:
3402 case 37: 3742 case 37:
3403 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3404 Color_fg);
3405 break; 3744 break;
3406#ifdef TTY_256COLOR 3745#ifdef TTY_256COLOR
3407 case 38: 3746 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3747 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3748 {
3410 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3411 Color_fg);
3412 i += 2; 3750 i += 2;
3413 } 3751 }
3414 break; 3752 break;
3415#endif 3753#endif
3416 case 39: /* default fg */ 3754 case 39: /* default fg */
… …
3423 case 43: 3761 case 43:
3424 case 44: 3762 case 44:
3425 case 45: 3763 case 45:
3426 case 46: 3764 case 46:
3427 case 47: 3765 case 47:
3428 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3429 Color_bg);
3430 break; 3767 break;
3431#ifdef TTY_256COLOR 3768#ifdef TTY_256COLOR
3432 case 48: 3769 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3770 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3771 {
3435 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3436 Color_bg);
3437 i += 2; 3773 i += 2;
3438 } 3774 }
3439 break; 3775 break;
3440#endif 3776#endif
3441 case 49: /* default bg */ 3777 case 49: /* default bg */
… …
3470 } 3806 }
3471 } 3807 }
3472} 3808}
3473/*}}} */ 3809/*}}} */
3474 3810
3475/*{{{ process Rob Nation's own graphics mode sequences */ 3811/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3476void 3812void
3477rxvt_term::process_graphics () 3813rxvt_term::process_graphics ()
3478{ 3814{
3479 unsigned char ch, cmd = cmd_getc (); 3815 unicode_t ch, cmd = cmd_getc ();
3480 3816
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3817 if (cmd == 'Q')
3483 { /* query graphics */ 3818 { /* query graphics */
3484 tt_printf ("\033G0\n"); /* no graphics */ 3819 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3820 return;
3486 } 3821 }
3487 /* swallow other graphics sequences until terminating ':' */ 3822 /* swallow other graphics sequences until terminating ':' */
3488 do 3823 do
3489 ch = cmd_getc (); 3824 ch = cmd_getc ();
3490 while (ch != ':'); 3825 while (ch != ':');
3491#else
3492 unsigned int nargs;
3493 int args[NGRX_PTS];
3494 unsigned char *text = NULL;
3495
3496 if (cmd == 'Q')
3497 { /* query graphics */
3498 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3499 return;
3500 }
3501 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3502 {
3503 int neg;
3504
3505 ch = cmd_getc ();
3506 neg = (ch == '-');
3507 if (neg || ch == '+')
3508 ch = cmd_getc ();
3509
3510 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg)
3513 args[nargs] = -args[nargs];
3514
3515 nargs++;
3516 args[nargs] = 0;
3517 if (ch != ';')
3518 break;
3519 }
3520
3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3523 int i, len = args[4];
3524
3525 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3526
3527 if (text != NULL)
3528 {
3529 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc ();
3531 text[len] = '\0';
3532 }
3533 }
3534 Gr_do_graphics (cmd, nargs, args, text);
3535#endif
3536} 3826}
3537/*}}} */ 3827/*}}} */
3538 3828
3539/* ------------------------------------------------------------------------- */ 3829/* ------------------------------------------------------------------------- */
3540 3830

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines