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.43 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC

… …
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
… …
798 720
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 721 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 722 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 723 cmdbuf_endp = cmdbuf_ptr + n;
802 724
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
804 726
805 if (n > 0) 727 if (n > 0)
806 { 728 {
807 cmdbuf_endp += n; 729 cmdbuf_endp += n;
808 return true; 730 return true;
809 } 731 }
810 else if (n < 0 && errno != EAGAIN) 732 else if (n < 0 && errno != EAGAIN)
811 destroy (); 733 destroy ();
812 734
813 return false; 735 return false;
814} 736}
815 737
816void 738void
817rxvt_term::pty_cb (io_watcher &w, short revents) 739rxvt_term::pty_cb (io_watcher &w, short revents)
… …
821 743
822 if (revents & EVENT_WRITE) 744 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 745 tt_write (0, 0);
824 else if (revents & EVENT_READ) 746 else if (revents & EVENT_READ)
825 { 747 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us 748 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong 749 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ()) 750 while (pty_fill ())
831 { 751 {
832 if (!seen_input) 752 if (!seen_input)
833 { 753 {
834 seen_input = 1; 754 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */ 755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
836 tt_winch (); 757 tt_winch ();
837 } 758 }
838 759
839 uint32_t ch = NOCHAR; 760 if (cmd_parse ())
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break; 761 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 } 762 }
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.mbs);
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 } 763 }
988} 764}
989 765
990#ifdef POINTER_BLANK 766#ifdef POINTER_BLANK
991void 767void
… …
1021 pointer_blank (); 797 pointer_blank ();
1022} 798}
1023#endif 799#endif
1024 800
1025void 801void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 802rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 803{
1028 int button_number, key_state = 0; 804 int button_number, key_state = 0;
1029 int x, y; 805 int x, y;
1030 806
1031 x = ev.x; 807 x = ev.x;
1032 y = ev.y; 808 y = ev.y;
1033 pixel_position (&x, &y); 809 pixel_position (&x, &y);
1034 810
… …
1355 check_our_parents (); 1131 check_our_parents ();
1356 if (am_transparent) 1132 if (am_transparent)
1357 want_full_refresh = 1; 1133 want_full_refresh = 1;
1358 } 1134 }
1359#endif 1135#endif
1360
1361 } 1136 }
1362 break; 1137 break;
1363 1138
1364 case SelectionClear: 1139 case SelectionClear:
1365 display->set_selection_owner (0); 1140 selection_clear ();
1366 break; 1141 break;
1367 1142
1368 case SelectionNotify: 1143 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1144 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1145 selection_paste (ev.xselection.requestor,
… …
1428 } 1203 }
1429#ifdef MENUBAR 1204#ifdef MENUBAR
1430 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1431 menubar_expose (); 1206 menubar_expose ();
1432#endif 1207#endif
1433#ifdef RXVT_GRAPHICS
1434 Gr_expose (ev.xany.window);
1435#endif
1436
1437 } 1208 }
1438 break; 1209 break;
1439 1210
1440 case MotionNotify: 1211 case MotionNotify:
1441#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
… …
1443 pointer_unblank (); 1214 pointer_unblank ();
1444#endif 1215#endif
1445#if MENUBAR 1216#if MENUBAR
1446 if (isMenuBarWindow (ev.xany.window)) 1217 if (isMenuBarWindow (ev.xany.window))
1447 { 1218 {
1448 menubar_control (& (ev.xbutton)); 1219 menubar_control (ev.xbutton);
1449 break; 1220 break;
1450 } 1221 }
1451#endif 1222#endif
1452 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1453 break; 1224 break;
… …
1573 return; 1344 return;
1574 } 1345 }
1575 1346
1576 /* FALLTHROUGH */ 1347 /* FALLTHROUGH */
1577 case ReparentNotify: 1348 case ReparentNotify:
1578 if ((Options & Opt_transparent) && check_our_parents ()) 1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1579 if (am_transparent)
1580 want_full_refresh = 1; 1350 want_full_refresh = 1;
1581 break; 1351 break;
1582#endif 1352#endif
1583 } 1353 }
1584} 1354}
1585 1355
1586void 1356void
1587rxvt_term::button_press (const XButtonEvent &ev) 1357rxvt_term::button_press (XButtonEvent &ev)
1588{ 1358{
1589 int reportmode = 0, clickintime; 1359 int reportmode = 0, clickintime;
1590 1360
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1362 if (!bypass_keystate)
… …
1594 /* 1364 /*
1595 * VT window processing of button press 1365 * VT window processing of button press
1596 */ 1366 */
1597 if (ev.window == TermWin.vt) 1367 if (ev.window == TermWin.vt)
1598 { 1368 {
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; 1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1370 if (reportmode)
1371 {
1372 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state;
1375#ifdef MOUSE_REPORT_DOUBLECLICK
1376 if (ev.button == MEvent.button && clickintime)
1608 { 1377 {
1609 /* mouse report from vt window */ 1378 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1379 MEvent.clicks++;
1611 MEvent.state = ev.state; 1380 if (MEvent.clicks > 1)
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1381 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1382 /* only report double clicks */
1620 MEvent.clicks = 2; 1383 MEvent.clicks = 2;
1621 mouse_report (ev); 1384 mouse_report (ev);
1622 1385
1623 /* don't report the release */ 1386 /* don't report the release */
1624 MEvent.clicks = 0; 1387 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1388 MEvent.button = AnyButton;
1626 }
1627 } 1389 }
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 } 1390 }
1641 else 1391 else
1642 { 1392 {
1393 /* different button, or time expired */
1394 MEvent.clicks = 1;
1395 MEvent.button = ev.button;
1396 mouse_report (ev);
1397 }
1398#else
1399 MEvent.button = ev.button;
1400 mouse_report (ev);
1401#endif /* MOUSE_REPORT_DOUBLECLICK */
1402
1403 }
1404 else
1405 {
1643 if (ev.button != MEvent.button) 1406 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1407 MEvent.clicks = 0;
1645 switch (ev.button) 1408 switch (ev.button)
1646 { 1409 {
1647 case Button1: 1410 case Button1:
1648 /* allow shift+left click to extend selection */ 1411 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1413 {
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) 1414 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1415 selection_rotate (ev.x, ev.y);
1672 else 1416 else
1673 selection_extend (ev.x, ev.y, 1); 1417 selection_extend (ev.x, ev.y, 1);
1418 }
1419 else
1420 {
1421 if (MEvent.button == Button1 && clickintime)
1422 MEvent.clicks++;
1423 else
1424 MEvent.clicks = 1;
1425
1426 selection_click (MEvent.clicks, ev.x, ev.y);
1427 }
1428
1429 MEvent.button = Button1;
1430 break;
1431
1432 case Button3:
1433 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y);
1435 else
1436 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1437 MEvent.button = Button3;
1675 break; 1438 break;
1676 }
1677 } 1439 }
1440 }
1678 MEvent.time = ev.time; 1441 MEvent.time = ev.time;
1679 return; 1442 return;
1680 }
1681 } 1443 }
1682 1444
1683 /* 1445 /*
1684 * Scrollbar window processing of button press 1446 * Scrollbar window processing of button press
1685 */ 1447 */
… …
1828 menubar_control (ev); 1590 menubar_control (ev);
1829#endif 1591#endif
1830} 1592}
1831 1593
1832void 1594void
1833rxvt_term::button_release (const XButtonEvent &ev) 1595rxvt_term::button_release (XButtonEvent &ev)
1834{ 1596{
1835 int reportmode = 0; 1597 int reportmode = 0;
1836 1598
1837 csrO = 0; /* reset csr Offset */ 1599 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1600 if (!bypass_keystate)
… …
1850#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1613 pending_scroll_selection=0;
1852#endif 1614#endif
1853 if (ev.window == TermWin.vt) 1615 if (ev.window == TermWin.vt)
1854 { 1616 {
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) 1617 if (reportmode)
1618 {
1619 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4)
1622 return;
1623#ifdef MOUSE_REPORT_DOUBLECLICK
1624 /* only report the release of 'slow' single clicks */
1625 if (MEvent.button != AnyButton
1626 && (ev.button != MEvent.button
1627 || (ev.time - MEvent.time
1628 > MULTICLICK_TIME / 2)))
1863 { 1629 {
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; 1630 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 1631 MEvent.button = AnyButton;
1881 mouse_report (ev); 1632 mouse_report (ev);
1633 }
1634#else /* MOUSE_REPORT_DOUBLECLICK */
1635 MEvent.button = AnyButton;
1636 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 1637#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 1638 return;
1884 } 1639 }
1885 /* 1640 /*
1886 * dumb hack to compensate for the failure of click-and-drag 1641 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1642 * when overriding mouse reporting
1888 */ 1643 */
1889 if (PrivateModes & PrivMode_mouse_report 1644 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1645 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1) 1646 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0); 1647 selection_extend (ev.x, ev.y, 0);
1893 1648
1894 switch (ev.button) 1649 switch (ev.button)
1650 {
1651 case Button1:
1652 case Button3:
1653 selection_make (ev.time);
1654 break;
1655 case Button2:
1656 selection_request (ev.time, ev.x, ev.y);
1657 break;
1658#ifdef MOUSE_WHEEL
1659 case Button4:
1660 case Button5:
1895 { 1661 {
1896 case Button1: 1662 int i;
1897 case Button3: 1663 page_dirn v;
1898 selection_make (ev.time); 1664
1665 v = (ev.button == Button4) ? UP : DN;
1666 if (ev.state & ShiftMask)
1899 break; 1667 i = 1;
1900 case Button2: 1668 else if ((Options & Opt_mouseWheelScrollPage))
1901 selection_request (ev.time, ev.x, ev.y); 1669 i = TermWin.nrow - 1;
1670 else
1902 break; 1671 i = 5;
1903#ifdef MOUSE_WHEEL 1672# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 1673 if (ev.state & ControlMask)
1905 case Button5:
1906 { 1674 {
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); 1675 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 } 1677 }
1923# endif 1678# endif
1924# ifdef JUMP_MOUSE_WHEEL 1679# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1925 scr_page (v, i); 1686 scr_page (v, 1);
1926 scr_refresh (SMOOTH_REFRESH); 1687 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 1688 scrollbar_show (1);
1928# else
1929 while (i--)
1930 {
1931 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1);
1934 } 1689 }
1935# endif 1690# endif
1936 1691
1937 }
1938 break;
1939#endif
1940
1941 } 1692 }
1693 break;
1694#endif
1695
1942 } 1696 }
1943 } 1697 }
1944#ifdef MENUBAR 1698#ifdef MENUBAR
1945 else if (isMenuBarWindow (ev.window)) 1699 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1700 menubar_control (ev);
1947#endif 1701#endif
1948} 1702}
1949 1703
1950
1951#ifdef TRANSPARENT 1704#ifdef TRANSPARENT
1705#if TINTING
1706/* shading taken from eterm-0.9.2 */
1707/* RGB 15 */
1708
1709static void
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1717 /* No saturation */
1718 for (y = h; --y >= 0;) {
1719 for (x = -w; x < 0; x++) {
1720 int r, g, b;
1721
1722 b = ((uint16_t *) ptr)[x];
1723 r = (b & 0x7c00) * rm;
1724 g = (b & 0x3e0) * gm;
1725 b = (b & 0x1f) * bm;
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1727 | ((g >> 8) & 0x3e0)
1728 | ((b >> 8) & 0x1f);
1729 }
1730 ptr += bpl;
1731 }
1732 } else {
1733 for (y = h; --y >= 0;) {
1734 for (x = -w; x < 0; x++) {
1735 int r, g, b;
1736
1737 b = ((uint16_t *) ptr)[x];
1738 r = (b & 0x7c00) * rm;
1739 g = (b & 0x3e0) * gm;
1740 b = (b & 0x1f) * bm;
1741 r |= (!(r >> 15) - 1);
1742 g |= (!(g >> 10) - 1);
1743 b |= (!(b >> 5) - 1);
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1745 | ((g >> 8) & 0x3e0)
1746 | ((b >> 8) & 0x1f);
1747 }
1748 ptr += bpl;
1749 }
1750 }
1751}
1752
1753/* RGB 16 */
1754static void
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1756{
1757 unsigned char *ptr;
1758 int x, y;
1759
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1762 /* No saturation */
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 }
1777 } else {
1778 for (y = h; --y >= 0;) {
1779 for (x = -w; x < 0; x++) {
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 }
1793 ptr += bpl;
1794 }
1795 }
1796}
1797
1798/* RGB 24 */
1799static void
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1801{
1802 unsigned char *ptr;
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 }
1830 } else {
1831 for (y = h; --y >= 0;) {
1832 for (x = -(w * 3); x < 0; x += 3) {
1833 int r, g, b;
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 }
1861 ptr += bpl;
1862 }
1863 }
1864}
1865
1866/* RGB 32 */
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936}
1937
1938#endif
1939
1952/* 1940/*
1953 * Check our parents are still who we think they are. 1941 * Check our parents are still who we think they are.
1954 * Do transparency updates if required 1942 * Do transparency updates if required
1955 */ 1943 */
1956int 1944int
1957rxvt_term::check_our_parents () 1945rxvt_term::check_our_parents ()
1958{ 1946{
1959 int i, pchanged, aformat, have_pixmap, rootdepth; 1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1960 unsigned long nitems, bytes_after; 1948 unsigned long nitems, bytes_after;
1961 Atom atype; 1949 Atom atype;
1962 unsigned char *prop = NULL; 1950 unsigned char *prop = NULL;
1963 Window root, oldp, *list; 1951 Window root, oldp, *list;
1964 Pixmap rootpixmap = None; 1952 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 1953 XWindowAttributes wattr, wrootattr;
1966 1954
1967 pchanged = 0; 1955 pchanged = 0;
1968 1956
1969 if (! (Options & Opt_transparent)) 1957 if (!(Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 1958 return pchanged; /* Don't try any more */
1971 1959
1972 XGetWindowAttributes (display->display, display->root, &wrootattr); 1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 1961 rootdepth = wrootattr.depth;
1974 1962
1975 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1976 if (rootdepth != wattr.depth) 1965 if (rootdepth != wattr.depth)
1977 { 1966 {
1978 if (am_transparent) 1967 if (am_transparent)
1979 { 1968 {
1980 pchanged = 1; 1969 pchanged = 1;
1981 XSetWindowBackground (display->display, TermWin.vt, 1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1982 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 1971 am_transparent = am_pixmap_trans = 0;
1984 } 1972 }
1973
1985 return pchanged; /* Don't try any more */ 1974 return pchanged; /* Don't try any more */
1986 } 1975 }
1987 1976
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 1977 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync (display->display, False); 1978 XSync (display->display, False);
… …
1991 /* 1980 /*
1992 * Make the frame window set by the window manager have 1981 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 1982 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 1983 * windows for each client, so we have to take care about that.
1995 */ 1984 */
1996 i = (xa[XA_XROOTPMAPID] != 0 1985 i = (xa[XA_XROOTPMAPID]
1997 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 1988 &nitems, &bytes_after, &prop) == Success);
1989
1990 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success);
1995
2000 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
2001 have_pixmap = 0; 1997 have_pixmap = 0;
2002 else 1998 else
2003 { 1999 {
2004 have_pixmap = 1; 2000 have_pixmap = 1;
2005 rootpixmap = * ((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
2006 XFree (prop); 2002 XFree (prop);
2007 } 2003 }
2004
2008 if (have_pixmap) 2005 if (have_pixmap)
2009 { 2006 {
2010 /* 2007 /*
2011 * Copy display->root pixmap transparency 2008 * Copy display->root pixmap transparency
2012 */ 2009 */
2013 int sx, sy, nx, ny; 2010 int sx, sy, nx, ny;
2014 unsigned int nw, nh; 2011 unsigned int nw, nh;
2015 Window cr; 2012 Window cr;
2016 XImage *image; 2013 XImage *image;
2017 GC gc; 2014 GC gc;
2018 XGCValues gcvalue; 2015 XGCValues gcvalue;
2019 2016
2020 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 2018 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 2019 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 2020 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 2021 nx = ny = 0;
2022
2025 if (sx < 0) 2023 if (sx < 0)
2026 { 2024 {
2027 nw += sx; 2025 nw += sx;
2028 nx = -sx; 2026 nx = -sx;
2029 sx = 0; 2027 sx = 0;
2030 } 2028 }
2029
2031 if (sy < 0) 2030 if (sy < 0)
2032 { 2031 {
2033 nh += sy; 2032 nh += sy;
2034 ny = -sy; 2033 ny = -sy;
2035 sy = 0; 2034 sy = 0;
2036 } 2035 }
2036
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 2039 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 ZPixmap); 2041
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2044 allowedxerror = 0;
2045
2045 if (image == NULL) 2046 if (image == NULL)
2046 { 2047 {
2047 if (am_transparent && am_pixmap_trans) 2048 if (am_transparent && am_pixmap_trans)
2048 { 2049 {
2049 pchanged = 1; 2050 pchanged = 1;
… …
2051 { 2052 {
2052 XFreePixmap (display->display, TermWin.pixmap); 2053 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 2054 TermWin.pixmap = None;
2054 } 2055 }
2055 } 2056 }
2057
2056 am_pixmap_trans = 0; 2058 am_pixmap_trans = 0;
2057 } 2059 }
2058 else 2060 else
2059 { 2061 {
2060 if (TermWin.pixmap != None) 2062 if (TermWin.pixmap != None)
2061 XFreePixmap (display->display, TermWin.pixmap); 2063 XFreePixmap (display->display, TermWin.pixmap);
2064
2065#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint))
2067 {
2068 unsigned short shade, rm, gm, bm;
2069
2070 PixColors[Color_tint].get (display, rm, gm, bm);
2071
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 }
2083#endif
2084
2062 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 2086 szHint.width, szHint.height, image->depth);
2065 (unsigned int)image->depth);
2066 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 2089 nx, ny, image->width, image->height);
2070 XFreeGC (display->display, gc); 2090 XFreeGC (display->display, gc);
2071 XDestroyImage (image); 2091 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap); 2093 TermWin.pixmap);
2094
2074 if (!am_transparent || !am_pixmap_trans) 2095 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 2096 pchanged = 1;
2097
2076 am_transparent = am_pixmap_trans = 1; 2098 am_transparent = am_pixmap_trans = 1;
2077 } 2099 }
2078 } 2100 }
2101
2079 if (!am_pixmap_trans) 2102 if (!am_pixmap_trans)
2080 { 2103 {
2081 unsigned int n; 2104 unsigned int n;
2082 /* 2105 /*
2083 * InheritPixmap transparency 2106 * InheritPixmap transparency
2084 */ 2107 */
2085 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2087 i++)
2088 { 2110 {
2089 oldp = TermWin.parent[i]; 2111 oldp = TermWin.parent[i];
2090 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2113 &TermWin.parent[i], &list, &n);
2092 XFree (list); 2114 XFree (list);
2093 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2094 if (TermWin.parent[i] == display->root) 2117 if (TermWin.parent[i] == display->root)
2095 { 2118 {
2096 if (oldp != None) 2119 if (oldp != None)
2097 pchanged = 1; 2120 pchanged = 1;
2121
2098 break; 2122 break;
2099 } 2123 }
2124
2100 if (oldp != TermWin.parent[i]) 2125 if (oldp != TermWin.parent[i])
2101 pchanged = 1; 2126 pchanged = 1;
2102 } 2127 }
2128
2103 n = 0; 2129 n = 0;
2130
2104 if (pchanged) 2131 if (pchanged)
2105 { 2132 {
2106 for (; n < (unsigned int)i; n++) 2133 for (; n < (unsigned int)i; n++)
2107 { 2134 {
2108 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2112 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2140 break;
2114 } 2141 }
2115 } 2142 }
2116 } 2143 }
2117 if (n > (int) (sizeof (TermWin.parent) 2144
2118 / sizeof (TermWin.parent[0]))) 2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2119 { 2146 {
2120 D_X ((stderr, "InheritPixmap Turning off")); 2147 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground (display->display, TermWin.parent[0], 2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2122 PixColors[Color_fg]);
2123 XSetWindowBackground (display->display, TermWin.vt, 2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2124 PixColors[Color_bg]);
2125 am_transparent = 0; 2150 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2151 /* XXX: also turn off Opt_transparent? */
2127 } 2152 }
2128 else 2153 else
2129 { 2154 {
2155#if WAIT_FOR_WM
2130 /* wait (an arbitrary period) for the WM to do its thing 2156 /* wait (an arbitrary period) for the WM to do its thing
2131 * needed for fvwm2.2.2 (and before?) */ 2157 * 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); 2158 sleep (1);
2140# endif 2159#endif
2141 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2161 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2144 ParentRelative); 2163
2145 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2146 ParentRelative);
2147 am_transparent = 1; 2165 am_transparent = 1;
2148 } 2166 }
2167
2149 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2169 TermWin.parent[i] = None;
2151 } 2170 }
2171
2152 return pchanged; 2172 return pchanged;
2153} 2173}
2154#endif 2174#endif
2155 2175
2156/*}}} */ 2176/*}}} */
2177
2178bool
2179rxvt_term::cmd_parse ()
2180{
2181 bool flag = false;
2182 unicode_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here
2184
2185 for (;;)
2186 {
2187 if (ch == NOCHAR)
2188 {
2189 seq_begin = cmdbuf_ptr;
2190 ch = next_char ();
2191 }
2192
2193 if (ch == NOCHAR) // TODO: improve
2194 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 {
2198 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false;
2201 int nlines = 0;
2202 unicode_t *str = buf;
2203
2204 *str++ = ch;
2205
2206 for (;;)
2207 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
2212 break;
2213
2214 *str++ = ch;
2215
2216 if (ch == '\n')
2217 {
2218 nlines++;
2219 refresh_count++;
2220
2221 if (! (Options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2223 {
2224 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR;
2227 break;
2228 }
2229
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1)
2232 {
2233 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0;
2235 str = buf;
2236 }
2237 }
2238
2239 if (str >= buf + UBUFSIZ)
2240 {
2241 ch = NOCHAR;
2242 break;
2243 }
2244 }
2245
2246 scr_add_lines (buf, nlines, str - buf);
2247
2248 /*
2249 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */
2257 if (refreshnow)
2258 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++;
2261
2262 scr_refresh (refresh_type);
2263 }
2264
2265 }
2266 else
2267 {
2268 try
2269 {
2270 process_nonprinting (ch);
2271 }
2272 catch (const class out_of_input &o)
2273 {
2274 // we ran out of input, retry later
2275 cmdbuf_ptr = seq_begin;
2276 break;
2277 }
2278
2279 ch = NOCHAR;
2280 }
2281 }
2282
2283 return flag;
2284}
2285
2286// read the next character
2287unicode_t
2288rxvt_term::next_char ()
2289{
2290 while (cmdbuf_ptr < cmdbuf_endp)
2291 {
2292 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++;
2295
2296 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298
2299 if (len == (size_t)-2)
2300 {
2301 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp;
2303 break;
2304 }
2305
2306 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308
2309 // assume wchar == unicode
2310 cmdbuf_ptr += len;
2311 return wc;
2312 }
2313
2314 return NOCHAR;
2315}
2316
2317/* rxvt_cmd_getc () - Return next input character */
2318/*
2319 * Return the next input character after first passing any keyboard input
2320 * to the command.
2321 */
2322unicode_t
2323rxvt_term::cmd_getc ()
2324{
2325 unicode_t c = next_char ();
2326
2327 if (c == NOCHAR)
2328 throw out_of_input;
2329
2330 return c;
2331}
2157 2332
2158/*{{{ print pipe */ 2333/*{{{ print pipe */
2159/*----------------------------------------------------------------------*/ 2334/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2335#ifdef PRINTPIPE
2161FILE * 2336FILE *
2162rxvt_term::popen_printer () 2337rxvt_term::popen_printer ()
2163{ 2338{
2164 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2339 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2340
2166 if (stream == NULL) 2341 if (stream == NULL)
2167 rxvt_print_error ("can't open printer pipe"); 2342 rxvt_warn ("can't open printer pipe, not printing.\n");
2343
2168 return stream; 2344 return stream;
2169} 2345}
2170 2346
2171int 2347int
2172rxvt_term::pclose_printer (FILE *stream) 2348rxvt_term::pclose_printer (FILE *stream)
2173{ 2349{
2174 fflush (stream); 2350 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); 2351 return pclose (stream);
2181# endif
2182} 2352}
2183 2353
2184/* 2354/*
2185 * simulate attached vt100 printer 2355 * simulate attached vt100 printer
2186 */ 2356 */
2187void 2357void
2188rxvt_term::process_print_pipe () 2358rxvt_term::process_print_pipe ()
2189{ 2359{
2190 int done; 2360 int done;
2191 FILE *fd; 2361 FILE *fd;
2192 2362
2193 if ((fd = popen_printer ()) == NULL) 2363 if ((fd = popen_printer ()) == NULL)
2194 return; 2364 return;
2195 2365
2196 /* 2366 /*
2197 * Send all input to the printer until either ESC[4i or ESC[?4i 2367 * Send all input to the printer until either ESC[4i or ESC[?4i
2198 * is received. 2368 * is received.
2199 */ 2369 */
2200 for (done = 0; !done;) 2370 for (done = 0; !done;)
2201 { 2371 {
2202 unsigned char buf[8]; 2372 unsigned char buf[8];
2203 unsigned char ch; 2373 unicode_t ch;
2204 unsigned int i, len; 2374 unsigned int i, len;
2205 2375
2206 if ((ch = cmd_getc ()) != C0_ESC) 2376 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2377 {
2208 if (putc (ch, fd) == EOF) 2378 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2379 break; /* done = 1 */
… …
2224 { 2394 {
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2395 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2396 break; /* done = 1 */
2227 } 2397 }
2228 } 2398 }
2399
2229 for (i = 0; i < len; i++) 2400 for (i = 0; i < len; i++)
2230 if (putc (buf[i], fd) == EOF) 2401 if (putc (buf[i], fd) == EOF)
2231 { 2402 {
2232 done = 1; 2403 done = 1;
2233 break; 2404 break;
2234 } 2405 }
2235 } 2406 }
2236 } 2407 }
2408
2237 pclose_printer (fd); 2409 pclose_printer (fd);
2238} 2410}
2239#endif /* PRINTPIPE */ 2411#endif /* PRINTPIPE */
2240/*}}} */ 2412/*}}} */
2241 2413
2242/* *INDENT-OFF* */ 2414/* *INDENT-OFF* */
2243enum { 2415enum {
2244 C1_40 = 0x40, 2416 C1_40 = 0x40,
2245 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2417 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, 2418 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, 2419 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 2420 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2249}; 2421};
2250/* *INDENT-ON* */ 2422/* *INDENT-ON* */
2251 2423
2252/*{{{ process non-printing single characters */ 2424/*{{{ process non-printing single characters */
2253void 2425void
2254rxvt_term::process_nonprinting (unsigned char ch) 2426rxvt_term::process_nonprinting (unicode_t ch)
2255{ 2427{
2256 switch (ch) 2428 switch (ch)
2257 { 2429 {
2430 case C0_ESC:
2431 process_escape_seq ();
2432 break;
2258 case C0_ENQ: /* terminal Status */ 2433 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2434 if (rs[Rs_answerbackstring])
2260 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2437 else
2264 tt_write ((unsigned char *)VT100_ANS, 2438 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN (VT100_ANS)); 2439 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2440 break;
2267 case C0_BEL: /* bell */ 2441 case C0_BEL: /* bell */
2268 scr_bell (); 2442 scr_bell ();
2269 break; 2443 break;
2270 case C0_BS: /* backspace */ 2444 case C0_BS: /* backspace */
… …
2285 scr_charset_choose (1); 2459 scr_charset_choose (1);
2286 break; 2460 break;
2287 case C0_SI: /* shift in - acs */ 2461 case C0_SI: /* shift in - acs */
2288 scr_charset_choose (0); 2462 scr_charset_choose (0);
2289 break; 2463 break;
2464
2465 // 8-bit controls
2466 case 0x90: /* DCS */
2467 process_dcs_seq ();
2468 break;
2469 case 0x9b: /* CSI */
2470 process_csi_seq ();
2471 break;
2472 case 0x9d: /* CSI */
2473 process_osc_seq ();
2474 break;
2290 } 2475 }
2291} 2476}
2292/*}}} */ 2477/*}}} */
2293 2478
2294 2479
2295/*{{{ process VT52 escape sequences */ 2480/*{{{ process VT52 escape sequences */
2296void 2481void
2297rxvt_term::process_escape_vt52 (unsigned char ch) 2482rxvt_term::process_escape_vt52 (unicode_t ch)
2298{ 2483{
2299 int row, col; 2484 int row, col;
2300 2485
2301 switch (ch) 2486 switch (ch)
2302 { 2487 {
… …
2354 2539
2355/*{{{ process escape sequences */ 2540/*{{{ process escape sequences */
2356void 2541void
2357rxvt_term::process_escape_seq () 2542rxvt_term::process_escape_seq ()
2358{ 2543{
2359 unsigned char ch = cmd_getc (); 2544 unicode_t ch = cmd_getc ();
2360 2545
2361 if (PrivateModes & PrivMode_vt52) 2546 if (PrivateModes & PrivMode_vt52)
2362 { 2547 {
2363 process_escape_vt52 (ch); 2548 process_escape_vt52 (ch);
2364 return; 2549 return;
… …
2369 /* case 1: do_tek_mode (); break; */ 2554 /* case 1: do_tek_mode (); break; */
2370 case '#': 2555 case '#':
2371 if (cmd_getc () == '8') 2556 if (cmd_getc () == '8')
2372 scr_E (); 2557 scr_E ();
2373 break; 2558 break;
2374 case ' (': 2559 case '(':
2375 scr_charset_set (0, (unsigned int)cmd_getc ()); 2560 scr_charset_set (0, (unsigned int)cmd_getc ());
2376 break; 2561 break;
2377 case ')': 2562 case ')':
2378 scr_charset_set (1, (unsigned int)cmd_getc ()); 2563 scr_charset_set (1, (unsigned int)cmd_getc ());
2379 break; 2564 break;
… …
2381 scr_charset_set (2, (unsigned int)cmd_getc ()); 2566 scr_charset_set (2, (unsigned int)cmd_getc ());
2382 break; 2567 break;
2383 case '+': 2568 case '+':
2384 scr_charset_set (3, (unsigned int)cmd_getc ()); 2569 scr_charset_set (3, (unsigned int)cmd_getc ());
2385 break; 2570 break;
2386#ifdef MULTICHAR_SET
2387 case '$':
2388 scr_charset_set (-2, (unsigned int)cmd_getc ());
2389 break;
2390#endif
2391#ifndef NO_FRILLS 2571#ifndef NO_FRILLS
2392 case '6': 2572 case '6':
2393 scr_backindex (); 2573 scr_backindex ();
2394 break; 2574 break;
2395#endif 2575#endif
… …
2417 break; 2597 break;
2418 2598
2419 /* 8.3.87: NEXT LINE */ 2599 /* 8.3.87: NEXT LINE */
2420 case C1_NEL: /* ESC E */ 2600 case C1_NEL: /* ESC E */
2421 { 2601 {
2422 uint32_t nlcr[] = { '\n', '\r' }; 2602 unicode_t nlcr[] = { L'\n', L'\r' };
2423 scr_add_lines (nlcr, 1, 2); 2603 scr_add_lines (nlcr, 1, 2);
2424 } 2604 }
2425 break; 2605 break;
2426 2606
2427 /* kidnapped escape sequence: Should be 8.3.48 */ 2607 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2438 case C1_RI: /* ESC M */ 2618 case C1_RI: /* ESC M */
2439 scr_index (DN); 2619 scr_index (DN);
2440 break; 2620 break;
2441 2621
2442 /* 8.3.142: SINGLE-SHIFT TWO */ 2622 /* 8.3.142: SINGLE-SHIFT TWO */
2443 /*case C1_SS2: scr_single_shift (2); break; */ 2623 /*case C1_SS2: scr_single_shift (2); break; */
2444 2624
2445 /* 8.3.143: SINGLE-SHIFT THREE */ 2625 /* 8.3.143: SINGLE-SHIFT THREE */
2446 /*case C1_SS3: scr_single_shift (3); break; */ 2626 /*case C1_SS3: scr_single_shift (3); break; */
2447 2627
2448 /* 8.3.27: DEVICE CONTROL STRING */ 2628 /* 8.3.27: DEVICE CONTROL STRING */
2449 case C1_DCS: /* ESC P */ 2629 case C1_DCS: /* ESC P */
2450 process_dcs_seq (); 2630 process_dcs_seq ();
2451 break; 2631 break;
… …
2466 process_osc_seq (); 2646 process_osc_seq ();
2467 break; 2647 break;
2468 2648
2469 /* 8.3.106: RESET TO INITIAL STATE */ 2649 /* 8.3.106: RESET TO INITIAL STATE */
2470 case 'c': 2650 case 'c':
2651 mbstate.reset ();
2471 scr_poweron (); 2652 scr_poweron ();
2472 scrollbar_show (1); 2653 scrollbar_show (1);
2473 break; 2654 break;
2474 2655
2475 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2656 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2512 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2693 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, [, \, ], ^, _, */ 2694 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, */ 2695 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, */ 2696 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, */ 2697 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, {, |, }, ~, */ 2698 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2518 }; 2699 };
2519/* *INDENT-ON* */ 2700/* *INDENT-ON* */
2520 2701
2521void 2702void
2522rxvt_term::process_csi_seq () 2703rxvt_term::process_csi_seq ()
2523{ 2704{
2524 unsigned char ch, priv, i; 2705 unicode_t ch, priv, i;
2525 unsigned int nargs, p; 2706 unsigned int nargs, p;
2526 int n, ndef; 2707 int n, ndef;
2527 int arg[ESC_ARGS]; 2708 int arg[ESC_ARGS];
2528 2709
2529 for (nargs = ESC_ARGS; nargs > 0;) 2710 for (nargs = ESC_ARGS; nargs > 0;)
2530 arg[--nargs] = 0; 2711 arg[--nargs] = 0;
2531 2712
2532 priv = 0; 2713 priv = 0;
… …
2534 if (ch >= '<' && ch <= '?') 2715 if (ch >= '<' && ch <= '?')
2535 { /* '<' '=' '>' '?' */ 2716 { /* '<' '=' '>' '?' */
2536 priv = ch; 2717 priv = ch;
2537 ch = cmd_getc (); 2718 ch = cmd_getc ();
2538 } 2719 }
2720
2539 /* read any numerical arguments */ 2721 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2722 for (n = -1; ch < CSI_ICH; )
2541 { 2723 {
2542 if (isdigit (ch)) 2724 if (isdigit (ch))
2543 { 2725 {
… …
2550 { 2732 {
2551 if (nargs < ESC_ARGS) 2733 if (nargs < ESC_ARGS)
2552 arg[nargs++] = n; 2734 arg[nargs++] = n;
2553 n = -1; 2735 n = -1;
2554 } 2736 }
2555 else if (ch == '\b') 2737 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); 2738 process_nonprinting (ch);
2567 } 2739
2568 ch = cmd_getc (); 2740 ch = cmd_getc ();
2569 } 2741 }
2570 2742
2571 if (ch > CSI_7F) 2743 if (ch > CSI_7F)
2572 return; 2744 return;
… …
2730 tt_printf ("\033[0n"); 2902 tt_printf ("\033[0n");
2731 break; 2903 break;
2732 case 6: /* CPR requested */ 2904 case 6: /* CPR requested */
2733 scr_report_position (); 2905 scr_report_position ();
2734 break; 2906 break;
2735#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2907 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure)
2737 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2909 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 2910 break;
2739#endif
2740 case 8: /* unofficial extension */ 2911 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2742 break; 2913 break;
2743 } 2914 }
2744 break; 2915 break;
2745 2916
2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2917 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2814#endif 2985#endif
2815 2986
2816 case CSI_78: /* DECREQTPARM */ 2987 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 2988 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2989 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 2990 break;
2820 2991
2821 default: 2992 default:
2822 break; 2993 break;
2823 } 2994 }
2824} 2995}
… …
2827#ifndef NO_FRILLS 2998#ifndef NO_FRILLS
2828/* ARGSUSED */ 2999/* ARGSUSED */
2829void 3000void
2830rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3001rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2831{ 3002{
2832 int x, y; 3003 int x, y;
2833#if 0
2834 char *s;
2835#endif
2836 XWindowAttributes wattr; 3004 XWindowAttributes wattr;
2837 Window wdummy; 3005 Window wdummy;
2838 3006
2839 if (nargs == 0) 3007 if (nargs == 0)
2840 return; 3008 return;
3009
2841 switch (args[0]) 3010 switch (args[0])
2842 { 3011 {
2843 /* 3012 /*
2844 * commands 3013 * commands
2845 */ 3014 */
2846 case 1: /* deiconify window */ 3015 case 1: /* deiconify window */
2847 XMapWindow (display->display, TermWin.parent[0]); 3016 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 3017 break;
2849 case 2: /* iconify window */ 3018 case 2: /* iconify window */
2850 XIconifyWindow (display->display, TermWin.parent[0], 3019 XIconifyWindow (display->display, TermWin.parent[0],
… …
2867 break; 3036 break;
2868 case 8: /* set size (chars) */ 3037 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int) (args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 3040 break;
3041
3042 //case 9: NYI, TODO, restore maximized window or maximize window
2872 default: 3043 default:
2873 if (args[0] >= 24) /* set height (chars) */ 3044 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 3045 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int) (args[1] * TermWin.fheight)); 3046 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 3047 break;
3048
3049
2877 /* 3050 /*
2878 * reports - some output format copied from XTerm 3051 * reports - some output format copied from XTerm
2879 */ 3052 */
2880 case 11: /* report window state */ 3053 case 11: /* report window state */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 3056 break;
2884 case 13: /* report window position */ 3057 case 13: /* report window position */
2885 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 3060 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 3061 &x, &y, &wdummy);
2889 tt_printf ("\033[3;%d;%dt", x, y); 3062 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 3063 break;
2891 case 14: /* report window size (pixels) */ 3064 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 3067 break;
2895 case 18: /* report window size (chars) */ 3068 case 18: /* report text area size (chars) */
2896 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 3070 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 3071 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break;
2899 case 20: /* report icon label */ 3074 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2900 XGetIconName (display->display, TermWin.parent[0], &s); 3078 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2902 break; 3081 break;
2903 case 21: /* report window title */ 3082 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 {
3085 char *s;
2904 XFetchName (display->display, TermWin.parent[0], &s); 3086 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3088 }
2906 break; 3089 break;
2907#endif
2908
2909 } 3090 }
2910} 3091}
2911#endif 3092#endif
2912 3093
2913/*----------------------------------------------------------------------*/ 3094/*----------------------------------------------------------------------*/
2914/* 3095/*
2915 * get input up until STRING TERMINATOR (or BEL) 3096 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free ()d 3097 * ends_how is terminator used. returned input must be free ()d
2917 */ 3098 */
2918unsigned char * 3099unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 3100rxvt_term::get_to_st (unicode_t &ends_how)
2920{ 3101{
2921 int seen_esc = 0; /* seen escape? */ 3102 int seen_esc = 0; /* seen escape? */
2922 unsigned int n = 0; 3103 unsigned int n = 0;
2923 unsigned char *s; 3104 unsigned char *s;
3105 unicode_t ch;
2924 unsigned char ch, string[STRING_MAX]; 3106 unsigned char string[STRING_MAX];
2925 3107
2926 for (; (ch = cmd_getc ());) 3108 while ((ch = cmd_getc ()))
2927 { 3109 {
2928 if (ch == C0_BEL 3110 if (ch == C0_BEL || ch == CHAR_ST)
2929 || ch == CHAR_ST 3111 break;
3112
3113 if (seen_esc)
2930 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3114 if (ch == 0x5c) /* 7bit ST */
2931 break; 3115 break;
3116 else
3117 return NULL;
3118
2932 if (ch == C0_ESC) 3119 if (ch == C0_ESC)
2933 { 3120 {
2934 seen_esc = 1; 3121 seen_esc = 1;
2935 continue; 3122 continue;
2936 } 3123 }
2937 else if (ch == '\t') 3124 else if (ch == '\t')
2938 ch = ' '; /* translate '\t' to space */ 3125 ch = ' '; /* translate '\t' to space */
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
2940 return NULL; /* other control character - exit */ 3127 return NULL; /* other control character - exit */
3128
2941 if (n < sizeof (string) - 1) 3129 if (n >= sizeof (string) - 1)
3130 // stop at some sane length
3131 return NULL;
3132
2942 string[n++] = ch; 3133 string[n++] = ch;
2943 seen_esc = 0; 3134 seen_esc = 0;
2944 } 3135 }
3136
2945 string[n++] = '\0'; 3137 string[n++] = '\0';
3138
2946 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 3140 return NULL;
3141
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3142 ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY (s, string, n); 3143 STRNCPY (s, string, n);
2950 return s; 3144 return s;
2951} 3145}
2952 3146
2953/*----------------------------------------------------------------------*/ 3147/*----------------------------------------------------------------------*/
… …
2955 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2956 */ 3150 */
2957void 3151void
2958rxvt_term::process_dcs_seq () 3152rxvt_term::process_dcs_seq ()
2959{ 3153{
2960 unsigned char eh, *s; 3154 unsigned char *s;
3155 unicode_t eh;
3156
2961 /* 3157 /*
2962 * Not handled yet 3158 * Not handled yet
2963 */ 3159 */
2964 s = get_to_st (&eh); 3160 s = get_to_st (eh);
2965 if (s) 3161 if (s)
2966 free (s); 3162 free (s);
3163
2967 return; 3164 return;
2968} 3165}
2969 3166
2970/*----------------------------------------------------------------------*/ 3167/*----------------------------------------------------------------------*/
2971/* 3168/*
2972 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3169 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2973 */ 3170 */
2974void 3171void
2975rxvt_term::process_osc_seq () 3172rxvt_term::process_osc_seq ()
2976{ 3173{
2977 unsigned char ch, eh, *s; 3174 unicode_t ch, eh;
2978 int arg; 3175 int arg;
2979 3176
2980 ch = cmd_getc (); 3177 ch = cmd_getc ();
2981 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3178 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 3179 arg = arg * 10 + (ch - '0');
2983 3180
2984 if (ch == ';') 3181 if (ch == ';')
2985 { 3182 {
2986 s = get_to_st (&eh); 3183 unsigned char *s = get_to_st (eh);
3184
2987 if (s) 3185 if (s)
2988 { 3186 {
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); 3187 process_xterm_seq (arg, (char *)s, eh);
3001 free (s); 3188 free (s);
3002 } 3189 }
3003 } 3190 }
3004} 3191}
3192
3193void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{
3196 if (str[0] == '?' && !str[1])
3197 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 }
3205 else
3206 set_window_color (color, str);
3207}
3208
3005/* 3209/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3007 * 0 = change iconName/title 3211 * 0 = change iconName/title
3008 * 1 = change iconName 3212 * 1 = change iconName
3009 * 2 = change title 3213 * 2 = change title
3010 * 4 = change color 3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3011 * 12 = change text color 3217 * 12 = change text color
3012 * 13 = change mouse foreground color 3218 * 13 = change mouse foreground color
3013 * 17 = change highlight character colour 3219 * 17 = change highlight character colour
3014 * 18 = change bold character color 3220 * 18 = change bold character color
3015 * 19 = change underlined character color 3221 * 19 = change underlined character color
3016 * 46 = change logfile (not implemented) 3222 * 46 = change logfile (not implemented)
3017 * 50 = change font 3223 * 50 = change font
3018 * 3224 *
3019 * rxvt extensions: 3225 * rxvt extensions:
3020 * 10 = menu (may change in future)
3021 * 20 = bg pixmap 3226 * 20 = bg pixmap
3022 * 39 = change default fg color 3227 * 39 = change default fg color
3023 * 49 = change default bg color 3228 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3025 */ 3233 */
3026void 3234void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3028{ 3236{
3029 int changed = 0; 3237 int changed = 0;
3030 int color; 3238 int color;
3031 char *buf, *name; 3239 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1];
3032 3241
3033 assert (str != NULL); 3242 assert (str != NULL);
3034 switch (op) 3243 switch (op)
3035 { 3244 {
3036 case XTerm_name: 3245 case XTerm_name:
3037 set_title (str); 3246 set_title (str);
3038 /* FALLTHROUGH */ 3247 /* FALLTHROUGH */
3039 case XTerm_iconName: 3248 case XTerm_iconName:
3040 set_iconName (str); 3249 set_icon_name (str);
3041 break; 3250 break;
3042 case XTerm_title: 3251 case XTerm_title:
3043 set_title (str); 3252 set_title (str);
3044 break; 3253 break;
3254 case XTerm_property:
3255 if (str[0] == '?')
3256 {
3257 Atom prop = XInternAtom (display->display, str + 1, True);
3258 Atom actual_type;
3259 int actual_format;
3260 unsigned long nitems;
3261 unsigned long bytes_after;
3262 unsigned char *value = 0;
3263 const char *str = "";
3264
3265 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None
3271 && actual_format == 8)
3272 str = (const char *)(value);
3273
3274 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3275
3276 XFree (value);
3277 }
3278 else
3279 {
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281
3282 if (eq)
3283 {
3284 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0],
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 }
3290 else
3291 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str));
3293 }
3294 break;
3295
3045 case XTerm_Color: 3296 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3297 for (buf = (char *)str; buf && *buf;)
3047 { 3298 {
3048 if ((name = STRCHR (buf, ';')) == NULL) 3299 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 3300 break;
3301
3050 *name++ = '\0'; 3302 *name++ = '\0';
3051 color = atoi (buf); 3303 color = atoi (buf);
3304
3052 if (color < 0 || color >= TOTAL_COLORS) 3305 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 3306 break;
3307
3054 if ((buf = STRCHR (name, ';')) != NULL) 3308 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 3309 *buf++ = '\0';
3310
3311 if (name[0] == '?' && !name[1])
3312 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 }
3320 else
3056 set_window_color (color + minCOLOR, name); 3321 set_window_color (color + minCOLOR, name);
3057 } 3322 }
3323 break;
3324 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3326 break;
3327 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3058 break; 3329 break;
3059#ifndef NO_CURSORCOLOR 3330#ifndef NO_CURSORCOLOR
3060 case XTerm_Color_cursor: 3331 case XTerm_Color_cursor:
3061 set_window_color (Color_cursor, str); 3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3062 break; 3333 break;
3063#endif 3334#endif
3064 case XTerm_Color_pointer: 3335 case XTerm_Color_pointer_fg:
3065 set_window_color (Color_pointer, str); 3336 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3337 break;
3338 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3066 break; 3340 break;
3067#ifndef NO_BOLD_UNDERLINE_REVERSE 3341#ifndef NO_BOLD_UNDERLINE_REVERSE
3068 case XTerm_Color_BD: 3342 case XTerm_Color_BD:
3069 set_window_color (Color_BD, str); 3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3070 break; 3344 break;
3071 case XTerm_Color_UL: 3345 case XTerm_Color_UL:
3072 set_window_color (Color_UL, str); 3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3073 break; 3347 break;
3074 case XTerm_Color_RV: 3348 case XTerm_Color_RV:
3075 set_window_color (Color_RV, str); 3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3076 break; 3350 break;
3077#endif 3351#endif
3078 3352
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: 3353 case XTerm_Pixmap:
3086 if (*str != ';') 3354 if (*str != ';')
3087 { 3355 {
3088#if XPM_BACKGROUND 3356#if XPM_BACKGROUND
3089 scale_pixmap (""); /* reset to default scaling */ 3357 scale_pixmap (""); /* reset to default scaling */
… …
3112 set_window_color (Color_fg, str); 3380 set_window_color (Color_fg, str);
3113 break; 3381 break;
3114 case XTerm_restoreBG: 3382 case XTerm_restoreBG:
3115 set_window_color (Color_bg, str); 3383 set_window_color (Color_bg, str);
3116 break; 3384 break;
3385
3117 case XTerm_logfile: 3386 case XTerm_logfile:
3387 // TODO, when secure mode?
3118 break; 3388 break;
3389
3119 case XTerm_font: 3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3120 change_font (0, str); 3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3411 else
3412 {
3413 set_locale (str);
3414# ifdef USE_XIM
3415 im_cb ();
3416# endif
3417 }
3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR
3431 case XTerm_Menu:
3432 if (Options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3121 break; 3434 break;
3435#endif
3122#if 0 3436#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3437 case XTerm_dumpscreen: /* no error notices */
3124 { 3438 {
3125 int fd; 3439 int fd;
3126 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3441 {
3128 scr_dump (fd); 3442 scr_dump (fd);
3129 close (fd); 3443 close (fd);
3130 } 3444 }
3131 } 3445 }
3132 break; 3446 break;
3133#endif 3447#endif
3134
3135 } 3448 }
3136} 3449}
3137/*----------------------------------------------------------------------*/ 3450/*----------------------------------------------------------------------*/
3138 3451
3139/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3452/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3147 * so no need for fancy checking 3460 * so no need for fancy checking
3148 */ 3461 */
3149int 3462int
3150rxvt_term::privcases (int mode, unsigned long bit) 3463rxvt_term::privcases (int mode, unsigned long bit)
3151{ 3464{
3152 int state; 3465 int state;
3153 3466
3154 if (mode == 's') 3467 if (mode == 's')
3155 { 3468 {
3156 SavedModes |= (PrivateModes & bit); 3469 SavedModes |= (PrivateModes & bit);
3157 return -1; 3470 return -1;
… …
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3476 else
3164 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode (state, bit); 3478 PrivMode (state, bit);
3166 } 3479 }
3480
3167 return state; 3481 return state;
3168} 3482}
3169 3483
3170/* we're not using priv _yet_ */ 3484/* we're not using priv _yet_ */
3171void 3485void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3486rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3487{
3174 unsigned int i, j; 3488 unsigned int i, j;
3175 int state; 3489 int state;
3490
3176 static const struct 3491 static const struct
3177 { 3492 {
3178 const int argval; 3493 const int argval;
3179 const unsigned long bit; 3494 const unsigned long bit;
3180 } 3495 }
3496
3181 argtopriv[] = { 3497 argtopriv[] = {
3182 { 1, PrivMode_aplCUR }, 3498 { 1, PrivMode_aplCUR },
3183 { 2, PrivMode_vt52 }, 3499 { 2, PrivMode_vt52 },
3184 { 3, PrivMode_132 }, 3500 { 3, PrivMode_132 },
3185 { 4, PrivMode_smoothScroll }, 3501 { 4, PrivMode_smoothScroll },
… …
3191 { menuBar_esc, PrivMode_menuBar }, 3507 { menuBar_esc, PrivMode_menuBar },
3192#endif 3508#endif
3193#ifdef scrollBar_esc 3509#ifdef scrollBar_esc
3194 { scrollBar_esc, PrivMode_scrollBar }, 3510 { scrollBar_esc, PrivMode_scrollBar },
3195#endif 3511#endif
3512 // 18, 19 printing-related
3196 { 25, PrivMode_VisibleCursor }, 3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3197 { 35, PrivMode_ShiftKeys }, 3515 { 35, PrivMode_ShiftKeys }, // rxvt extension
3198 { 40, PrivMode_132OK }, 3516 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI
3519 // 46 start logging
3199 { 47, PrivMode_Screen }, 3520 { 47, PrivMode_Screen },
3200 { 66, PrivMode_aplKP }, 3521 { 66, PrivMode_aplKP },
3201#ifndef NO_BACKSPACE_KEY 3522#ifndef NO_BACKSPACE_KEY
3202 { 67, PrivMode_BackSpace }, 3523 { 67, PrivMode_BackSpace },
3203#endif 3524#endif
3204 { 1000, PrivMode_MouseX11 }, 3525 { 1000, PrivMode_MouseX11 },
3526 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3527 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3528 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3205 { 1010, PrivMode_TtyOutputInh }, 3529 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3206 { 1011, PrivMode_Keypress }, 3530 { 1011, PrivMode_Keypress }, // rxvt extension
3531 // 1035 enable modifiers for alt, numlock NYI
3532 // 1036 send ESC for meta keys NYI
3533 // 1037 send DEL for keypad delete NYI
3207 { 1047, PrivMode_Screen }, 3534 { 1047, PrivMode_Screen },
3535 // 1048 save and restore cursor
3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3536 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3537 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3209 }; 3538 };
3210 3539
3211 if (nargs == 0) 3540 if (nargs == 0)
3212 return; 3541 return;
3213 3542
… …
3228 state = privcases (mode, argtopriv[j].bit); 3557 state = privcases (mode, argtopriv[j].bit);
3229 break; 3558 break;
3230 } 3559 }
3231 3560
3232 /* extra handling for values with state unkept */ 3561 /* extra handling for values with state unkept */
3233 if (state == -1)
3234 switch (arg[i]) 3562 switch (arg[i])
3235 { 3563 {
3236 case 1048: /* alternative cursor save */ 3564 case 1048: /* alternative cursor save */
3565 if (Options & Opt_secondaryScreen)
3237 if (mode == 0) 3566 if (mode == 0)
3238 scr_cursor (RESTORE); 3567 scr_cursor (RESTORE);
3239 else if (mode == 1) 3568 else if (mode == 1)
3240 scr_cursor (SAVE); 3569 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; 3570 break;
3571 }
3572
3573 if (state >= 0)
3574 /* extra handling for values with valid 0 or 1 state */
3575 switch (arg[i])
3576 {
3577 /* case 1: - application cursor keys */
3578 case 2: /* VT52 mode */
3579 /* oddball mode. should be set regardless of set/reset
3580 * parameter. Return from VT52 mode with an ESC < from
3581 * within VT52 mode
3582 */
3583 PrivMode (1, PrivMode_vt52);
3584 break;
3257 case 3: /* 80/132 */ 3585 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3586 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3260 (unsigned int)TermWin.height);
3261 break; 3588 break;
3262 case 4: /* smooth scrolling */ 3589 case 4: /* smooth scrolling */
3263 if (state) 3590 if (state)
3264 Options &= ~Opt_jumpScroll; 3591 Options &= ~Opt_jumpScroll;
3265 else 3592 else
3266 Options |= Opt_jumpScroll; 3593 Options |= Opt_jumpScroll;
3267 break; 3594 break;
3268 case 5: /* reverse video */ 3595 case 5: /* reverse video */
3269 scr_rvideo_mode (state); 3596 scr_rvideo_mode (state);
3270 break; 3597 break;
3271 case 6: /* relative/absolute origins */ 3598 case 6: /* relative/absolute origins */
3272 scr_relative_origin (state); 3599 scr_relative_origin (state);
3273 break; 3600 break;
3274 case 7: /* autowrap */ 3601 case 7: /* autowrap */
3275 scr_autowrap (state); 3602 scr_autowrap (state);
3276 break; 3603 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3604 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3605 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3606 if (state) /* orthogonal */
3280 PrivateModes &= ~ (PrivMode_MouseX11); 3607 PrivateModes &= ~PrivMode_MouseX11;
3281 break; 3608 break;
3282#ifdef menuBar_esc 3609#ifdef menuBar_esc
3283 case menuBar_esc: 3610 case menuBar_esc:
3284#ifdef MENUBAR 3611#ifdef MENUBAR
3285 map_menuBar (state); 3612 map_menuBar (state);
3286#endif 3613#endif
3287 break; 3614 break;
3288#endif 3615#endif
3289#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3290 case scrollBar_esc: 3617 case scrollBar_esc:
3291 if (scrollbar_mapping (state)) 3618 if (scrollbar_mapping (state))
3292 { 3619 {
3293 resize_all_windows (0, 0, 0); 3620 resize_all_windows (0, 0, 0);
3294 scr_touch (true); 3621 scr_touch (true);
3295 } 3622 }
3296 break; 3623 break;
3297#endif 3624#endif
3298 case 25: /* visible/invisible cursor */ 3625 case 25: /* visible/invisible cursor */
3299 scr_cursor_visible (state); 3626 scr_cursor_visible (state);
3300 break; 3627 break;
3301 /* case 35: - shift keys */ 3628 /* case 35: - shift keys */
3302 /* case 40: - 80 <--> 132 mode */ 3629 /* case 40: - 80 <--> 132 mode */
3303 case 47: /* secondary screen */ 3630 case 47: /* secondary screen */
3304 scr_change_screen (state); 3631 scr_change_screen (state);
3305 break; 3632 break;
3306 /* case 66: - application key pad */ 3633 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3634 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3635 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3636 if (state) /* orthogonal */
3310 PrivateModes &= ~ (PrivMode_MouseX10); 3637 PrivateModes &= ~PrivMode_MouseX10;
3311 break; 3638 break;
3312#if 0 3639#if 0
3313 case 1001: 3640 case 1001:
3314 break; /* X11 mouse highlighting */ 3641 break; /* X11 mouse highlighting */
3315#endif 3642#endif
3316 case 1010: /* scroll to bottom on TTY output inhibit */ 3643 case 1010: /* scroll to bottom on TTY output inhibit */
3317 if (state) 3644 if (state)
3318 Options &= ~Opt_scrollTtyOutput; 3645 Options &= ~Opt_scrollTtyOutput;
3319 else 3646 else
3320 Options |= Opt_scrollTtyOutput; 3647 Options |= Opt_scrollTtyOutput;
3321 break; 3648 break;
3322 case 1011: /* scroll to bottom on key press */ 3649 case 1011: /* scroll to bottom on key press */
3323 if (state) 3650 if (state)
3324 Options |= Opt_scrollTtyKeypress; 3651 Options |= Opt_scrollTtyKeypress;
3325 else 3652 else
3326 Options &= ~Opt_scrollTtyKeypress; 3653 Options &= ~Opt_scrollTtyKeypress;
3327 break; 3654 break;
3328 case 1047: /* secondary screen w/ clearing */ 3655 case 1047: /* secondary screen w/ clearing last */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3656 if (Options & Opt_secondaryScreen)
3330 if (current_screen != PRIMARY) 3657 if (current_screen != PRIMARY)
3331 scr_erase_screen (2); 3658 scr_erase_screen (2);
3332 scr_change_screen (state); 3659 scr_change_screen (state);
3333 /* FALLTHROUGH */
3334 default:
3335 break; 3660 break;
3661 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY)
3665 scr_erase_screen (2);
3666 break;
3667 default:
3668 break;
3336 } 3669 }
3337 } 3670 }
3338} 3671}
3339/*}}} */ 3672/*}}} */
3340 3673
3341/*{{{ process sgr sequences */ 3674/*{{{ process sgr sequences */
3342void 3675void
3343rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3676rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3344{ 3677{
3345 unsigned int i; 3678 unsigned int i;
3346 short rendset; 3679 short rendset;
3347 int rendstyle; 3680 int rendstyle;
3348 3681
3349 if (nargs == 0) 3682 if (nargs == 0)
3350 { 3683 {
3351 scr_rendition (0, ~RS_None); 3684 scr_rendition (0, ~RS_None);
3352 return; 3685 return;
3353 } 3686 }
3687
3354 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3355 { 3689 {
3356 rendset = -1; 3690 rendset = -1;
3357 switch (arg[i]) 3691 switch (arg[i])
3358 { 3692 {
… …
3369 rendset = 1, rendstyle = RS_Blink; 3703 rendset = 1, rendstyle = RS_Blink;
3370 break; 3704 break;
3371 case 7: 3705 case 7:
3372 rendset = 1, rendstyle = RS_RVid; 3706 rendset = 1, rendstyle = RS_RVid;
3373 break; 3707 break;
3708 case 8:
3709 // invisible. NYI
3710 break;
3374 case 22: 3711 case 22:
3375 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3376 break; 3713 break;
3377 case 24: 3714 case 24:
3378 rendset = 0, rendstyle = RS_Uline; 3715 rendset = 0, rendstyle = RS_Uline;
… …
3381 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3382 break; 3719 break;
3383 case 27: 3720 case 27:
3384 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3385 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3386 } 3726 }
3727
3387 if (rendset != -1) 3728 if (rendset != -1)
3388 { 3729 {
3389 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3390 continue; /* for (;i;) */ 3731 continue; /* for (;i;) */
3391 } 3732 }
… …
3398 case 33: 3739 case 33:
3399 case 34: 3740 case 34:
3400 case 35: 3741 case 35:
3401 case 36: 3742 case 36:
3402 case 37: 3743 case 37:
3403 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3404 Color_fg);
3405 break; 3745 break;
3406#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3407 case 38: 3747 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3749 {
3410 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3411 Color_fg);
3412 i += 2; 3751 i += 2;
3413 } 3752 }
3414 break; 3753 break;
3415#endif 3754#endif
3416 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3423 case 43: 3762 case 43:
3424 case 44: 3763 case 44:
3425 case 45: 3764 case 45:
3426 case 46: 3765 case 46:
3427 case 47: 3766 case 47:
3428 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3429 Color_bg);
3430 break; 3768 break;
3431#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3432 case 48: 3770 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3772 {
3435 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3436 Color_bg);
3437 i += 2; 3774 i += 2;
3438 } 3775 }
3439 break; 3776 break;
3440#endif 3777#endif
3441 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3474 3811
3475/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ process Rob Nation's own graphics mode sequences */
3476void 3813void
3477rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3478{ 3815{
3479 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3480 3817
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3818 if (cmd == 'Q')
3483 { /* query graphics */ 3819 { /* query graphics */
3484 tt_printf ("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3821 return;
3486 } 3822 }
3487 /* swallow other graphics sequences until terminating ':' */ 3823 /* swallow other graphics sequences until terminating ':' */
3488 do 3824 do
3489 ch = cmd_getc (); 3825 ch = cmd_getc ();
3490 while (ch != ':'); 3826 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} 3827}
3537/*}}} */ 3828/*}}} */
3538 3829
3539/* ------------------------------------------------------------------------- */ 3830/* ------------------------------------------------------------------------- */
3540 3831

Diff Legend

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