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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC

… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 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
57/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
58void 63void
59rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
60{ 65{
61 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 93#ifdef USE_XIM
89 if (Input_Context) 94 if (Input_Context)
90 { 95 {
91 Status status_return; 96 Status status_return;
92 97
98#if 0
93#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
97 else 103 else
104#endif
98#endif 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
… …
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
… …
131 valid_keysym = keysym != NoSymbol; 147 valid_keysym = keysym != NoSymbol;
132 } 148 }
133 149
134 if (valid_keysym) 150 if (valid_keysym)
135 { 151 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 152 if (TermWin.saveLines)
158 { 153 {
159#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 155 if (!ctrl && !meta)
161 { 156 {
… …
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 224 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 225 selection_request (ev.time, 0, 0);
231 return; 226 return;
232 /* rxvt extras */ 227 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 229 change_font (FONT_UP);
235 return; 230 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 232 change_font (FONT_DN);
238 return; 233 return;
239 } 234 }
240 } 235 }
241 } 236 }
242#ifdef PRINTPIPE 237#ifdef PRINTPIPE
243 if (keysym == XK_Print) 238 if (keysym == XK_Print)
244 { 239 {
245 scr_printscreen (ctrl | shft); 240 scr_printscreen (ctrl | shft);
246 return;
247 }
248#endif
249#ifdef GREEK_SUPPORT
250 if (keysym == ks_greekmodeswith)
251 {
252 greek_mode = !greek_mode;
253 if (greek_mode)
254 {
255 xterm_seq (XTerm_title,
256 (greek_getmode () == GREEK_ELOT928
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
258 greek_reset ();
259 }
260 else
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return; 241 return;
263 } 242 }
264#endif 243#endif
265 244
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
268#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 249 {
271 unsigned int l; 250 unsigned int l;
272 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
273 const unsigned char ch = C0_ESC;
274 252
275 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
277 255
278 /* escape prefix */ 256 /* escape prefix */
279 if (meta) 257 if (meta
280# ifdef META8_OPTION 258# ifdef META8_OPTION
281 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
282# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
283 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
284 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
285 return; 268 return;
286 } 269 }
287 else 270 else
288#endif 271#endif
… …
298 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
300 } 283 }
301 else 284 else
302 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
303# ifdef MULTICHAR_SET
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
305 {
306 int col, row;
307
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 }
314# endif
315 break; 286 break;
316#endif 287#endif
317#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
318 case XK_Delete: 289 case XK_Delete:
319 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 291 break;
333#endif 292#endif
334 case XK_Tab: 293 case XK_Tab:
335 if (shft) 294 if (shft)
336 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
378 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 339 }
381 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 342 break;
419 343
420#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
422 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
611 break; 535 break;
612 } 536 }
613 if (newlen) 537 if (newlen)
614 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
615 } 539 }
540
616 /* 541 /*
617 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
618 */ 543 */
619#ifdef META8_OPTION 544#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
635 { 560 {
636 unsigned char *ch; 561 unsigned char *ch;
637 562
638 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 564 *ch |= 0x80;
565
640 meta = 0; 566 meta = 0;
641 } 567 }
642#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif 568#endif
647 /* nil */ ; 569 /* nil */ ;
648 } 570 }
649 } 571 }
650 572
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 596
675 /* escape prefix */ 597 /* escape prefix */
676 if (meta 598 if (meta
677#ifdef META8_OPTION 599#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
679#endif 601#endif
680 ) 602 )
681 { 603 {
682 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
683
684 tt_write (&ch, 1); 605 tt_write (&ch, 1);
685 } 606 }
607
686#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
687 if (debug_key)
688 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
689 char *p; 610 unsigned char *p;
690 int i; 611 int i;
691 612
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n"); 616 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
699} 619}
700/*}}} */ 620/*}}} */
701 621
… …
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
705unsigned int 625unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
707{ 627{
708 unsigned int n, s; 628 unsigned int n, s;
709 629
710 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
712 if (n > 0 && s < count) 633 if (n > 0 && s < count)
713 { 634 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
718 s += n; 639 s += n;
719 } 640 }
641
720 if (count > s) 642 if (count > s)
721 { 643 {
722 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 645 count = s;
724 } 646 }
647
725 for (; count--;) 648 for (; count--;)
726 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
727 return 0; 653 return 0;
728} 654}
729#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
730 656
731void 657void
… …
794 720
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 721 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 722 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 723 cmdbuf_endp = cmdbuf_ptr + n;
798 724
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
800 726
801 if (n > 0) 727 if (n > 0)
802 { 728 {
803 cmdbuf_endp += n; 729 cmdbuf_endp += n;
804 return true; 730 return true;
805 } 731 }
806 else if (n < 0 && errno != EAGAIN) 732 else if (n < 0 && errno != EAGAIN)
807 destroy (); 733 destroy ();
808 734
809 return false; 735 return false;
810} 736}
811 737
812void 738void
813rxvt_term::pty_cb (io_watcher &w, short revents) 739rxvt_term::pty_cb (io_watcher &w, short revents)
… …
817 743
818 if (revents & EVENT_WRITE) 744 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 745 tt_write (0, 0);
820 else if (revents & EVENT_READ) 746 else if (revents & EVENT_READ)
821 { 747 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us 748 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong 749 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ()) 750 while (pty_fill ())
827 { 751 {
828 if (!seen_input) 752 if (!seen_input)
829 { 753 {
830 seen_input = 1; 754 seen_input = 1;
831 /* 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.
832 tt_winch (); 757 tt_winch ();
833 } 758 }
834 759
835 uint32_t ch = NOCHAR; 760 if (cmd_parse ())
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break; 761 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 } 762 }
933 }
934 }
935}
936
937// read the next character, currently handles UTF-8
938// will probably handle all sorts of other stuff in the future
939uint32_t
940rxvt_term::next_char ()
941{
942 while (cmdbuf_ptr < cmdbuf_endp)
943 {
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946
947 wchar_t wc;
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
949
950 if (len == (size_t)-2)
951 return NOCHAR;
952
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 } 763 }
984} 764}
985 765
986#ifdef POINTER_BLANK 766#ifdef POINTER_BLANK
987void 767void
… …
1017 pointer_blank (); 797 pointer_blank ();
1018} 798}
1019#endif 799#endif
1020 800
1021void 801void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 802rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 803{
1024 int button_number, key_state = 0; 804 int button_number, key_state = 0;
1025 int x, y; 805 int x, y;
1026 806
1027 x = ev.x; 807 x = ev.x;
1028 y = ev.y; 808 y = ev.y;
1029 pixel_position (&x, &y); 809 pixel_position (&x, &y);
1030 810
… …
1351 check_our_parents (); 1131 check_our_parents ();
1352 if (am_transparent) 1132 if (am_transparent)
1353 want_full_refresh = 1; 1133 want_full_refresh = 1;
1354 } 1134 }
1355#endif 1135#endif
1356
1357 } 1136 }
1358 break; 1137 break;
1359 1138
1360 case SelectionClear: 1139 case SelectionClear:
1361 display->set_selection_owner (0); 1140 selection_clear ();
1362 break; 1141 break;
1363 1142
1364 case SelectionNotify: 1143 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1144 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1145 selection_paste (ev.xselection.requestor,
… …
1424 } 1203 }
1425#ifdef MENUBAR 1204#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1206 menubar_expose ();
1428#endif 1207#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432
1433 } 1208 }
1434 break; 1209 break;
1435 1210
1436 case MotionNotify: 1211 case MotionNotify:
1437#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1214 pointer_unblank ();
1440#endif 1215#endif
1441#if MENUBAR 1216#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1217 if (isMenuBarWindow (ev.xany.window))
1443 { 1218 {
1444 menubar_control (& (ev.xbutton)); 1219 menubar_control (ev.xbutton);
1445 break; 1220 break;
1446 } 1221 }
1447#endif 1222#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1224 break;
… …
1569 return; 1344 return;
1570 } 1345 }
1571 1346
1572 /* FALLTHROUGH */ 1347 /* FALLTHROUGH */
1573 case ReparentNotify: 1348 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1350 want_full_refresh = 1;
1577 break; 1351 break;
1578#endif 1352#endif
1579 } 1353 }
1580} 1354}
1581 1355
1582void 1356void
1583rxvt_term::button_press (const XButtonEvent &ev) 1357rxvt_term::button_press (XButtonEvent &ev)
1584{ 1358{
1585 int reportmode = 0, clickintime; 1359 int reportmode = 0, clickintime;
1586 1360
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1362 if (!bypass_keystate)
… …
1590 /* 1364 /*
1591 * VT window processing of button press 1365 * VT window processing of button press
1592 */ 1366 */
1593 if (ev.window == TermWin.vt) 1367 if (ev.window == TermWin.vt)
1594 { 1368 {
1595#if RXVT_GRAPHICS
1596 if (ev.subwindow != None)
1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1598 else
1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 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)
1604 { 1377 {
1605 /* mouse report from vt window */ 1378 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1379 MEvent.clicks++;
1607 MEvent.state = ev.state; 1380 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1381 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1382 /* only report double clicks */
1616 MEvent.clicks = 2; 1383 MEvent.clicks = 2;
1617 mouse_report (ev); 1384 mouse_report (ev);
1618 1385
1619 /* don't report the release */ 1386 /* don't report the release */
1620 MEvent.clicks = 0; 1387 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1388 MEvent.button = AnyButton;
1622 }
1623 } 1389 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1390 }
1637 else 1391 else
1638 { 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 {
1639 if (ev.button != MEvent.button) 1406 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1407 MEvent.clicks = 0;
1641 switch (ev.button) 1408 switch (ev.button)
1642 { 1409 {
1643 case Button1: 1410 case Button1:
1644 /* allow shift+left click to extend selection */ 1411 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1646 { 1413 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1414 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1415 selection_rotate (ev.x, ev.y);
1668 else 1416 else
1669 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);
1670 MEvent.button = Button3; 1437 MEvent.button = Button3;
1671 break; 1438 break;
1672 }
1673 } 1439 }
1440 }
1674 MEvent.time = ev.time; 1441 MEvent.time = ev.time;
1675 return; 1442 return;
1676 }
1677 } 1443 }
1678 1444
1679 /* 1445 /*
1680 * Scrollbar window processing of button press 1446 * Scrollbar window processing of button press
1681 */ 1447 */
… …
1824 menubar_control (ev); 1590 menubar_control (ev);
1825#endif 1591#endif
1826} 1592}
1827 1593
1828void 1594void
1829rxvt_term::button_release (const XButtonEvent &ev) 1595rxvt_term::button_release (XButtonEvent &ev)
1830{ 1596{
1831 int reportmode = 0; 1597 int reportmode = 0;
1832 1598
1833 csrO = 0; /* reset csr Offset */ 1599 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1600 if (!bypass_keystate)
… …
1846#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 1613 pending_scroll_selection=0;
1848#endif 1614#endif
1849 if (ev.window == TermWin.vt) 1615 if (ev.window == TermWin.vt)
1850 { 1616 {
1851#ifdef RXVT_GRAPHICS
1852 if (ev.subwindow != None)
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1854 else
1855#endif
1856
1857 {
1858 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)))
1859 { 1629 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 1630 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 1631 MEvent.button = AnyButton;
1877 mouse_report (ev); 1632 mouse_report (ev);
1633 }
1634#else /* MOUSE_REPORT_DOUBLECLICK */
1635 MEvent.button = AnyButton;
1636 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1637#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 1638 return;
1880 } 1639 }
1881 /* 1640 /*
1882 * dumb hack to compensate for the failure of click-and-drag 1641 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 1642 * when overriding mouse reporting
1884 */ 1643 */
1885 if (PrivateModes & PrivMode_mouse_report 1644 if (PrivateModes & PrivMode_mouse_report
1886 && bypass_keystate 1645 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 1646 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 1647 selection_extend (ev.x, ev.y, 0);
1889 1648
1890 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:
1891 { 1661 {
1892 case Button1: 1662 int i;
1893 case Button3: 1663 page_dirn v;
1894 selection_make (ev.time); 1664
1665 v = (ev.button == Button4) ? UP : DN;
1666 if (ev.state & ShiftMask)
1895 break; 1667 i = 1;
1896 case Button2: 1668 else if ((Options & Opt_mouseWheelScrollPage))
1897 selection_request (ev.time, ev.x, ev.y); 1669 i = TermWin.nrow - 1;
1670 else
1898 break; 1671 i = 5;
1899#ifdef MOUSE_WHEEL 1672# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 1673 if (ev.state & ControlMask)
1901 case Button5:
1902 { 1674 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 mouse_slip_wheel_speed += (v ? -1 : 1); 1675 mouse_slip_wheel_speed += (v ? -1 : 1);
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1918 } 1677 }
1919# endif 1678# endif
1920# 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 {
1921 scr_page (v, i); 1686 scr_page (v, 1);
1922 scr_refresh (SMOOTH_REFRESH); 1687 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 1688 scrollbar_show (1);
1924# else
1925 while (i--)
1926 {
1927 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1);
1930 } 1689 }
1931# endif 1690# endif
1932 1691
1933 }
1934 break;
1935#endif
1936
1937 } 1692 }
1693 break;
1694#endif
1695
1938 } 1696 }
1939 } 1697 }
1940#ifdef MENUBAR 1698#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 1699 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 1700 menubar_control (ev);
1943#endif 1701#endif
1944} 1702}
1945 1703
1946
1947#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
1948/* 1940/*
1949 * Check our parents are still who we think they are. 1941 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 1942 * Do transparency updates if required
1951 */ 1943 */
1952int 1944int
1953rxvt_term::check_our_parents () 1945rxvt_term::check_our_parents ()
1954{ 1946{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 1948 unsigned long nitems, bytes_after;
1957 Atom atype; 1949 Atom atype;
1958 unsigned char *prop = NULL; 1950 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 1951 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 1952 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 1953 XWindowAttributes wattr, wrootattr;
1962 1954
1963 pchanged = 0; 1955 pchanged = 0;
1964 1956
1965 if (! (Options & Opt_transparent)) 1957 if (!(Options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 1958 return pchanged; /* Don't try any more */
1967 1959
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 1961 rootdepth = wrootattr.depth;
1970 1962
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1972 if (rootdepth != wattr.depth) 1965 if (rootdepth != wattr.depth)
1973 { 1966 {
1974 if (am_transparent) 1967 if (am_transparent)
1975 { 1968 {
1976 pchanged = 1; 1969 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 1971 am_transparent = am_pixmap_trans = 0;
1980 } 1972 }
1973
1981 return pchanged; /* Don't try any more */ 1974 return pchanged; /* Don't try any more */
1982 } 1975 }
1983 1976
1984 /* 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. */
1985 XSync (display->display, False); 1978 XSync (display->display, False);
… …
1987 /* 1980 /*
1988 * Make the frame window set by the window manager have 1981 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 1982 * the root background. Some window managers put multiple nested frame
1990 * 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.
1991 */ 1984 */
1992 i = (xa[XA_XROOTPMAPID] != 0 1985 i = (xa[XA_XROOTPMAPID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &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
1996 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1997 have_pixmap = 0; 1997 have_pixmap = 0;
1998 else 1998 else
1999 { 1999 {
2000 have_pixmap = 1; 2000 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
2002 XFree (prop); 2002 XFree (prop);
2003 } 2003 }
2004
2004 if (have_pixmap) 2005 if (have_pixmap)
2005 { 2006 {
2006 /* 2007 /*
2007 * Copy display->root pixmap transparency 2008 * Copy display->root pixmap transparency
2008 */ 2009 */
2009 int sx, sy, nx, ny; 2010 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2011 unsigned int nw, nh;
2011 Window cr; 2012 Window cr;
2012 XImage *image; 2013 XImage *image;
2013 GC gc; 2014 GC gc;
2014 XGCValues gcvalue; 2015 XGCValues gcvalue;
2015 2016
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2018 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2019 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2020 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2021 nx = ny = 0;
2022
2021 if (sx < 0) 2023 if (sx < 0)
2022 { 2024 {
2023 nw += sx; 2025 nw += sx;
2024 nx = -sx; 2026 nx = -sx;
2025 sx = 0; 2027 sx = 0;
2026 } 2028 }
2029
2027 if (sy < 0) 2030 if (sy < 0)
2028 { 2031 {
2029 nh += sy; 2032 nh += sy;
2030 ny = -sy; 2033 ny = -sy;
2031 sy = 0; 2034 sy = 0;
2032 } 2035 }
2036
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1; 2039 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2041
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2044 allowedxerror = 0;
2045
2041 if (image == NULL) 2046 if (image == NULL)
2042 { 2047 {
2043 if (am_transparent && am_pixmap_trans) 2048 if (am_transparent && am_pixmap_trans)
2044 { 2049 {
2045 pchanged = 1; 2050 pchanged = 1;
… …
2047 { 2052 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2053 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None; 2054 TermWin.pixmap = None;
2050 } 2055 }
2051 } 2056 }
2057
2052 am_pixmap_trans = 0; 2058 am_pixmap_trans = 0;
2053 } 2059 }
2054 else 2060 else
2055 { 2061 {
2056 if (TermWin.pixmap != None) 2062 if (TermWin.pixmap != None)
2057 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
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2086 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2089 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2090 XFreeGC (display->display, gc);
2067 XDestroyImage (image); 2091 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2069 TermWin.pixmap); 2093 TermWin.pixmap);
2094
2070 if (!am_transparent || !am_pixmap_trans) 2095 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2096 pchanged = 1;
2097
2072 am_transparent = am_pixmap_trans = 1; 2098 am_transparent = am_pixmap_trans = 1;
2073 } 2099 }
2074 } 2100 }
2101
2075 if (!am_pixmap_trans) 2102 if (!am_pixmap_trans)
2076 { 2103 {
2077 unsigned int n; 2104 unsigned int n;
2078 /* 2105 /*
2079 * InheritPixmap transparency 2106 * InheritPixmap transparency
2080 */ 2107 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2110 {
2085 oldp = TermWin.parent[i]; 2111 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2113 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2114 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2090 if (TermWin.parent[i] == display->root) 2117 if (TermWin.parent[i] == display->root)
2091 { 2118 {
2092 if (oldp != None) 2119 if (oldp != None)
2093 pchanged = 1; 2120 pchanged = 1;
2121
2094 break; 2122 break;
2095 } 2123 }
2124
2096 if (oldp != TermWin.parent[i]) 2125 if (oldp != TermWin.parent[i])
2097 pchanged = 1; 2126 pchanged = 1;
2098 } 2127 }
2128
2099 n = 0; 2129 n = 0;
2130
2100 if (pchanged) 2131 if (pchanged)
2101 { 2132 {
2102 for (; n < (unsigned int)i; n++) 2133 for (; n < (unsigned int)i; n++)
2103 { 2134 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2109 break; 2140 break;
2110 } 2141 }
2111 } 2142 }
2112 } 2143 }
2113 if (n > (int) (sizeof (TermWin.parent) 2144
2114 / sizeof (TermWin.parent[0]))) 2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2115 { 2146 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2147 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt, 2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2150 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2151 /* XXX: also turn off Opt_transparent? */
2123 } 2152 }
2124 else 2153 else
2125 { 2154 {
2155#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2156 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2157 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130
2131 rqt.tv_sec = 1;
2132 rqt.tv_nsec = 0;
2133 nanosleep (&rqt, NULL);
2134# else
2135 sleep (1); 2158 sleep (1);
2136# endif 2159#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2161 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2140 ParentRelative); 2163
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2142 ParentRelative);
2143 am_transparent = 1; 2165 am_transparent = 1;
2144 } 2166 }
2167
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2169 TermWin.parent[i] = None;
2147 } 2170 }
2171
2148 return pchanged; 2172 return pchanged;
2149} 2173}
2150#endif 2174#endif
2151 2175
2152/*}}} */ 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}
2153 2332
2154/*{{{ print pipe */ 2333/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2334/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2335#ifdef PRINTPIPE
2157FILE * 2336FILE *
2158rxvt_term::popen_printer () 2337rxvt_term::popen_printer ()
2159{ 2338{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2339 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2340
2162 if (stream == NULL) 2341 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2342 rxvt_warn ("can't open printer pipe, not printing.\n");
2343
2164 return stream; 2344 return stream;
2165} 2345}
2166 2346
2167int 2347int
2168rxvt_term::pclose_printer (FILE *stream) 2348rxvt_term::pclose_printer (FILE *stream)
2169{ 2349{
2170 fflush (stream); 2350 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2351 return pclose (stream);
2177# endif
2178} 2352}
2179 2353
2180/* 2354/*
2181 * simulate attached vt100 printer 2355 * simulate attached vt100 printer
2182 */ 2356 */
2183void 2357void
2184rxvt_term::process_print_pipe () 2358rxvt_term::process_print_pipe ()
2185{ 2359{
2186 int done; 2360 int done;
2187 FILE *fd; 2361 FILE *fd;
2188 2362
2189 if ((fd = popen_printer ()) == NULL) 2363 if ((fd = popen_printer ()) == NULL)
2190 return; 2364 return;
2191 2365
2192 /* 2366 /*
2193 * 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
2194 * is received. 2368 * is received.
2195 */ 2369 */
2196 for (done = 0; !done;) 2370 for (done = 0; !done;)
2197 { 2371 {
2198 unsigned char buf[8]; 2372 unsigned char buf[8];
2199 unsigned char ch; 2373 unicode_t ch;
2200 unsigned int i, len; 2374 unsigned int i, len;
2201 2375
2202 if ((ch = cmd_getc ()) != C0_ESC) 2376 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2377 {
2204 if (putc (ch, fd) == EOF) 2378 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2379 break; /* done = 1 */
… …
2220 { 2394 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2395 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2396 break; /* done = 1 */
2223 } 2397 }
2224 } 2398 }
2399
2225 for (i = 0; i < len; i++) 2400 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2401 if (putc (buf[i], fd) == EOF)
2227 { 2402 {
2228 done = 1; 2403 done = 1;
2229 break; 2404 break;
2230 } 2405 }
2231 } 2406 }
2232 } 2407 }
2408
2233 pclose_printer (fd); 2409 pclose_printer (fd);
2234} 2410}
2235#endif /* PRINTPIPE */ 2411#endif /* PRINTPIPE */
2236/*}}} */ 2412/*}}} */
2237 2413
2238/* *INDENT-OFF* */ 2414/* *INDENT-OFF* */
2239enum { 2415enum {
2240 C1_40 = 0x40, 2416 C1_40 = 0x40,
2241 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,
2242 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,
2243 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,
2244 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,
2245}; 2421};
2246/* *INDENT-ON* */ 2422/* *INDENT-ON* */
2247 2423
2248/*{{{ process non-printing single characters */ 2424/*{{{ process non-printing single characters */
2249void 2425void
2250rxvt_term::process_nonprinting (unsigned char ch) 2426rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2427{
2252 switch (ch) 2428 switch (ch)
2253 { 2429 {
2430 case C0_ESC:
2431 process_escape_seq ();
2432 break;
2254 case C0_ENQ: /* terminal Status */ 2433 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2434 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2259 else 2437 else
2260 tt_write ((unsigned char *)VT100_ANS, 2438 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2439 (unsigned int)STRLEN (VT100_ANS));
2262 break; 2440 break;
2263 case C0_BEL: /* bell */ 2441 case C0_BEL: /* bell */
2264 scr_bell (); 2442 scr_bell ();
2265 break; 2443 break;
2266 case C0_BS: /* backspace */ 2444 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2459 scr_charset_choose (1);
2282 break; 2460 break;
2283 case C0_SI: /* shift in - acs */ 2461 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2462 scr_charset_choose (0);
2285 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;
2286 } 2475 }
2287} 2476}
2288/*}}} */ 2477/*}}} */
2289 2478
2290 2479
2291/*{{{ process VT52 escape sequences */ 2480/*{{{ process VT52 escape sequences */
2292void 2481void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2482rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2483{
2295 int row, col; 2484 int row, col;
2296 2485
2297 switch (ch) 2486 switch (ch)
2298 { 2487 {
… …
2350 2539
2351/*{{{ process escape sequences */ 2540/*{{{ process escape sequences */
2352void 2541void
2353rxvt_term::process_escape_seq () 2542rxvt_term::process_escape_seq ()
2354{ 2543{
2355 unsigned char ch = cmd_getc (); 2544 unicode_t ch = cmd_getc ();
2356 2545
2357 if (PrivateModes & PrivMode_vt52) 2546 if (PrivateModes & PrivMode_vt52)
2358 { 2547 {
2359 process_escape_vt52 (ch); 2548 process_escape_vt52 (ch);
2360 return; 2549 return;
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2566 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2567 break;
2379 case '+': 2568 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2569 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2570 break;
2382#ifdef MULTICHAR_SET
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS 2571#ifndef NO_FRILLS
2388 case '6': 2572 case '6':
2389 scr_backindex (); 2573 scr_backindex ();
2390 break; 2574 break;
2391#endif 2575#endif
… …
2413 break; 2597 break;
2414 2598
2415 /* 8.3.87: NEXT LINE */ 2599 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 2600 case C1_NEL: /* ESC E */
2417 { 2601 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 2602 unicode_t nlcr[] = { L'\n', L'\r' };
2419 scr_add_lines (nlcr, 1, 2); 2603 scr_add_lines (nlcr, 1, 2);
2420 } 2604 }
2421 break; 2605 break;
2422 2606
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 2607 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 2618 case C1_RI: /* ESC M */
2435 scr_index (DN); 2619 scr_index (DN);
2436 break; 2620 break;
2437 2621
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 2622 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 2623 /*case C1_SS2: scr_single_shift (2); break; */
2440 2624
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 2625 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 2626 /*case C1_SS3: scr_single_shift (3); break; */
2443 2627
2444 /* 8.3.27: DEVICE CONTROL STRING */ 2628 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 2629 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 2630 process_dcs_seq ();
2447 break; 2631 break;
… …
2462 process_osc_seq (); 2646 process_osc_seq ();
2463 break; 2647 break;
2464 2648
2465 /* 8.3.106: RESET TO INITIAL STATE */ 2649 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 2650 case 'c':
2651 mbstate.reset ();
2467 scr_poweron (); 2652 scr_poweron ();
2468 scrollbar_show (1); 2653 scrollbar_show (1);
2469 break; 2654 break;
2470 2655
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2656 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2508 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, */
2509 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, [, \, ], ^, _, */
2510 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, */
2511 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, */
2512 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, */
2513 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, {, |, }, ~, */
2514 }; 2699 };
2515/* *INDENT-ON* */ 2700/* *INDENT-ON* */
2516 2701
2517void 2702void
2518rxvt_term::process_csi_seq () 2703rxvt_term::process_csi_seq ()
2519{ 2704{
2520 unsigned char ch, priv, i; 2705 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 2706 unsigned int nargs, p;
2522 int n, ndef; 2707 int n, ndef;
2523 int arg[ESC_ARGS]; 2708 int arg[ESC_ARGS];
2524 2709
2525 for (nargs = ESC_ARGS; nargs > 0;) 2710 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 2711 arg[--nargs] = 0;
2527 2712
2528 priv = 0; 2713 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 2715 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 2716 { /* '<' '=' '>' '?' */
2532 priv = ch; 2717 priv = ch;
2533 ch = cmd_getc (); 2718 ch = cmd_getc ();
2534 } 2719 }
2720
2535 /* read any numerical arguments */ 2721 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 2722 for (n = -1; ch < CSI_ICH; )
2537 { 2723 {
2538 if (isdigit (ch)) 2724 if (isdigit (ch))
2539 { 2725 {
… …
2546 { 2732 {
2547 if (nargs < ESC_ARGS) 2733 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 2734 arg[nargs++] = n;
2549 n = -1; 2735 n = -1;
2550 } 2736 }
2551 else if (ch == '\b') 2737 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 2738 process_nonprinting (ch);
2563 } 2739
2564 ch = cmd_getc (); 2740 ch = cmd_getc ();
2565 } 2741 }
2566 2742
2567 if (ch > CSI_7F) 2743 if (ch > CSI_7F)
2568 return; 2744 return;
… …
2726 tt_printf ("\033[0n"); 2902 tt_printf ("\033[0n");
2727 break; 2903 break;
2728 case 6: /* CPR requested */ 2904 case 6: /* CPR requested */
2729 scr_report_position (); 2905 scr_report_position ();
2730 break; 2906 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 2907 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2909 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2734 break; 2910 break;
2735#endif
2736 case 8: /* unofficial extension */ 2911 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 2913 break;
2739 } 2914 }
2740 break; 2915 break;
2741 2916
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2917 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2810#endif 2985#endif
2811 2986
2812 case CSI_78: /* DECREQTPARM */ 2987 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 2988 if (arg[0] == 0 || arg[0] == 1)
2814 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);
2815 /* FALLTHROUGH */ 2990 break;
2816 2991
2817 default: 2992 default:
2818 break; 2993 break;
2819 } 2994 }
2820} 2995}
… …
2823#ifndef NO_FRILLS 2998#ifndef NO_FRILLS
2824/* ARGSUSED */ 2999/* ARGSUSED */
2825void 3000void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3001rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3002{
2828 int x, y; 3003 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3004 XWindowAttributes wattr;
2833 Window wdummy; 3005 Window wdummy;
2834 3006
2835 if (nargs == 0) 3007 if (nargs == 0)
2836 return; 3008 return;
3009
2837 switch (args[0]) 3010 switch (args[0])
2838 { 3011 {
2839 /* 3012 /*
2840 * commands 3013 * commands
2841 */ 3014 */
2842 case 1: /* deiconify window */ 3015 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3016 XMapWindow (display->display, TermWin.parent[0]);
2844 break; 3017 break;
2845 case 2: /* iconify window */ 3018 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3019 XIconifyWindow (display->display, TermWin.parent[0],
… …
2863 break; 3036 break;
2864 case 8: /* set size (chars) */ 3037 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2867 break; 3040 break;
3041
3042 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3043 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3044 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3045 set_widthheight ((unsigned int)TermWin.width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3046 (unsigned int) (args[1] * TermWin.fheight));
2872 break; 3047 break;
3048
3049
2873 /* 3050 /*
2874 * reports - some output format copied from XTerm 3051 * reports - some output format copied from XTerm
2875 */ 3052 */
2876 case 11: /* report window state */ 3053 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3056 break;
2880 case 13: /* report window position */ 3057 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3060 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3061 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3062 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3063 break;
2887 case 14: /* report window size (pixels) */ 3064 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3067 break;
2891 case 18: /* report window size (chars) */ 3068 case 18: /* report text area size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2893 break; 3070 break;
2894#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;
2895 case 20: /* report icon label */ 3074 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3078 XGetIconName (display->display, TermWin.parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2898 break; 3081 break;
2899 case 21: /* report window title */ 3082 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 {
3085 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3086 XFetchName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3088 }
2902 break; 3089 break;
2903#endif
2904
2905 } 3090 }
2906} 3091}
2907#endif 3092#endif
2908 3093
2909/*----------------------------------------------------------------------*/ 3094/*----------------------------------------------------------------------*/
2910/* 3095/*
2911 * get input up until STRING TERMINATOR (or BEL) 3096 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3097 * ends_how is terminator used. returned input must be free ()d
2913 */ 3098 */
2914unsigned char * 3099unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3100rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3101{
2917 int seen_esc = 0; /* seen escape? */ 3102 int seen_esc = 0; /* seen escape? */
2918 unsigned int n = 0; 3103 unsigned int n = 0;
2919 unsigned char *s; 3104 unsigned char *s;
3105 unicode_t ch;
2920 unsigned char ch, string[STRING_MAX]; 3106 unsigned char string[STRING_MAX];
2921 3107
2922 for (; (ch = cmd_getc ());) 3108 while ((ch = cmd_getc ()))
2923 { 3109 {
2924 if (ch == C0_BEL 3110 if (ch == C0_BEL || ch == CHAR_ST)
2925 || ch == CHAR_ST 3111 break;
3112
3113 if (seen_esc)
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3114 if (ch == 0x5c) /* 7bit ST */
2927 break; 3115 break;
3116 else
3117 return NULL;
3118
2928 if (ch == C0_ESC) 3119 if (ch == C0_ESC)
2929 { 3120 {
2930 seen_esc = 1; 3121 seen_esc = 1;
2931 continue; 3122 continue;
2932 } 3123 }
2933 else if (ch == '\t') 3124 else if (ch == '\t')
2934 ch = ' '; /* translate '\t' to space */ 3125 ch = ' '; /* translate '\t' to space */
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
2936 return NULL; /* other control character - exit */ 3127 return NULL; /* other control character - exit */
3128
2937 if (n < sizeof (string) - 1) 3129 if (n >= sizeof (string) - 1)
3130 // stop at some sane length
3131 return NULL;
3132
2938 string[n++] = ch; 3133 string[n++] = ch;
2939 seen_esc = 0; 3134 seen_esc = 0;
2940 } 3135 }
3136
2941 string[n++] = '\0'; 3137 string[n++] = '\0';
3138
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2943 return NULL; 3140 return NULL;
3141
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3142 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3143 STRNCPY (s, string, n);
2946 return s; 3144 return s;
2947} 3145}
2948 3146
2949/*----------------------------------------------------------------------*/ 3147/*----------------------------------------------------------------------*/
… …
2951 * 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)'
2952 */ 3150 */
2953void 3151void
2954rxvt_term::process_dcs_seq () 3152rxvt_term::process_dcs_seq ()
2955{ 3153{
2956 unsigned char eh, *s; 3154 unsigned char *s;
3155 unicode_t eh;
3156
2957 /* 3157 /*
2958 * Not handled yet 3158 * Not handled yet
2959 */ 3159 */
2960 s = get_to_st (&eh); 3160 s = get_to_st (eh);
2961 if (s) 3161 if (s)
2962 free (s); 3162 free (s);
3163
2963 return; 3164 return;
2964} 3165}
2965 3166
2966/*----------------------------------------------------------------------*/ 3167/*----------------------------------------------------------------------*/
2967/* 3168/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3169 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3170 */
2970void 3171void
2971rxvt_term::process_osc_seq () 3172rxvt_term::process_osc_seq ()
2972{ 3173{
2973 unsigned char ch, eh, *s; 3174 unicode_t ch, eh;
2974 int arg; 3175 int arg;
2975 3176
2976 ch = cmd_getc (); 3177 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3178 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3179 arg = arg * 10 + (ch - '0');
2979 3180
2980 if (ch == ';') 3181 if (ch == ';')
2981 { 3182 {
2982 s = get_to_st (&eh); 3183 unsigned char *s = get_to_st (eh);
3184
2983 if (s) 3185 if (s)
2984 { 3186 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3187 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3188 free (s);
2998 } 3189 }
2999 } 3190 }
3000} 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
3001/* 3209/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title 3211 * 0 = change iconName/title
3004 * 1 = change iconName 3212 * 1 = change iconName
3005 * 2 = change title 3213 * 2 = change title
3006 * 4 = change color 3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3007 * 12 = change text color 3217 * 12 = change text color
3008 * 13 = change mouse foreground color 3218 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour 3219 * 17 = change highlight character colour
3010 * 18 = change bold character color 3220 * 18 = change bold character color
3011 * 19 = change underlined character color 3221 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented) 3222 * 46 = change logfile (not implemented)
3013 * 50 = change font 3223 * 50 = change font
3014 * 3224 *
3015 * rxvt extensions: 3225 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap 3226 * 20 = bg pixmap
3018 * 39 = change default fg color 3227 * 39 = change default fg color
3019 * 49 = change default bg color 3228 * 49 = change default bg color
3020 * 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
3021 */ 3233 */
3022void 3234void
3023rxvt_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)
3024{ 3236{
3025 int changed = 0; 3237 int changed = 0;
3026 int color; 3238 int color;
3027 char *buf, *name; 3239 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1];
3028 3241
3029 assert (str != NULL); 3242 assert (str != NULL);
3030 switch (op) 3243 switch (op)
3031 { 3244 {
3032 case XTerm_name: 3245 case XTerm_name:
3033 set_title (str); 3246 set_title (str);
3034 /* FALLTHROUGH */ 3247 /* FALLTHROUGH */
3035 case XTerm_iconName: 3248 case XTerm_iconName:
3036 set_iconName (str); 3249 set_icon_name (str);
3037 break; 3250 break;
3038 case XTerm_title: 3251 case XTerm_title:
3039 set_title (str); 3252 set_title (str);
3040 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
3041 case XTerm_Color: 3296 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3297 for (buf = (char *)str; buf && *buf;)
3043 { 3298 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3299 if ((name = STRCHR (buf, ';')) == NULL)
3045 break; 3300 break;
3301
3046 *name++ = '\0'; 3302 *name++ = '\0';
3047 color = atoi (buf); 3303 color = atoi (buf);
3304
3048 if (color < 0 || color >= TOTAL_COLORS) 3305 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3306 break;
3307
3050 if ((buf = STRCHR (name, ';')) != NULL) 3308 if ((buf = STRCHR (name, ';')) != NULL)
3051 *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
3052 set_window_color (color + minCOLOR, name); 3321 set_window_color (color + minCOLOR, name);
3053 } 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);
3054 break; 3329 break;
3055#ifndef NO_CURSORCOLOR 3330#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3331 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3333 break;
3059#endif 3334#endif
3060 case XTerm_Color_pointer: 3335 case XTerm_Color_pointer_fg:
3061 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);
3062 break; 3340 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3341#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3342 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3344 break;
3067 case XTerm_Color_UL: 3345 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3347 break;
3070 case XTerm_Color_RV: 3348 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3350 break;
3073#endif 3351#endif
3074 3352
3075 case XTerm_Menu:
3076 /*
3077 * rxvt_menubar_dispatch () violates the constness of the string,
3078 * so DON'T do it here
3079 */
3080 break;
3081 case XTerm_Pixmap: 3353 case XTerm_Pixmap:
3082 if (*str != ';') 3354 if (*str != ';')
3083 { 3355 {
3084#if XPM_BACKGROUND 3356#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3357 scale_pixmap (""); /* reset to default scaling */
… …
3108 set_window_color (Color_fg, str); 3380 set_window_color (Color_fg, str);
3109 break; 3381 break;
3110 case XTerm_restoreBG: 3382 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3383 set_window_color (Color_bg, str);
3112 break; 3384 break;
3385
3113 case XTerm_logfile: 3386 case XTerm_logfile:
3387 // TODO, when secure mode?
3114 break; 3388 break;
3389
3115 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
3116 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
3117 break; 3434 break;
3435#endif
3118#if 0 3436#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3437 case XTerm_dumpscreen: /* no error notices */
3120 { 3438 {
3121 int fd; 3439 int fd;
3122 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)
3123 { 3441 {
3124 scr_dump (fd); 3442 scr_dump (fd);
3125 close (fd); 3443 close (fd);
3126 } 3444 }
3127 } 3445 }
3128 break; 3446 break;
3129#endif 3447#endif
3130
3131 } 3448 }
3132} 3449}
3133/*----------------------------------------------------------------------*/ 3450/*----------------------------------------------------------------------*/
3134 3451
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3452/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3460 * so no need for fancy checking
3144 */ 3461 */
3145int 3462int
3146rxvt_term::privcases (int mode, unsigned long bit) 3463rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3464{
3148 int state; 3465 int state;
3149 3466
3150 if (mode == 's') 3467 if (mode == 's')
3151 { 3468 {
3152 SavedModes |= (PrivateModes & bit); 3469 SavedModes |= (PrivateModes & bit);
3153 return -1; 3470 return -1;
… …
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3476 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3161 PrivMode (state, bit); 3478 PrivMode (state, bit);
3162 } 3479 }
3480
3163 return state; 3481 return state;
3164} 3482}
3165 3483
3166/* we're not using priv _yet_ */ 3484/* we're not using priv _yet_ */
3167void 3485void
3168rxvt_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)
3169{ 3487{
3170 unsigned int i, j; 3488 unsigned int i, j;
3171 int state; 3489 int state;
3490
3172 static const struct 3491 static const struct
3173 { 3492 {
3174 const int argval; 3493 const int argval;
3175 const unsigned long bit; 3494 const unsigned long bit;
3176 } 3495 }
3496
3177 argtopriv[] = { 3497 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3498 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3499 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3500 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3501 { 4, PrivMode_smoothScroll },
… …
3187 { menuBar_esc, PrivMode_menuBar }, 3507 { menuBar_esc, PrivMode_menuBar },
3188#endif 3508#endif
3189#ifdef scrollBar_esc 3509#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3510 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3511#endif
3512 // 18, 19 printing-related
3192 { 25, PrivMode_VisibleCursor }, 3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3193 { 35, PrivMode_ShiftKeys }, 3515 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3516 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI
3519 // 46 start logging
3195 { 47, PrivMode_Screen }, 3520 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3521 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3522#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3523 { 67, PrivMode_BackSpace },
3199#endif 3524#endif
3200 { 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
3201 { 1010, PrivMode_TtyOutputInh }, 3529 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 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
3203 { 1047, PrivMode_Screen }, 3534 { 1047, PrivMode_Screen },
3535 // 1048 save and restore cursor
3204 { 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
3205 }; 3538 };
3206 3539
3207 if (nargs == 0) 3540 if (nargs == 0)
3208 return; 3541 return;
3209 3542
… …
3224 state = privcases (mode, argtopriv[j].bit); 3557 state = privcases (mode, argtopriv[j].bit);
3225 break; 3558 break;
3226 } 3559 }
3227 3560
3228 /* extra handling for values with state unkept */ 3561 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3562 switch (arg[i])
3231 { 3563 {
3232 case 1048: /* alternative cursor save */ 3564 case 1048: /* alternative cursor save */
3565 if (Options & Opt_secondaryScreen)
3233 if (mode == 0) 3566 if (mode == 0)
3234 scr_cursor (RESTORE); 3567 scr_cursor (RESTORE);
3235 else if (mode == 1) 3568 else if (mode == 1)
3236 scr_cursor (SAVE); 3569 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 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;
3253 case 3: /* 80/132 */ 3585 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 3586 if (PrivateModes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3256 (unsigned int)TermWin.height);
3257 break; 3588 break;
3258 case 4: /* smooth scrolling */ 3589 case 4: /* smooth scrolling */
3259 if (state) 3590 if (state)
3260 Options &= ~Opt_jumpScroll; 3591 Options &= ~Opt_jumpScroll;
3261 else 3592 else
3262 Options |= Opt_jumpScroll; 3593 Options |= Opt_jumpScroll;
3263 break; 3594 break;
3264 case 5: /* reverse video */ 3595 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 3596 scr_rvideo_mode (state);
3266 break; 3597 break;
3267 case 6: /* relative/absolute origins */ 3598 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 3599 scr_relative_origin (state);
3269 break; 3600 break;
3270 case 7: /* autowrap */ 3601 case 7: /* autowrap */
3271 scr_autowrap (state); 3602 scr_autowrap (state);
3272 break; 3603 break;
3273 /* 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 */
3274 case 9: /* X10 mouse reporting */ 3605 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 3606 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 3607 PrivateModes &= ~PrivMode_MouseX11;
3277 break; 3608 break;
3278#ifdef menuBar_esc 3609#ifdef menuBar_esc
3279 case menuBar_esc: 3610 case menuBar_esc:
3280#ifdef MENUBAR 3611#ifdef MENUBAR
3281 map_menuBar (state); 3612 map_menuBar (state);
3282#endif 3613#endif
3283 break; 3614 break;
3284#endif 3615#endif
3285#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3286 case scrollBar_esc: 3617 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 3618 if (scrollbar_mapping (state))
3288 { 3619 {
3289 resize_all_windows (0, 0, 0); 3620 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 3621 scr_touch (true);
3291 } 3622 }
3292 break; 3623 break;
3293#endif 3624#endif
3294 case 25: /* visible/invisible cursor */ 3625 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 3626 scr_cursor_visible (state);
3296 break; 3627 break;
3297 /* case 35: - shift keys */ 3628 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 3629 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 3630 case 47: /* secondary screen */
3300 scr_change_screen (state); 3631 scr_change_screen (state);
3301 break; 3632 break;
3302 /* case 66: - application key pad */ 3633 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 3634 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 3635 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 3636 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 3637 PrivateModes &= ~PrivMode_MouseX10;
3307 break; 3638 break;
3308#if 0 3639#if 0
3309 case 1001: 3640 case 1001:
3310 break; /* X11 mouse highlighting */ 3641 break; /* X11 mouse highlighting */
3311#endif 3642#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 3643 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 3644 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 3645 Options &= ~Opt_scrollTtyOutput;
3315 else 3646 else
3316 Options |= Opt_scrollTtyOutput; 3647 Options |= Opt_scrollTtyOutput;
3317 break; 3648 break;
3318 case 1011: /* scroll to bottom on key press */ 3649 case 1011: /* scroll to bottom on key press */
3319 if (state) 3650 if (state)
3320 Options |= Opt_scrollTtyKeypress; 3651 Options |= Opt_scrollTtyKeypress;
3321 else 3652 else
3322 Options &= ~Opt_scrollTtyKeypress; 3653 Options &= ~Opt_scrollTtyKeypress;
3323 break; 3654 break;
3324 case 1047: /* secondary screen w/ clearing */ 3655 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3656 if (Options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 3657 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 3658 scr_erase_screen (2);
3328 scr_change_screen (state); 3659 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 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;
3332 } 3669 }
3333 } 3670 }
3334} 3671}
3335/*}}} */ 3672/*}}} */
3336 3673
3337/*{{{ process sgr sequences */ 3674/*{{{ process sgr sequences */
3338void 3675void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3676rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 3677{
3341 unsigned int i; 3678 unsigned int i;
3342 short rendset; 3679 short rendset;
3343 int rendstyle; 3680 int rendstyle;
3344 3681
3345 if (nargs == 0) 3682 if (nargs == 0)
3346 { 3683 {
3347 scr_rendition (0, ~RS_None); 3684 scr_rendition (0, ~RS_None);
3348 return; 3685 return;
3349 } 3686 }
3687
3350 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3351 { 3689 {
3352 rendset = -1; 3690 rendset = -1;
3353 switch (arg[i]) 3691 switch (arg[i])
3354 { 3692 {
… …
3365 rendset = 1, rendstyle = RS_Blink; 3703 rendset = 1, rendstyle = RS_Blink;
3366 break; 3704 break;
3367 case 7: 3705 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 3706 rendset = 1, rendstyle = RS_RVid;
3369 break; 3707 break;
3708 case 8:
3709 // invisible. NYI
3710 break;
3370 case 22: 3711 case 22:
3371 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3372 break; 3713 break;
3373 case 24: 3714 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 3715 rendset = 0, rendstyle = RS_Uline;
… …
3377 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3378 break; 3719 break;
3379 case 27: 3720 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3381 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3382 } 3726 }
3727
3383 if (rendset != -1) 3728 if (rendset != -1)
3384 { 3729 {
3385 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 3731 continue; /* for (;i;) */
3387 } 3732 }
… …
3394 case 33: 3739 case 33:
3395 case 34: 3740 case 34:
3396 case 35: 3741 case 35:
3397 case 36: 3742 case 36:
3398 case 37: 3743 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 3745 break;
3402#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3403 case 38: 3747 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 3749 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 3751 i += 2;
3409 } 3752 }
3410 break; 3753 break;
3411#endif 3754#endif
3412 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3419 case 43: 3762 case 43:
3420 case 44: 3763 case 44:
3421 case 45: 3764 case 45:
3422 case 46: 3765 case 46:
3423 case 47: 3766 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 3768 break;
3427#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3428 case 48: 3770 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 3772 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 3774 i += 2;
3434 } 3775 }
3435 break; 3776 break;
3436#endif 3777#endif
3437 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3470 3811
3471/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ process Rob Nation's own graphics mode sequences */
3472void 3813void
3473rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3474{ 3815{
3475 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3476 3817
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 3818 if (cmd == 'Q')
3479 { /* query graphics */ 3819 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3481 return; 3821 return;
3482 } 3822 }
3483 /* swallow other graphics sequences until terminating ':' */ 3823 /* swallow other graphics sequences until terminating ':' */
3484 do 3824 do
3485 ch = cmd_getc (); 3825 ch = cmd_getc ();
3486 while (ch != ':'); 3826 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 3827}
3533/*}}} */ 3828/*}}} */
3534 3829
3535/* ------------------------------------------------------------------------- */ 3830/* ------------------------------------------------------------------------- */
3536 3831

Diff Legend

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