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.233 by root, Wed Jan 4 01:16:34 2006 UTC vs.
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
268 mb[0] = ch[0]; 271 mb[0] = ch[0];
269 len = 1; 272 len = 1;
270 } 273 }
271 274
272 if (len > 0) 275 if (len > 0)
273 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
274 else 277 else
275 scr_bell (); 278 scr_bell ();
276 } 279 }
277 280
278 iso14755buf = 0; 281 iso14755buf = 0;
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
334 Status status_return; 338 Status status_return;
335 339
336#if 0 340#if 0
337#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
339 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
340 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
341 else 345 else
342#endif 346#endif
343#endif 347#endif
344 { 348 {
… …
381 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
382 } 386 }
383 else 387 else
384#endif 388#endif
385 { 389 {
386 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
388 } 392 }
389 393
390 if (valid_keysym) 394 if (valid_keysym)
391 { 395 {
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
855 { 867 {
856#ifdef META8_OPTION 868#ifdef META8_OPTION
857 /* set 8-bit on */ 869 /* set 8-bit on */
858 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
859 { 871 {
860 unsigned char *ch; 872 char *ch;
861 873
862 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
863 *ch |= 0x80; 875 *ch |= 0x80;
864 876
865 meta = 0; 877 meta = 0;
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
898#ifdef META8_OPTION 913#ifdef META8_OPTION
899 && meta_char == C0_ESC 914 && meta_char == C0_ESC
900#endif 915#endif
901 ) 916 )
902 { 917 {
903 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */
920 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 1003unsigned int
925rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 1005{
927 unsigned int n, s; 1006 unsigned int n, s;
928 1007
929 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
956void 1035void
957rxvt_term::flush () 1036rxvt_term::flush ()
958{ 1037{
959 flush_ev.stop (); 1038 flush_ev.stop ();
960 1039
961#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
962 if (want_full_refresh) 1041 if (want_full_refresh)
963 { 1042 {
964 want_full_refresh = 0; 1043 want_full_refresh = 0;
965 scr_clear (); 1044 scr_clear ();
966 scr_touch (false); 1045 scr_touch (false);
967 } 1046 }
968#endif 1047#endif
969 1048
970 if (want_refresh) 1049 if (want_refresh)
971 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
972 scr_refresh (refresh_type); 1089 scr_refresh ();
973 scrollbar_show (1); 1090 scrollbar_show (1);
974#ifdef USE_XIM 1091#ifdef USE_XIM
975 IMSendSpot (); 1092 IMSendSpot ();
976#endif 1093#endif
977 } 1094 }
… …
980} 1097}
981 1098
982void 1099void
983rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
984{ 1101{
985 SET_R (this); 1102 make_current ();
986 SET_LOCALE (locale);
987 1103
988 display->flush (); 1104 display->flush ();
989 1105
990 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1108}
993 1109
994void 1110void
995rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
996{ 1112{
997 SET_R (this); 1113 make_current ();
998 SET_LOCALE (locale);
999 1114
1000 refresh_limit = 1;
1001 refresh_count = 0; 1115 refresh_count = 0;
1002 flush (); 1116 flush ();
1003} 1117}
1004 1118
1005#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1122{
1009 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1124 want_refresh = 1;
1011 1125
1012 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1127}
1014#endif 1128#endif
1015 1129
1016#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1017void 1131void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1146{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1149 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1150 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1152 }
1040} 1153}
1041#endif 1154#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1159{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1161 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1163 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1165 }
1054} 1166}
1055#endif 1167#endif
… …
1060{ 1172{
1061 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1176 {
1065 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1068 1179
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1180 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1182 }
1073} 1183}
1074#endif 1184#endif
1075 1185
1076#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1077static struct event_handler 1187static struct event_handler
1078{ 1188{
1079 check_watcher cw_yield; 1189 check_watcher yield_ev;
1080 1190
1081 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1082 { 1192 {
1083 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1084 w.stop (); 1201 w.stop ();
1085 } 1202 }
1086 1203
1087 event_handler () 1204 event_handler ()
1088 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1089 { 1206 {
1090 } 1207 }
1091} event_handler; 1208} event_handler;
1092#endif 1209#endif
1093 1210
… …
1104 1221
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1108 1225
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1227
1111 if (r > 0) 1228 if (r > 0)
1112 { 1229 {
1113 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1114 return true; 1231 return true;
1115 } 1232 }
1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 { 1234 {
1118#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1119 if (display->is_local) 1236 if (display->is_local)
1120 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1121#endif 1238#endif
1122 } 1239 }
1123 else 1240 else
1124 { 1241 {
1125 pty_ev.stop (); 1242 pty_ev.stop ();
1126 1243
1127 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1128 destroy (); 1245 destroy ();
1129 } 1246 }
1130 1247
1131 return false; 1248 return false;
1132} 1249}
1133 1250
1134void 1251void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1253{
1137 SET_R (this); 1254 make_current ();
1138 SET_LOCALE (locale);
1139 1255
1140 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1258 while (pty_fill ())
1143 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1148} 1264}
1149 1265
1150void 1266void
1151rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1152{ 1268{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1270 recolour_cursor ();
1155 1271
1156#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1273 hidden_pointer = 0;
1158 1274
1159 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1277#endif
1162} 1278}
1163 1279
1164#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1165void 1281void
1166rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1167{ 1283{
1168 if (! OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1169 return; 1285 return;
1170 1286
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (display->display); 1288 XFlush (dpy);
1173 1289
1174 hidden_pointer = 1; 1290 hidden_pointer = 1;
1175} 1291}
1176 1292
1177void 1293void
1178rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1179{ 1295{
1180 SET_R (this); 1296 make_current ();
1181 SET_LOCALE (locale);
1182 1297
1183 pointer_blank (); 1298 pointer_blank ();
1184} 1299}
1185#endif 1300#endif
1186 1301
… …
1251 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1252 (32 + x + 1), 1367 (32 + x + 1),
1253 (32 + y + 1)); 1368 (32 + y + 1));
1254} 1369}
1255 1370
1256#ifdef USING_W11LIB
1257void
1258rxvt_W11_process_x_event (XEvent *ev)
1259{
1260 rxvt_t *r = rxvt_get_r ();
1261
1262 x_cb (*ev);
1263}
1264#endif
1265
1266/*{{{ process an X event */ 1371/*{{{ process an X event */
1267void 1372void
1268rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1269{ 1374{
1270 dDisp; 1375 make_current ();
1271 1376
1272 SET_R (this); 1377 dLocal (Display *, dpy);
1273 SET_LOCALE (locale);
1274 1378
1275#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1382 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1383
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1387 unsigned int unused_mask;
1305 1388
1306 switch (ev.type) 1389 switch (ev.type)
1307 { 1390 {
1308 case KeyPress: 1391 case KeyPress:
1309#if ISO_14755 1392 key_press (ev.xkey);
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1312 lookup_key (ev.xkey);
1313
1314 break; 1393 break;
1315 1394
1316 case KeyRelease: 1395 case KeyRelease:
1317 { 1396 key_release (ev.xkey);
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1319 KeySym ks;
1320
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif
1323
1324#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support
1326 if (iso14755buf)
1327 if (iso14755buf & ISO_14755_52)
1328 {
1329# if ENABLE_OVERLAY
1330 scr_overlay_off ();
1331# endif
1332# if ISO_14755
1333 // iso14755 part 5.2 handling: release time
1334 // first: controls
1335 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f)))
1338 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1340 commit_iso14755 ();
1341 return; // case-break;
1342 }
1343
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks)
1346 {
1347 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 ();
1349 return; // case-break;
1350 }
1351
1352 scr_bell ();
1353# endif
1354 iso14755buf = 0;
1355 break;
1356 }
1357 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1358 {
1359# if ENABLE_OVERLAY
1360 scr_overlay_off ();
1361# endif
1362 if (iso14755buf & ISO_14755_51)
1363 commit_iso14755 ();
1364#if ISO_14755
1365 else if (iso14755buf & ISO_14755_STARTED)
1366 {
1367 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1368
1369 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1370 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1371 }
1372# endif
1373 else
1374 iso14755buf = 0;
1375 }
1376#endif
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1397 break;
1385 }
1386 1398
1387 case ButtonPress: 1399 case ButtonPress:
1388 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1389 break; 1401 break;
1390 1402
… …
1392 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1393 break; 1405 break;
1394 1406
1395 case ClientMessage: 1407 case ClientMessage:
1396 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1418 destroy ();
1419 }
1401#if ENABLE_EWMH 1420#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1406#endif 1436#endif
1407 } 1437 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1417#ifdef OFFIX_DND
1418 /* OffiX Dnd (drag 'n' drop) protocol */
1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1420 && (ev.xclient.data.l[0] == DndFile
1421 || ev.xclient.data.l[0] == DndDir
1422 || ev.xclient.data.l[0] == DndLink))
1423 {
1424 /* Get Dnd data */
1425 Atom ActualType;
1426 int ActualFormat;
1427 unsigned char *data;
1428 unsigned long Size, RemainingBytes;
1429
1430 XGetWindowProperty (disp, display->root,
1431 xa[XA_DNDSELECTION],
1432 0L, 1000000L,
1433 False, AnyPropertyType,
1434 &ActualType, &ActualFormat,
1435 &Size, &RemainingBytes,
1436 &data);
1437 set_string_property (XA_CUT_BUFFER0, data);
1438 XFree (data);
1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1441 }
1442#endif /* OFFIX_DND */
1443 break;
1444
1445 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1438 break;
1448 1439
1449 /* 1440 /*
1450 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1451 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1470 break; 1461 break;
1471 } 1462 }
1472 break; 1463 break;
1473 1464
1474 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1475 focus_in (); 1469 focus_in ();
1476 break; 1470 break;
1477 1471
1478 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1479 focus_out (); 1476 focus_out ();
1480 break; 1477 break;
1481 1478
1482 case ConfigureNotify: 1479 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1484 { 1481 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1483 ;
1487 1484
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1486 {
1490 seen_resize = 1; 1487 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1492 } 1496 }
1493 1497
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1495 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1496 check_our_parents (); 1502 check_our_parents ();
1497#endif 1503#endif
1498 } 1504 }
1499 break; 1505 break;
1500 1506
1501 case PropertyNotify: 1507 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1510 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1512
1506 break; 1513 break;
1507 1514
1508 case SelectionClear: 1515 case SelectionClear:
1509 selection_clear (); 1516 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1522 break;
1516 1523
1517 case SelectionRequest: 1524 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1526 break;
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1519 break; 1534 break;
1520 1535
1521 case UnmapNotify: 1536 case UnmapNotify:
1522 mapped = 0; 1537 mapped = 0;
1523#ifdef TEXT_BLINK 1538#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1525#endif 1540#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1542 break;
1527 1543
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break;
1534
1535#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1536 case ReparentNotify: 1545 case ReparentNotify:
1537 rootwin_cb (ev); 1546 rootwin_cb (ev);
1538 break; 1547 break;
1539#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1540 1549
1541 case GraphicsExpose: 1550 case GraphicsExpose:
1542 case Expose: 1551 case Expose:
1543 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1544 { 1553 {
1545 do 1554 do
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1558
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1560
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1555 1564
1556 scr_refresh (refresh_type); 1565 want_refresh = 1;
1557 } 1566 }
1558 else 1567 else
1559 { 1568 {
1560 XEvent unused_event; 1569 XEvent unused_event;
1561 1570
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1563 ; 1572 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1574 ;
1566 1575
1567 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1568 { 1577 {
1569 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1570 scrollbar_show (0); 1579 scrollbar_show (0);
1571 } 1580 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1581
1577#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1578 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1580#endif 1585#endif
1581 } 1586 }
1582 break; 1587 break;
1583 1588
1584 case MotionNotify: 1589 case MotionNotify:
1585#ifdef POINTER_BLANK 1590#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1591 if (hidden_pointer)
1587 pointer_unblank (); 1592 pointer_unblank ();
1588#endif 1593#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1595 break;
1598 1596
1599 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
1600 { 1598 {
1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1601 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1603 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1604 ; 1605 ;
1605 1606
1606 XQueryPointer (disp, vt, 1607 XQueryPointer (dpy, vt,
1607 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1611 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
… …
1675#endif 1676#endif
1676 } 1677 }
1677 } 1678 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1680 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1681 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1682 ; 1683 ;
1683 1684
1684 XQueryPointer (disp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1685 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1689 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1691 scrollbar_size ());
1691 scr_refresh (refresh_type);
1692 refresh_limit = 0; 1692 want_refresh = 1;
1693 scrollbar_show (1); 1693 scrollbar_show (1);
1694 } 1694 }
1695 break; 1695 break;
1696 } 1696 }
1697
1698#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif
1710
1711#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 {
1714 if (ev.type == MotionNotify
1715 || ev.type == ButtonPress
1716 || ev.type == ButtonRelease)
1717 if (hidden_pointer)
1718 pointer_unblank ();
1719
1720 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank ();
1722 }
1723#endif
1697} 1724}
1698 1725
1699void 1726void
1700rxvt_term::focus_in () 1727rxvt_term::focus_in ()
1701{ 1728{
1702 if (!focus) 1729 if (!focus)
1703 { 1730 {
1704 focus = 1; 1731 focus = 1;
1705 want_refresh = 1; 1732 want_refresh = 1;
1706 1733
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 1735
1709#if USE_XIM 1736#if USE_XIM
1710 if (Input_Context != NULL) 1737 if (Input_Context != NULL)
1711 { 1738 {
1712 IMSetStatusPosition (); 1739 IMSetPosition ();
1713 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1714 } 1741 }
1715#endif 1742#endif
1716#if CURSOR_BLINK 1743#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1744 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1746#endif
1720#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1722 { 1749 {
1723 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1724 scr_recolour (); 1751 scr_recolour ();
1725 } 1752 }
1726#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1727 } 1767 }
1728} 1768}
1729 1769
1730void 1770void
1731rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1733 if (focus) 1773 if (focus)
1734 { 1774 {
1735 focus = 0; 1775 focus = 0;
1736 want_refresh = 1; 1776 want_refresh = 1;
1737 1777
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1779
1740#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1781 if (iso14755buf)
1742 { 1782 {
1743 iso14755buf = 0; 1783 iso14755buf = 0;
1744# if ENABLE_OVERLAY 1784# if ISO_14755
1745 scr_overlay_off (); 1785 scr_overlay_off ();
1746# endif 1786# endif
1747 } 1787 }
1748#endif 1788#endif
1749#if USE_XIM 1789#if USE_XIM
1750 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1752#endif 1792#endif
1753#if CURSOR_BLINK 1793#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1755 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1756 hidden_cursor = 0; 1796 hidden_cursor = 0;
1757#endif 1797#endif
1758#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1763 } 1803 }
1764#endif 1804#endif
1765 } 1805 }
1766} 1806}
1767 1807
1768#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1769void 1822void
1770rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1824{
1772 SET_R (this); 1825 make_current ();
1773 SET_LOCALE (locale);
1774 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1775 switch (ev.type) 1832 switch (ev.type)
1776 { 1833 {
1777 case PropertyNotify: 1834 case PropertyNotify:
1778 /* 1835 /*
1779 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1784 return; 1841 return;
1785 1842
1786 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1787 case ReparentNotify: 1844 case ReparentNotify:
1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1789 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1790 break; 1847 break;
1791 } 1848 }
1849# endif
1792} 1850}
1793#endif 1851#endif
1794 1852
1795void 1853void
1796rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
… …
1805 /* 1863 /*
1806 * VT window processing of button press 1864 * VT window processing of button press
1807 */ 1865 */
1808 if (ev.window == vt) 1866 if (ev.window == vt)
1809 { 1867 {
1868 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1869 return;
1870
1810#if ISO_14755 1871#if ISO_14755
1811 // 5.4 1872 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1873 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1874 {
1814 iso14755_54 (ev.x, ev.y); 1875 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1887#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1888 if (ev.button == MEvent.button && clickintime)
1828 { 1889 {
1829 /* same button, within alloted time */ 1890 /* same button, within alloted time */
1830 MEvent.clicks++; 1891 MEvent.clicks++;
1892
1831 if (MEvent.clicks > 1) 1893 if (MEvent.clicks > 1)
1832 { 1894 {
1833 /* only report double clicks */ 1895 /* only report double clicks */
1834 MEvent.clicks = 2; 1896 MEvent.clicks = 2;
1835 mouse_report (ev); 1897 mouse_report (ev);
… …
1855 else 1917 else
1856 { 1918 {
1857 if (ev.button != MEvent.button) 1919 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1920 MEvent.clicks = 0;
1859 1921
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1922 switch (ev.button)
1862 { 1923 {
1863 case Button1: 1924 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1925 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1926 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1927#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1928 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1929#else
1869 selection.rect = false; 1930 selection.rect = false;
1870#endif 1931#endif
1871 1932
1872 /* allow shift+left click to extend selection */ 1933 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1934 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1935 {
1875 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1937 selection_rotate (ev.x, ev.y);
1877 else 1938 else
1878 selection_extend (ev.x, ev.y, 1); 1939 selection_extend (ev.x, ev.y, 1);
1879 } 1940 }
1880 else 1941 else
1881 { 1942 {
1882 if (MEvent.button == Button1 && clickintime) 1943 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1944 MEvent.clicks++;
1884 else 1945 else
1885 MEvent.clicks = 1; 1946 MEvent.clicks = 1;
1886 1947
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1948 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1949 }
1889 1950
1890 MEvent.button = Button1; 1951 MEvent.button = Button1;
1891 break; 1952 break;
1892 1953
1893 case Button3: 1954 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1955 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1956 selection_rotate (ev.x, ev.y);
1896 else 1957 else
1897 selection_extend (ev.x, ev.y, 1); 1958 selection_extend (ev.x, ev.y, 1);
1898 1959
1899 MEvent.button = Button3; 1960 MEvent.button = Button3;
1900 break; 1961 break;
1901 } 1962 }
1902 } 1963 }
1903 1964
1904 MEvent.time = ev.time; 1965 MEvent.time = ev.time;
1905 return; 1966 return;
1906 } 1967 }
1907 1968
… …
2043 } 2104 }
2044 2105
2045 break; 2106 break;
2046 } 2107 }
2047 } 2108 }
2109
2048 return; 2110 return;
2049 } 2111 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2112}
2058 2113
2059void 2114void
2060rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
2061{ 2116{
… …
2067 2122
2068 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
2069 { 2124 {
2070 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
2071 scrollbar_show (0); 2126 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2127 }
2076 2128
2077#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2130 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2080#endif 2132#endif
2081 2133
2082 if (ev.window == vt) 2134 if (ev.window == vt)
2083 { 2135 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2137 return;
2138
2084#if ISO_14755 2139#if ISO_14755
2085 // 5.4 2140 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2142 return;
2088#endif 2143#endif
2144
2089 if (reportmode) 2145 if (reportmode)
2090 { 2146 {
2091 /* mouse report from vt window */ 2147 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
2123 { 2179 {
2124 case Button1: 2180 case Button1:
2125 case Button3: 2181 case Button3:
2126 selection_make (ev.time); 2182 selection_make (ev.time);
2127 break; 2183 break;
2184
2128 case Button2: 2185 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2188 break;
2189
2131#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2132 case Button4: 2191 case Button4:
2133 case Button5: 2192 case Button5:
2134 { 2193 {
2135 int i; 2194 int i;
… …
2137 2196
2138 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2139 2198
2140 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2141 i = 1; 2200 i = 1;
2142 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2143 i = nrow - 1; 2202 i = nrow - 1;
2144 else 2203 else
2145 i = 5; 2204 i = 5;
2146 2205
2147# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2157 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2158 } 2217 }
2159 else 2218 else
2160 { 2219 {
2161# endif 2220# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2221 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2222 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2175 } 2224 }
2176#endif 2225# endif
2177 } 2226 }
2178 break; 2227 break;
2179#endif 2228#endif
2180 } 2229 }
2181 } 2230 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2231}
2187
2188#ifdef TRANSPARENT
2189#if TINTING
2190/* taken from aterm-0.4.2 */
2191
2192typedef uint32_t RUINT32T;
2193
2194void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2195{
2196 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i;
2202
2203 Visual *visual = display->visual;
2204
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206
2207 /* for convenience */
2208 mask_r = visual->red_mask;
2209 mask_g = visual->green_mask;
2210 mask_b = visual->blue_mask;
2211
2212 /* boring lookup table pre-initialization */
2213 switch (srcImage->bits_per_pixel) {
2214 case 15:
2215 if ((mask_r != 0x7c00) ||
2216 (mask_g != 0x03e0) ||
2217 (mask_b != 0x001f))
2218 return;
2219 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2220 lookup_r = lookup;
2221 lookup_g = lookup+32;
2222 lookup_b = lookup+32+32;
2223 sh_r = 10;
2224 sh_g = 5;
2225 sh_b = 0;
2226 break;
2227 case 16:
2228 if ((mask_r != 0xf800) ||
2229 (mask_g != 0x07e0) ||
2230 (mask_b != 0x001f))
2231 return;
2232 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2233 lookup_r = lookup;
2234 lookup_g = lookup+32;
2235 lookup_b = lookup+32+64;
2236 sh_r = 11;
2237 sh_g = 5;
2238 sh_b = 0;
2239 break;
2240 case 24:
2241 if ((mask_r != 0xff0000) ||
2242 (mask_g != 0x00ff00) ||
2243 (mask_b != 0x0000ff))
2244 return;
2245 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2246 lookup_r = lookup;
2247 lookup_g = lookup+256;
2248 lookup_b = lookup+256+256;
2249 sh_r = 16;
2250 sh_g = 8;
2251 sh_b = 0;
2252 break;
2253 case 32:
2254 if ((mask_r != 0xff0000) ||
2255 (mask_g != 0x00ff00) ||
2256 (mask_b != 0x0000ff))
2257 return;
2258 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2259 lookup_r = lookup;
2260 lookup_g = lookup+256;
2261 lookup_b = lookup+256+256;
2262 sh_r = 16;
2263 sh_g = 8;
2264 sh_b = 0;
2265 break;
2266 default:
2267 return; /* we do not support this color depth */
2268 }
2269
2270 /* prepare limits for color transformation (each channel is handled separately) */
2271 if (shade < 0) {
2272 shade = -shade;
2273 if (shade < 0) shade = 0;
2274 if (shade > 100) shade = 100;
2275
2276 lower_lim_r = 65535-rm;
2277 lower_lim_g = 65535-gm;
2278 lower_lim_b = 65535-bm;
2279
2280 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2281 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2282 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2283
2284 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2285 } else {
2286 if (shade < 0) shade = 0;
2287 if (shade > 100) shade = 100;
2288
2289 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2290
2291 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2292 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2293 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2294 }
2295
2296 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2297 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2298 {
2299 unsigned int tmp;
2300
2301 tmp = lower_lim_r;
2302 lower_lim_r = lower_lim_b;
2303 lower_lim_b = tmp;
2304
2305 tmp = upper_lim_r;
2306 upper_lim_r = upper_lim_b;
2307 upper_lim_b = tmp;
2308 }
2309
2310 /* fill our lookup tables */
2311 for (i = 0; i <= mask_r>>sh_r; i++)
2312 {
2313 RUINT32T tmp;
2314 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2315 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2316 lookup_r[i] = (tmp/65535)<<sh_r;
2317 }
2318 for (i = 0; i <= mask_g>>sh_g; i++)
2319 {
2320 RUINT32T tmp;
2321 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2322 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2323 lookup_g[i] = (tmp/65535)<<sh_g;
2324 }
2325 for (i = 0; i <= mask_b>>sh_b; i++)
2326 {
2327 RUINT32T tmp;
2328 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2329 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2330 lookup_b[i] = (tmp/65535)<<sh_b;
2331 }
2332
2333 /* apply table to input image (replacing colors by newly calculated ones) */
2334 switch (srcImage->bits_per_pixel)
2335 {
2336 case 15:
2337 {
2338 unsigned short *p1, *pf, *p, *pl;
2339 p1 = (unsigned short *) srcImage->data;
2340 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2341 while (p1 < pf)
2342 {
2343 p = p1;
2344 pl = p1 + srcImage->width;
2345 for (; p < pl; p++)
2346 {
2347 *p = lookup_r[(*p & 0x7c00)>>10] |
2348 lookup_g[(*p & 0x03e0)>> 5] |
2349 lookup_b[(*p & 0x001f)];
2350 }
2351 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2352 }
2353 break;
2354 }
2355 case 16:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0xf800)>>11] |
2367 lookup_g[(*p & 0x07e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 24:
2375 {
2376 unsigned char *p1, *pf, *p, *pl;
2377 p1 = (unsigned char *) srcImage->data;
2378 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width * 3;
2383 for (; p < pl; p += 3)
2384 {
2385 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2386 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2387 p[2] = lookup_r[(p[2] & 0x0000ff)];
2388 }
2389 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 32:
2394 {
2395 RUINT32T *p1, *pf, *p, *pl;
2396 p1 = (RUINT32T *) srcImage->data;
2397 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0xff0000)>>16] |
2406 lookup_g[(*p & 0x00ff00)>> 8] |
2407 lookup_b[(*p & 0x0000ff)] |
2408 (*p & ~0xffffff);
2409 }
2410 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 }
2415
2416 free (lookup);
2417}
2418#endif
2419
2420/*
2421 * Check our parents are still who we think they are.
2422 * Do transparency updates if required
2423 */
2424int
2425rxvt_term::check_our_parents ()
2426{
2427 int i, pchanged, aformat, have_pixmap, rootdepth;
2428 unsigned long nitems, bytes_after;
2429 Atom atype;
2430 unsigned char *prop = NULL;
2431 Window root, oldp, *list;
2432 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2435
2436 pchanged = 0;
2437
2438 if (!OPTION (Opt_transparent))
2439 return pchanged; /* Don't try any more */
2440
2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth;
2443
2444 XGetWindowAttributes (disp, parent[0], &wattr);
2445
2446 if (rootdepth != wattr.depth)
2447 {
2448 if (am_transparent)
2449 {
2450 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0;
2453 }
2454
2455 return pchanged; /* Don't try any more */
2456 }
2457
2458 /* Get all X ops out of the queue so that our information is up-to-date. */
2459 XSync (disp, False);
2460
2461 /*
2462 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame
2464 * windows for each client, so we have to take care about that.
2465 */
2466 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success);
2476
2477 if (!i || prop == NULL
2478#if TINTING
2479 || !rs[Rs_color + Color_tint]
2480#endif
2481 )
2482 have_pixmap = 0;
2483 else
2484 {
2485 have_pixmap = 1;
2486 rootpixmap = *(Pixmap *)prop;
2487 XFree (prop);
2488 }
2489
2490 if (have_pixmap)
2491 {
2492 /*
2493 * Copy display->root pixmap transparency
2494 */
2495 int sx, sy, nx, ny;
2496 unsigned int nw, nh;
2497 Window cr;
2498 XImage *image;
2499 GC gc;
2500 XGCValues gcvalue;
2501
2502 XTranslateCoordinates (disp, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height;
2506 nx = ny = 0;
2507
2508 if (sx < 0)
2509 {
2510 nw += sx;
2511 nx = -sx;
2512 sx = 0;
2513 }
2514
2515 if (sy < 0)
2516 {
2517 nh += sy;
2518 ny = -sy;
2519 sy = 0;
2520 }
2521
2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
2526 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */
2531 allowedxerror = 0;
2532
2533 if (image == NULL)
2534 {
2535 if (am_transparent && am_pixmap_trans)
2536 {
2537 pchanged = 1;
2538 if (pixmap != None)
2539 {
2540 XFreePixmap (disp, pixmap);
2541 pixmap = None;
2542 }
2543 }
2544
2545 am_pixmap_trans = 0;
2546 }
2547 else
2548 {
2549 if (pixmap != None)
2550 XFreePixmap (disp, pixmap);
2551
2552#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint))
2554 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2559
2560 ShadeXImage (display, image, shade, rm, gm, bm);
2561 }
2562#endif
2563
2564 pixmap = XCreatePixmap (disp, vt,
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc);
2570 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]);
2573
2574 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1;
2576
2577 am_transparent = am_pixmap_trans = 1;
2578 }
2579 }
2580
2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2584 {
2585 unsigned int n;
2586 /*
2587 * InheritPixmap transparency
2588 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 {
2591 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root,
2593 &parent[i], &list, &n);
2594 XFree (list);
2595
2596 if (parent[i] == display->root)
2597 {
2598 if (oldp != None)
2599 pchanged = 1;
2600
2601 break;
2602 }
2603
2604 if (oldp != parent[i])
2605 pchanged = 1;
2606 }
2607
2608 n = 0;
2609
2610 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++)
2613 {
2614 XGetWindowAttributes (disp, parent[n], &wattr);
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break;
2619 }
2620 }
2621 }
2622
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2624 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */
2629 }
2630 else
2631 {
2632#if WAIT_FOR_WM
2633 /* wait (an arbitrary period) for the WM to do its thing
2634 * needed for fvwm2.2.2 (and before?) */
2635 sleep (1);
2636#endif
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2232
2669/*}}} */ 2233/*}}} */
2670 2234
2671bool 2235bool
2672rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
2673{ 2237{
2674 bool flag = false; 2238 bool flag = false;
2675 unicode_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2677 2241
2678 for (;;) 2242 for (;;)
2679 { 2243 {
2680 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2681 { 2245 {
2682 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2247 ch = next_char ();
2684 }
2685 2248
2686 if (ch == NOCHAR) // TODO: improve 2249 if (ch == NOCHAR)
2687 break; 2250 break;
2251 }
2688 2252
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2254 {
2691 if (!seen_input) 2255 if (!seen_input)
2692 { 2256 {
… …
2701 if (seen_resize && cmd_pid) 2265 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2266 kill (-cmd_pid, SIGWINCH);
2703 } 2267 }
2704 2268
2705 /* Read a text string from the input buffer */ 2269 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2270 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2271 bool refreshnow = false;
2708 int nlines = 0; 2272 int nlines = 0;
2709 unicode_t *str = buf; 2273 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2275
2712 for (;;) 2276 for (;;)
2713 { 2277 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2279 break;
… …
2721 if (ch == C0_LF) 2285 if (ch == C0_LF)
2722 nlines++; 2286 nlines++;
2723 2287
2724 refresh_count++; 2288 refresh_count++;
2725 2289
2726 if (!OPTION (Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2291 {
2729 refreshnow = true;
2730 refresh_count = 0; 2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2731 ch = NOCHAR; 2297 ch = NOCHAR;
2732 break; 2298 break;
2299 }
2733 } 2300 }
2734 2301
2735 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2737 { 2304 {
2305 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2306 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2307 scr_add_lines (buf, str - buf, nlines);
2308
2739 nlines = 0; 2309 nlines = 0;
2740 str = buf; 2310 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2311 eol = str + min (ncol, UBUFSIZ);
2742 } 2312 }
2743 2313
… …
2756 2326
2757 seq_begin = cmdbuf_ptr; 2327 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2328 ch = next_char ();
2759 } 2329 }
2760 2330
2331 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2333 scr_add_lines (buf, str - buf, nlines);
2762 2334
2763 /* 2335 /*
2764 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2767 * is incremented here because we must be doing flat-out scrolling.
2768 */ 2339 */
2769 if (refreshnow) 2340 if (refreshnow)
2770 { 2341 {
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++;
2773 else
2774 {
2775 flag = true; 2342 flag = true;
2776 scr_refresh (refresh_type); 2343 scr_refresh ();
2777 flush_ev.stop (); 2344 want_refresh = 1;
2778 }
2779 } 2345 }
2780 2346
2781 } 2347 }
2782 else 2348 else
2783 { 2349 {
… …
2797 } 2363 }
2798 2364
2799 return flag; 2365 return flag;
2800} 2366}
2801 2367
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2368// read the next character
2812unicode_t 2369wchar_t
2813rxvt_term::next_char () 2370rxvt_term::next_char () NOTHROW
2814{ 2371{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2372 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2373 {
2817 // assume 7-bit to be ascii ALWAYS 2374 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2376 return *cmdbuf_ptr++;
2820 2377
2821 wchar_t wc; 2378 wchar_t wc;
2822 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2823 2380
2824 if (len == (size_t)-2) 2381 if (len == (size_t)-2)
2825 { 2382 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2383 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2384 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2385 break;
2829 } 2386 }
2830 2387
2831 if (len == (size_t)-1) 2388 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2390
2834 // assume wchar == unicode 2391 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2837 } 2394 }
2838 2395
2839 return NOCHAR; 2396 return NOCHAR;
2840} 2397}
2398
2399// read the next octet
2400uint32_t
2401rxvt_term::next_octet () NOTHROW
2402{
2403 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR;
2406}
2407
2408static class out_of_input out_of_input;
2841 2409
2842/* rxvt_cmd_getc () - Return next input character */ 2410/* rxvt_cmd_getc () - Return next input character */
2843/* 2411/*
2844 * Return the next input character after first passing any keyboard input 2412 * Return the next input character after first passing any keyboard input
2845 * to the command. 2413 * to the command.
2846 */ 2414 */
2847unicode_t 2415wchar_t
2848rxvt_term::cmd_getc () 2416rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 2417{
2850 unicode_t c = next_char (); 2418 wchar_t c = next_char ();
2851 2419
2852 if (c == NOCHAR) 2420 if (c == NOCHAR)
2853 throw out_of_input; 2421 throw out_of_input;
2854 2422
2855 return c; 2423 return c;
2856} 2424}
2857 2425
2858unicode_t 2426uint32_t
2859rxvt_term::cmd_get8 () 2427rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 2428{
2861 unicode_t c = next_octet (); 2429 uint32_t c = next_octet ();
2862 2430
2863 if (c == NOCHAR) 2431 if (c == NOCHAR)
2864 throw out_of_input; 2432 throw out_of_input;
2865 2433
2866 return c; 2434 return c;
… …
2930 { 2498 {
2931 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2932 break; /* done = 1 */ 2500 break; /* done = 1 */
2933 } 2501 }
2934 } 2502 }
2935 2503
2936 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2937 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2938 { 2506 {
2939 done = 1; 2507 done = 1;
2940 break; 2508 break;
… …
2966 case C0_ESC: 2534 case C0_ESC:
2967 process_escape_seq (); 2535 process_escape_seq ();
2968 break; 2536 break;
2969 case C0_ENQ: /* terminal Status */ 2537 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 2538 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2539 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 2540 else
2974 tt_write ((unsigned char *)VT100_ANS, 2541 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 2542 break;
2977 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2978 scr_bell (); 2544 scr_bell ();
2979 break; 2545 break;
2980 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
3004 process_dcs_seq (); 2570 process_dcs_seq ();
3005 break; 2571 break;
3006 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
3007 process_csi_seq (); 2573 process_csi_seq ();
3008 break; 2574 break;
3009 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
3010 process_osc_seq (); 2576 process_osc_seq ();
3011 break; 2577 break;
3012#endif 2578#endif
3013 } 2579 }
3014} 2580}
… …
3104 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
3105 break; 2671 break;
3106 case '+': 2672 case '+':
3107 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
3108 break; 2674 break;
3109#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3110 case '6': 2676 case '6':
3111 scr_backindex (); 2677 scr_backindex ();
3112 break; 2678 break;
3113#endif 2679#endif
3114 case '7': 2680 case '7':
3115 scr_cursor (SAVE); 2681 scr_cursor (SAVE);
3116 break; 2682 break;
3117 case '8': 2683 case '8':
3118 scr_cursor (RESTORE); 2684 scr_cursor (RESTORE);
3119 break; 2685 break;
3120#if ENABLE_FRILLS 2686#if !ENABLE_MINIMAL
3121 case '9': 2687 case '9':
3122 scr_forwardindex (); 2688 scr_forwardindex ();
3123 break; 2689 break;
3124#endif 2690#endif
3125 case '=': 2691 case '=':
… …
3135 break; 2701 break;
3136 2702
3137 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
3139 { 2705 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 2708 }
3143 break; 2709 break;
3144 2710
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 2734 process_dcs_seq ();
3169 break; 2735 break;
3170 2736
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
3176 2741
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 2744 process_csi_seq ();
… …
3243 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3244 unsigned int nargs, p; 2809 unsigned int nargs, p;
3245 int n, ndef; 2810 int n, ndef;
3246 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3247 2812
3248 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3249 arg[--nargs] = 0; 2814 nargs = 0;
3250 2815
3251 priv = 0; 2816 priv = 0;
3252 ch = cmd_getc (); 2817 ch = cmd_getc ();
3253 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3254 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3288 ndef = get_byte_array_bit (csi_defaults, i); 2853 ndef = get_byte_array_bit (csi_defaults, i);
3289 for (p = 0; p < nargs; p++) 2854 for (p = 0; p < nargs; p++)
3290 if (arg[p] == -1) 2855 if (arg[p] == -1)
3291 arg[p] = ndef; 2856 arg[p] = ndef;
3292 2857
3293#ifdef DEBUG_CMD
3294 fprintf (stderr, "CSI ");
3295 for (p = 0; p < nargs; p++)
3296 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3297 fprintf (stderr, "%c\n", ch);
3298#endif
3299
3300 /* 2858 /*
3301 * private mode handling 2859 * private mode handling
3302 */ 2860 */
3303 if (priv) 2861 if (priv)
3304 { 2862 {
3305 switch (priv) 2863 switch (priv)
3306 { 2864 {
3307 case '>': 2865 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2867 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2873 // that we do not support xterm mouse reporting (should be 95 when we do).
2874 //
2875 tt_printf ("\033[>%d;94;0c", 'U');
2876 }
3310 break; 2877 break;
3311 case '?': 2878 case '?':
3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3313 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
3314 break; 2881 break;
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 2992 break;
3426 2993
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 2995 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 2996 break;
3431 2997
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 2999 process_sgr_mode (nargs, arg);
3434 break; 3000 break;
… …
3441 break; 3007 break;
3442 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3443 scr_report_position (); 3009 scr_report_position ();
3444 break; 3010 break;
3445 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 3012 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 3014 break;
3449 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 3017 break;
… …
3518 break; 3084 break;
3519 case CSI_75: 3085 case CSI_75:
3520 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
3521 break; 3087 break;
3522 3088
3523#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3524 case CSI_74: 3090 case CSI_74:
3525 process_window_ops (arg, nargs); 3091 process_window_ops (arg, nargs);
3526 break; 3092 break;
3527#endif 3093#endif
3528 3094
… …
3535 break; 3101 break;
3536 } 3102 }
3537} 3103}
3538/*}}} */ 3104/*}}} */
3539 3105
3540#if ENABLE_FRILLS 3106#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3107/* ARGSUSED */
3542void 3108void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3109rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3110{
3545 int x, y; 3111 int x, y;
3546 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3547 Window wdummy; 3113 Window wdummy;
3548 dDisp; 3114
3115 dLocal (Display *, dpy);
3549 3116
3550 if (nargs == 0) 3117 if (nargs == 0)
3551 return; 3118 return;
3552 3119
3553 switch (args[0]) 3120 switch (args[0])
3554 { 3121 {
3555 /* 3122 /*
3556 * commands 3123 * commands
3557 */ 3124 */
3558 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3126 XMapWindow (dpy, parent[0]);
3560 break; 3127 break;
3561 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3129 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3130 break;
3564 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3133 break;
3567 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3136 break;
3570 case 5: /* raise window */ 3137 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3572 break; 3139 break;
3573 case 6: /* lower window */ 3140 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3575 break; 3142 break;
3576 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3577 scr_touch (true); 3144 scr_touch (true);
3578 break; 3145 break;
3579 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3153 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3154 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3155 (unsigned int) (args[1] * fheight));
3589 break; 3156 break;
3590 3157
3591
3592 /* 3158 /*
3593 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3594 */ 3160 */
3595 case 11: /* report window state */ 3161 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3164 break;
3599 case 13: /* report window position */ 3165 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3171 break;
3606 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3175 break;
3610 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3178 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3181 break;
3616 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3617 { 3183 {
3618 char *s; 3184 char *s;
3619 XGetIconName (disp, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3187 XFree (s);
3622 } 3188 }
3623 break; 3189 break;
3624 case 21: /* report window title */ 3190 case 21: /* report window title */
3625 { 3191 {
3626 char *s; 3192 char *s;
3627 XFetchName (disp, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3195 XFree (s);
3630 } 3196 }
3631 break; 3197 break;
3632 } 3198 }
3633} 3199}
… …
3636/*----------------------------------------------------------------------*/ 3202/*----------------------------------------------------------------------*/
3637/* 3203/*
3638 * get input up until STRING TERMINATOR (or BEL) 3204 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3205 * ends_how is terminator used. returned input must be free()'d
3640 */ 3206 */
3641unsigned char * 3207char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3208rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3209{
3644 unicode_t ch; 3210 unicode_t ch;
3645 bool seen_esc = false; 3211 bool seen_esc = false;
3646 unsigned int n = 0; 3212 unsigned int n = 0;
… …
3660 seen_esc = true; 3226 seen_esc = true;
3661 continue; 3227 continue;
3662 } 3228 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3233 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3667 3235
3668 seen_esc = false; 3236 seen_esc = false;
3669 3237
3670 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3239 // stop at some sane length
3672 return NULL; 3240 return NULL;
3673 3241
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3242 string[n++] = ch;
3678 } 3243 }
3679 3244
3680 string[n++] = '\0'; 3245 string[n++] = '\0';
3681 3246
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3248
3684 return (unsigned char *)rxvt_wcstombs (string); 3249 return rxvt_wcstombs (string);
3685} 3250}
3686 3251
3687/*----------------------------------------------------------------------*/ 3252/*----------------------------------------------------------------------*/
3688/* 3253/*
3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3690 */ 3255 */
3691void 3256void
3692rxvt_term::process_dcs_seq () 3257rxvt_term::process_dcs_seq ()
3693{ 3258{
3694 unsigned char *s; 3259 char *s;
3695 unicode_t eh; 3260 unicode_t eh;
3696 3261
3697 /* 3262 /*
3698 * Not handled yet 3263 * Not handled yet
3699 */ 3264 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3283 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3284 arg = arg * 10 + (ch - '0');
3720 3285
3721 if (ch == ';') 3286 if (ch == ';')
3722 { 3287 {
3723 unsigned char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3724 3289
3725 if (s) 3290 if (s)
3726 { 3291 {
3727 process_xterm_seq (arg, (char *)s, eh); 3292 process_xterm_seq (arg, s, eh);
3728 free (s); 3293 free (s);
3729 } 3294 }
3730 } 3295 }
3731} 3296}
3732 3297
3733void 3298void
3734rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3299rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3300{
3736 if (str[0] == '?' && !str[1]) 3301 if (str[0] == '?' && !str[1])
3737 { 3302 {
3738 unsigned short r, g, b; 3303 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3304 pix_colors_focused[color].get (c);
3305
3306#if XFT
3307 if (c.a != rgba::MAX_CC)
3308 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3309 else
3310#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3311 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3312 }
3742 else 3313 else
3743 set_window_color (color, str); 3314 set_window_color (color, str);
3744} 3315}
3745 3316
3746/* 3317/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3319 */
3749void 3320void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3321rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3322{
3752 int changed = 0;
3753 int color; 3323 int color;
3754 char *buf, *name; 3324 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3326 int saveop = op;
3757 dDisp; 3327
3328 dLocal (Display *, dpy);
3758 3329
3759 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3760 switch (op) 3335 switch (op)
3761 { 3336 {
3762 case XTerm_name: 3337 case XTerm_name:
3763 set_title (str); 3338 set_title (str);
3764 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3778 unsigned long bytes_after; 3353 unsigned long bytes_after;
3779 unsigned char *value = 0; 3354 unsigned char *value = 0;
3780 const char *str = ""; 3355 const char *str = "";
3781 3356
3782 if (prop 3357 if (prop
3783 && XGetWindowProperty (disp, parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3784 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3785 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3786 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3787 && actual_type != None 3362 && actual_type != None
3788 && actual_format == 8) 3363 && actual_format == 8)
3789 str = (const char *)(value); 3364 str = (const char *)(value);
3790 3365
3791 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3366 tt_printf ("\033]%d;%s%c", op, str, resp);
3792 3367
3793 XFree (value); 3368 XFree (value);
3794 } 3369 }
3795 else 3370 else
3796 { 3371 {
… …
3800 { 3375 {
3801 *eq = 0; 3376 *eq = 0;
3802 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3803 } 3378 }
3804 else 3379 else
3805 XDeleteProperty (disp, parent[0], 3380 XDeleteProperty (dpy, parent[0],
3806 display->atom (str)); 3381 display->atom (str));
3807 } 3382 }
3808 break; 3383 break;
3809 3384
3810 case XTerm_Color: 3385 case XTerm_Color:
… …
3812 { 3387 {
3813 if ((name = strchr (buf, ';')) == NULL) 3388 if ((name = strchr (buf, ';')) == NULL)
3814 break; 3389 break;
3815 3390
3816 *name++ = '\0'; 3391 *name++ = '\0';
3817 color = atoi (buf); 3392 color = atoi (buf) + minCOLOR;
3818 3393
3819 if (color < 0 || color >= TOTAL_COLORS) 3394 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 3395 break;
3821 3396
3822 if ((buf = strchr (name, ';')) != NULL) 3397 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 3398 *buf++ = '\0';
3824 3399
3825 if (name[0] == '?' && !name[1]) 3400 process_color_seq (op, color, name, resp);
3826 {
3827 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3829 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3830 }
3831 else
3832 set_window_color (color + minCOLOR, name);
3833 } 3401 }
3834 break; 3402 break;
3835 case XTerm_Color00: 3403 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3404 process_color_seq (op, Color_fg, str, resp);
3837 break; 3405 break;
3838 case XTerm_Color01: 3406 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3840 break; 3408 break;
3841#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3411 process_color_seq (op, Color_cursor, str, resp);
3844 break; 3412 break;
3845#endif 3413#endif
3846 case XTerm_Color_pointer_fg: 3414 case XTerm_Color_pointer_fg:
3847 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3848 break; 3416 break;
3849 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3851 break; 3419 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 3420#ifndef NO_BOLD_UNDERLINE_REVERSE
3853 case XTerm_Color_BD:
3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3855 break;
3856 case XTerm_Color_UL:
3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3858 break;
3859 case XTerm_Color_RV: 3421 case XTerm_Color_RV:
3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp);
3427 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp);
3861 break; 3431 break;
3862 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3864 break; 3434 break;
3865#endif 3435#endif
3866#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3867 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3868 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3439
3869 check_our_parents (); 3440 check_our_parents ();
3441
3870 if (am_transparent) 3442 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3872 break;
3873#endif
3874 3444
3875 case XTerm_Pixmap: 3445 break;
3876 if (*str != ';') 3446#endif
3877 { 3447
3878#if XPM_BACKGROUND 3448#if XPM_BACKGROUND
3449 case Rxvt_Pixmap:
3450 {
3451 if (*str != ';')
3452 {
3879 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 3455 scr_touch (true);
3883 } 3456 }
3457
3458 int changed = 0;
3459
3884 while ((str = strchr (str, ';')) != NULL) 3460 while ((str = strchr (str, ';')) != NULL)
3885 { 3461 {
3886 str++; 3462 str++;
3887#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 3463 changed += scale_pixmap (str);
3889#endif
3890 } 3464 }
3891 3465
3892 if (changed) 3466 if (changed)
3893 { 3467 {
3894#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 3468 resize_pixmap ();
3896#endif
3897 scr_touch (true); 3469 scr_touch (true);
3898 } 3470 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 }
3899 break; 3476 break;
3477#endif
3900 3478
3901 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3903 break; 3481 break;
3904 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3906 break; 3484 break;
3907 3485
3908 case XTerm_logfile: 3486 case XTerm_logfile:
3909 // TODO, when secure mode? 3487 // TODO, when secure mode?
3910 break; 3488 break;
3911 3489
3912#ifdef MENUBAR
3913 case URxvt_Menu:
3914 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break;
3917#endif
3918#if 0 3490#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3920 { 3492 {
3921 int fd; 3493 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 { 3495 {
3924 scr_dump (fd); 3496 scr_dump (fd);
… …
3935 case URxvt_italicFont: 3507 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3937#endif 3509#endif
3938 if (query) 3510 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3514 resp);
3943 else 3515 else
3944 { 3516 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3949 set_fonts (); 3521 set_fonts ();
3950 } 3522 }
3951 break; 3523 break;
3952 3524
3953#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3534 case URxvt_locale:
3955 if (query) 3535 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3537 else
3958 { 3538 {
3959 set_locale (str); 3539 set_locale (str);
3960 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3541 init_xlocale ();
3962 } 3542 }
3963 break; 3543 break;
3964 3544
3965 case URxvt_view_up: 3545 case URxvt_view_up:
… …
3976 break; 3556 break;
3977#endif 3557#endif
3978 3558
3979#if ENABLE_PERL 3559#if ENABLE_PERL
3980 case URxvt_perl: 3560 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 3562 ; // no responses yet
3983 break; 3563 break;
3984#endif 3564#endif
3985 } 3565 }
3986} 3566}
… …
4018 return state; 3598 return state;
4019} 3599}
4020 3600
4021/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4022void 3602void
4023rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4024{ 3604{
4025 unsigned int i, j; 3605 unsigned int i, j;
4026 int state; 3606 int state;
4027 3607
4028 static const struct 3608 static const struct
… …
4039 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo },
4040 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin },
4041 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap },
4042 // 8, bi-directional support mode 3622 // 8, bi-directional support mode
4043 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
4044#ifdef menuBar_esc
4045 { menuBar_esc, PrivMode_menuBar },
4046#endif
4047 // 18, 19 printing-related 3624 // 18, 19 printing-related
4048 { 25, PrivMode_VisibleCursor }, 3625 { 25, PrivMode_VisibleCursor },
4049#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
4050 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
4051#endif 3628#endif
… …
4098 /* extra handling for values with state unkept */ 3675 /* extra handling for values with state unkept */
4099 switch (arg[i]) 3676 switch (arg[i])
4100 { 3677 {
4101#if ENABLE_STYLES 3678#if ENABLE_STYLES
4102 case 1021: 3679 case 1021:
4103 if (mode) 3680 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 3681
4108 scr_touch (true); 3682 scr_touch (true);
4109 break; 3683 break;
4110#endif 3684#endif
4111 case 1048: /* alternative cursor save */ 3685 case 1048: /* alternative cursor save */
4112 case 1049: 3686 case 1049:
4113 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4114 if (mode == 0) 3688 if (mode == 0)
4115 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4116 else if (mode == 1) 3690 else if (mode == 1)
4117 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4118 break; 3692 break;
… …
4133 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 3709 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 3710 break;
4137 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
4138 if (!state) 3712 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 3713 break;
4143 case 5: /* reverse video */ 3714 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 3715 scr_rvideo_mode (state);
4145 break; 3716 break;
4146 case 6: /* relative/absolute origins */ 3717 case 6: /* relative/absolute origins */
… …
4152 /* case 8: - auto repeat, can't do on a per window basis */ 3723 /* case 8: - auto repeat, can't do on a per window basis */
4153 case 9: /* X10 mouse reporting */ 3724 case 9: /* X10 mouse reporting */
4154 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
4155 priv_modes &= ~PrivMode_MouseX11; 3726 priv_modes &= ~PrivMode_MouseX11;
4156 break; 3727 break;
4157#ifdef menuBar_esc
4158 case menuBar_esc:
4159#ifdef MENUBAR
4160 map_menuBar (state);
4161#endif
4162 break;
4163#endif
4164#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
4165 case scrollBar_esc: 3729 case scrollBar_esc:
4166 if (scrollbar_mapping (state)) 3730 if (scrollbar_mapping (state))
4167 { 3731 {
4168 resize_all_windows (0, 0, 0); 3732 resize_all_windows (0, 0, 0);
… …
4187#if 0 3751#if 0
4188 case 1001: 3752 case 1001:
4189 break; /* X11 mouse highlighting */ 3753 break; /* X11 mouse highlighting */
4190#endif 3754#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 3756 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 3757 break;
4197 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4198 if (state) 3759 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 3760 break;
4203 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 3764 scr_erase_screen (2);
4207 scr_change_screen (state); 3765 scr_change_screen (state);
4208 break; 3766 break;
4209 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
4210 scr_change_screen (state); 3768 scr_change_screen (state);
4211 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4212 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4213 scr_erase_screen (2); 3771 scr_erase_screen (2);
4214 break; 3772 break;
4215 default: 3773 default:
4216 break; 3774 break;
… …
4344 scr_color (Color_bg, Color_bg); 3902 scr_color (Color_bg, Color_bg);
4345 break; 3903 break;
4346 3904
4347 //case 50: // not variable spacing 3905 //case 50: // not variable spacing
4348 3906
4349#ifndef NO_BRIGHTCOLOR 3907#if !ENABLE_MINIMAL
4350 case 90: 3908 case 90:
4351 case 91: /* set bright fg color */ 3909 case 91: /* set bright fg color */
4352 case 92: 3910 case 92:
4353 case 93: 3911 case 93:
4354 case 94: 3912 case 94:
… …
4399 */ 3957 */
4400void 3958void
4401rxvt_term::tt_printf (const char *fmt,...) 3959rxvt_term::tt_printf (const char *fmt,...)
4402{ 3960{
4403 va_list arg_ptr; 3961 va_list arg_ptr;
4404 unsigned char buf[256]; 3962 char buf[256];
4405 3963
4406 va_start (arg_ptr, fmt); 3964 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3965 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 3966 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 3967 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 3972 * or generated by us in response to a query ESC sequence.
4415 */ 3973 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 3975
4418void 3976void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 3978{
3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3980 return;
3981
3982 if (pty->pty < 0)
3983 return;
3984
4421 if (v_buflen == 0) 3985 if (v_buflen == 0)
4422 { 3986 {
4423 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4424 3988
4425 if ((unsigned int)written == len) 3989 if ((unsigned int)written == len)
4426 return; 3990 return;
4427 3991
4428 data += written; 3992 data += written;
4429 len -= written; 3993 len -= written;
4430 } 3994 }
4431 3995
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3996 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 3997
4434 memcpy (v_buffer + v_buflen, data, len); 3998 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 3999 v_buflen += len;
4436 4000
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4438} 4002}
4439 4003
4440void rxvt_term::pty_write () 4004void rxvt_term::pty_write ()
4441{ 4005{
4442 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4006 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4443 4007
4444 if (written > 0) 4008 if (written > 0)
4445 { 4009 {
4446 v_buflen -= written; 4010 v_buflen -= written;
4447 4011

Diff Legend

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