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.245 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.345 by sasha, Mon Aug 13 22:41:34 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>
… …
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
… …
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 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 *
… …
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");
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 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
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
959void 1035void
960rxvt_term::flush () 1036rxvt_term::flush ()
961{ 1037{
962 flush_ev.stop (); 1038 flush_ev.stop ();
963 1039
964#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
965 if (want_full_refresh) 1041 if (want_full_refresh)
966 { 1042 {
967 want_full_refresh = 0; 1043 want_full_refresh = 0;
968 scr_clear (); 1044 scr_clear ();
969 scr_touch (false); 1045 scr_touch (false);
… …
972 1048
973 if (want_refresh) 1049 if (want_refresh)
974 { 1050 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1052 {
977 int row = -view_start; 1053 int row = view_start;
1054 int end_row = row + nrow;
978 1055
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1057 --row;
981 1058
982 while (row < -view_start + nrow) 1059 do
983 { 1060 {
984 int start_row = row; 1061 int start_row = row;
985 line_t *l; 1062 line_t *l;
986 1063
987 do 1064 do
988 { 1065 {
989 l = &ROW (row); 1066 l = &ROW (row++);
990 1067
991 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
992 { 1069 {
993 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1072 while (l->is_longer ())
996 { 1073 {
997 l = &ROW (++row); 1074 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
999 } 1076 }
1000 1077
1001 // and filter it 1078 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1080
1004 break; 1081 break;
1005 } 1082 }
1006 } 1083 }
1007 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1085 }
1086 while (row < end_row);
1011 1087 }
1012 }
1013 1088
1014 scr_refresh (refresh_type); 1089 scr_refresh ();
1015 scrollbar_show (1); 1090 scrollbar_show (1);
1016#ifdef USE_XIM 1091#ifdef USE_XIM
1017 IMSendSpot (); 1092 IMSendSpot ();
1018#endif 1093#endif
1019 } 1094 }
… …
1022} 1097}
1023 1098
1024void 1099void
1025rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1026{ 1101{
1027 SET_R (this); 1102 make_current ();
1028 SET_LOCALE (locale);
1029 1103
1030 display->flush (); 1104 display->flush ();
1031 1105
1032 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1033 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
1034} 1108}
1035 1109
1036void 1110void
1037rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1038{ 1112{
1039 SET_R (this); 1113 make_current ();
1040 SET_LOCALE (locale);
1041 1114
1042 refresh_limit = 1;
1043 refresh_count = 0; 1115 refresh_count = 0;
1044 flush (); 1116 flush ();
1045} 1117}
1046 1118
1047#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1122{
1051 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1124 want_refresh = 1;
1053 1125
1054 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1127}
1056#endif 1128#endif
1057 1129
1058#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1059void 1131void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1146{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1149 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1150 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1152 }
1082} 1153}
1083#endif 1154#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1159{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1161 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1163 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1165 }
1096} 1166}
1097#endif 1167#endif
… …
1102{ 1172{
1103 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1104 || 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)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1176 {
1107 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1110 1179
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1180 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1182 }
1115} 1183}
1116#endif 1184#endif
1117 1185
1118#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1119static struct event_handler 1187static struct event_handler
1120{ 1188{
1121 check_watcher cw_yield; 1189 check_watcher yield_ev;
1122 1190
1123 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1124 { 1192 {
1125 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
1126 w.stop (); 1201 w.stop ();
1127 } 1202 }
1128 1203
1129 event_handler () 1204 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1131 { 1206 {
1132 } 1207 }
1133} event_handler; 1208} event_handler;
1134#endif 1209#endif
1135 1210
… …
1146 1221
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1150 1225
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1227
1153 if (r > 0) 1228 if (r > 0)
1154 { 1229 {
1155 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1156 return true; 1231 return true;
1157 } 1232 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1234 {
1160#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1161 if (display->is_local) 1236 if (display->is_local)
1162 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1163#endif 1238#endif
1164 } 1239 }
1165 else 1240 else
1166 { 1241 {
1167 pty_ev.stop (); 1242 pty_ev.stop ();
1168 1243
1169 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1170 destroy (); 1245 destroy ();
1171 } 1246 }
1172 1247
1173 return false; 1248 return false;
1174} 1249}
1175 1250
1176void 1251void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1253{
1179 SET_R (this); 1254 make_current ();
1180 SET_LOCALE (locale);
1181 1255
1182 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1258 while (pty_fill ())
1185 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1190} 1264}
1191 1265
1192void 1266void
1193rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1194{ 1268{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1270 recolour_cursor ();
1197 1271
1198#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1273 hidden_pointer = 0;
1200 1274
1201 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1277#endif
1204} 1278}
1205 1279
1206#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1207void 1281void
1208rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1209{ 1283{
1210 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1211 return; 1285 return;
1212 1286
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1288 XFlush (dpy);
1215 1289
1216 hidden_pointer = 1; 1290 hidden_pointer = 1;
1217} 1291}
1218 1292
1219void 1293void
1220rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1221{ 1295{
1222 SET_R (this); 1296 make_current ();
1223 SET_LOCALE (locale);
1224 1297
1225 pointer_blank (); 1298 pointer_blank ();
1226} 1299}
1227#endif 1300#endif
1228 1301
… …
1293 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1294 (32 + x + 1), 1367 (32 + x + 1),
1295 (32 + y + 1)); 1368 (32 + y + 1));
1296} 1369}
1297 1370
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1371/*{{{ process an X event */
1309void 1372void
1310rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1311{ 1374{
1312 dDisp; 1375 make_current ();
1313 1376
1314 SET_R (this); 1377 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1378
1317#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1382 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1383
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1387 unsigned int unused_mask;
1347 1388
1348 switch (ev.type) 1389 switch (ev.type)
1349 { 1390 {
1350 case KeyPress: 1391 case KeyPress:
1351#if ISO_14755 1392 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1393 break;
1357 1394
1358 case KeyRelease: 1395 case KeyRelease:
1359 { 1396 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1397 break;
1431 }
1432 1398
1433 case ButtonPress: 1399 case ButtonPress:
1434 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1435 break; 1401 break;
1436 1402
… …
1438 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1439 break; 1405 break;
1440 1406
1441 case ClientMessage: 1407 case ClientMessage:
1442 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 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 {
1445 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)))
1446 destroy (); 1418 destroy ();
1419 }
1447#if ENABLE_EWMH 1420#if ENABLE_EWMH
1448 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])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &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 }
1452#endif 1436#endif
1453 } 1437 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break;
1490
1491 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1438 break;
1494 1439
1495 /* 1440 /*
1496 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1516 break; 1461 break;
1517 } 1462 }
1518 break; 1463 break;
1519 1464
1520 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1469 focus_in ();
1522 break; 1470 break;
1523 1471
1524 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1476 focus_out ();
1526 break; 1477 break;
1527 1478
1528 case ConfigureNotify: 1479 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1530 { 1481 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1483 ;
1533 1484
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1486 {
1536 seen_resize = 1; 1487 seen_resize = 1;
1537 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 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render ();
1494 scr_touch (true);
1495 }
1496#endif
1538 } 1497 }
1539 1498
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1541 if (OPTION (Opt_transparent)) 1502 if (option (Opt_transparent))
1542 check_our_parents (); 1503 bgPixmap.render ();
1543#endif 1504#endif
1544 } 1505 }
1545 break; 1506 break;
1546 1507
1547 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1513
1552 break; 1514 break;
1553 1515
1554 case SelectionClear: 1516 case SelectionClear:
1555 selection_clear (); 1517 selection_clear ();
… …
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1523 break;
1562 1524
1563 case SelectionRequest: 1525 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1527 break;
1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1535 break;
1566 1536
1567 case UnmapNotify: 1537 case UnmapNotify:
1568 mapped = 0; 1538 mapped = 0;
1569#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1571#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572 break; 1543 break;
1573 1544
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break;
1580
1581#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1582 case ReparentNotify: 1546 case ReparentNotify:
1583 rootwin_cb (ev); 1547 rootwin_cb (ev);
1584 break; 1548 break;
1585#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1586 1550
1587 case GraphicsExpose: 1551 case GraphicsExpose:
1588 case Expose: 1552 case Expose:
1589 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1590 { 1554 {
1591 do 1555 do
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595 1559
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1561
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1601 1565
1602 scr_refresh (refresh_type); 1566 want_refresh = 1;
1603 } 1567 }
1604 else 1568 else
1605 { 1569 {
1606 XEvent unused_event; 1570 XEvent unused_event;
1607 1571
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609 ; 1573 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1575 ;
1612 1576
1613 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1614 { 1578 {
1615 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1616 scrollbar_show (0); 1580 scrollbar_show (0);
1617 } 1581 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622
1623#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window);
1626#endif
1627 } 1582 }
1628 break; 1583 break;
1629 1584
1630 case MotionNotify: 1585 case MotionNotify:
1631#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1587 if (hidden_pointer)
1633 pointer_unblank (); 1588 pointer_unblank ();
1634#endif 1589#endif
1635#if MENUBAR
1636 if (isMenuBarWindow (ev.xany.window))
1637 {
1638 menubar_control (ev.xbutton);
1639 break;
1640 }
1641#endif
1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1591 break;
1644 1592
1645 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1646 { 1594 {
1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1597 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1599 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652 ; 1601 ;
1653 1602
1654 XQueryPointer (disp, vt, 1603 XQueryPointer (dpy, vt,
1655 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1607 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1723#endif 1672#endif
1724 } 1673 }
1725 } 1674 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727 { 1676 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1730 ; 1679 ;
1731 1680
1732 XQueryPointer (disp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1733 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1685 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1687 scrollbar_size ());
1739 scr_refresh (refresh_type);
1740 refresh_limit = 0; 1688 want_refresh = 1;
1741 scrollbar_show (1); 1689 scrollbar_show (1);
1742 } 1690 }
1743 break; 1691 break;
1744 } 1692 }
1693
1694#if defined(CURSOR_BLINK)
1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1696 {
1697 if (hidden_cursor)
1698 {
1699 hidden_cursor = 0;
1700 want_refresh = 1;
1701 }
1702
1703 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1704 }
1705#endif
1706
1707#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1709 {
1710 if (ev.type == MotionNotify
1711 || ev.type == ButtonPress
1712 || ev.type == ButtonRelease)
1713 if (hidden_pointer)
1714 pointer_unblank ();
1715
1716 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank ();
1718 }
1719#endif
1745} 1720}
1746 1721
1747void 1722void
1748rxvt_term::focus_in () 1723rxvt_term::focus_in ()
1749{ 1724{
1750 if (!focus) 1725 if (!focus)
1751 { 1726 {
1752 focus = 1; 1727 focus = 1;
1753 want_refresh = 1; 1728 want_refresh = 1;
1754 1729
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 1731
1757#if USE_XIM 1732#if USE_XIM
1758 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1759 { 1734 {
1760 IMSetStatusPosition (); 1735 IMSetPosition ();
1761 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1762 } 1737 }
1763#endif 1738#endif
1764#if CURSOR_BLINK 1739#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1741 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767#endif 1742#endif
1768#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1770 { 1745 {
1771 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1772 scr_recolour (); 1747 scr_recolour ();
1773 } 1748 }
1774#endif 1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 XWMHints *h;
1754
1755 h = XGetWMHints(dpy, parent[0]);
1756 if (h != NULL)
1757 {
1758 h->flags &= ~XUrgencyHint;
1759 XSetWMHints(dpy, parent[0], h);
1760 }
1761 }
1762#endif
1775 } 1763 }
1776} 1764}
1777 1765
1778void 1766void
1779rxvt_term::focus_out () 1767rxvt_term::focus_out ()
… …
1787 1775
1788#if ENABLE_FRILLS || ISO_14755 1776#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf) 1777 if (iso14755buf)
1790 { 1778 {
1791 iso14755buf = 0; 1779 iso14755buf = 0;
1792# if ENABLE_OVERLAY 1780# if ISO_14755
1793 scr_overlay_off (); 1781 scr_overlay_off ();
1794# endif 1782# endif
1795 } 1783 }
1796#endif 1784#endif
1797#if USE_XIM 1785#if USE_XIM
1798 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context); 1787 XUnsetICFocus (Input_Context);
1800#endif 1788#endif
1801#if CURSOR_BLINK 1789#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink)) 1790 if (option (Opt_cursorBlink))
1803 cursor_blink_ev.stop (); 1791 cursor_blink_ev.stop ();
1804 hidden_cursor = 0; 1792 hidden_cursor = 0;
1805#endif 1793#endif
1806#if OFF_FOCUS_FADING 1794#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1795 if (rs[Rs_fade])
… …
1811 } 1799 }
1812#endif 1800#endif
1813 } 1801 }
1814} 1802}
1815 1803
1816#if TRANSPARENT 1804void
1805rxvt_term::update_fade_color (unsigned int idx)
1806{
1807#if OFF_FOCUS_FADING
1808 if (rs[Rs_fade])
1809 {
1810 rgba c;
1811 pix_colors [Color_fade].get (c);
1812 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1813 }
1814#endif
1815}
1816
1817#if ENABLE_TRANSPARENCY || ENABLE_PERL
1817void 1818void
1818rxvt_term::rootwin_cb (XEvent &ev) 1819rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1820{
1820 SET_R (this); 1821 make_current ();
1821 SET_LOCALE (locale);
1822 1822
1823 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825 return;
1826
1827# if ENABLE_TRANSPARENCY
1823 switch (ev.type) 1828 switch (ev.type)
1824 { 1829 {
1825 case PropertyNotify: 1830 case PropertyNotify:
1826 /* 1831 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1832 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1833 * use the property to determine the pixmap. We use it later on.
1829 */ 1834 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1837 {
1833 1838 bgPixmap.set_root_pixmap ();
1834 /* FALLTHROUGH */ 1839 bgPixmap.render ();
1835 case ReparentNotify: 1840 }
1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1841 break;
1839 } 1842 }
1843# endif
1840} 1844}
1841#endif 1845#endif
1842 1846
1843void 1847void
1844rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
… …
1853 /* 1857 /*
1854 * VT window processing of button press 1858 * VT window processing of button press
1855 */ 1859 */
1856 if (ev.window == vt) 1860 if (ev.window == vt)
1857 { 1861 {
1862 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1863 return;
1864
1858#if ISO_14755 1865#if ISO_14755
1859 // 5.4 1866 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1868 {
1862 iso14755_54 (ev.x, ev.y); 1869 iso14755_54 (ev.x, ev.y);
… …
1904 else 1911 else
1905 { 1912 {
1906 if (ev.button != MEvent.button) 1913 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1914 MEvent.clicks = 0;
1908 1915
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1916 switch (ev.button)
1911 { 1917 {
1912 case Button1: 1918 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1919 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1920 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1921#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1922 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1923#else
1918 selection.rect = false; 1924 selection.rect = false;
1919#endif 1925#endif
1920 1926
1921 /* allow shift+left click to extend selection */ 1927 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1928 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1929 {
1924 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1926 else 1932 else
1927 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1928 } 1934 }
1929 else 1935 else
1930 { 1936 {
1931 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1938 MEvent.clicks++;
1933 else 1939 else
1934 MEvent.clicks = 1; 1940 MEvent.clicks = 1;
1935 1941
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1942 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1943 }
1938 1944
1939 MEvent.button = Button1; 1945 MEvent.button = Button1;
1940 break; 1946 break;
1941 1947
1942 case Button3: 1948 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1949 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1950 selection_rotate (ev.x, ev.y);
1945 else 1951 else
1946 selection_extend (ev.x, ev.y, 1); 1952 selection_extend (ev.x, ev.y, 1);
1947 1953
1948 MEvent.button = Button3; 1954 MEvent.button = Button3;
1949 break; 1955 break;
1950 } 1956 }
1951 } 1957 }
1952 1958
1953 MEvent.time = ev.time; 1959 MEvent.time = ev.time;
1954 return; 1960 return;
1955 } 1961 }
1956 1962
… …
2095 } 2101 }
2096 } 2102 }
2097 2103
2098 return; 2104 return;
2099 } 2105 }
2100
2101#if MENUBAR
2102 /*
2103 * Menubar window processing of button press
2104 */
2105 if (isMenuBarWindow (ev.window))
2106 menubar_control (ev);
2107#endif
2108} 2106}
2109 2107
2110void 2108void
2111rxvt_term::button_release (XButtonEvent &ev) 2109rxvt_term::button_release (XButtonEvent &ev)
2112{ 2110{
… …
2118 2116
2119 if (scrollbar_isUpDn ()) 2117 if (scrollbar_isUpDn ())
2120 { 2118 {
2121 scrollBar.setIdle (); 2119 scrollBar.setIdle ();
2122 scrollbar_show (0); 2120 scrollbar_show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2121 }
2127 2122
2128#ifdef SELECTION_SCROLLING 2123#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active) 2124 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2125 sel_scroll_ev.stop();
2131#endif 2126#endif
2132 2127
2133 if (ev.window == vt) 2128 if (ev.window == vt)
2134 { 2129 {
2130 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2131 return;
2132
2135#if ISO_14755 2133#if ISO_14755
2136 // 5.4 2134 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2135 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2136 return;
2139#endif 2137#endif
2138
2140 if (reportmode) 2139 if (reportmode)
2141 { 2140 {
2142 /* mouse report from vt window */ 2141 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2142 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2143 if (ev.button >= 4)
… …
2168 if (priv_modes & PrivMode_mouse_report 2167 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2168 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2169 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2170 selection_extend (ev.x, ev.y, 0);
2172 2171
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2172 switch (ev.button)
2177 { 2173 {
2178 case Button1: 2174 case Button1:
2179 case Button3: 2175 case Button3:
2180 selection_make (ev.time); 2176 selection_make (ev.time);
2181 break; 2177 break;
2178
2182 case Button2: 2179 case Button2:
2183 selection_request (ev.time, ev.x, ev.y); 2180 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2181 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2184 break; 2182 break;
2183
2185#ifdef MOUSE_WHEEL 2184#ifdef MOUSE_WHEEL
2186 case Button4: 2185 case Button4:
2187 case Button5: 2186 case Button5:
2188 { 2187 {
2189 int i; 2188 int i;
… …
2191 2190
2192 v = ev.button == Button4 ? UP : DN; 2191 v = ev.button == Button4 ? UP : DN;
2193 2192
2194 if (ev.state & ShiftMask) 2193 if (ev.state & ShiftMask)
2195 i = 1; 2194 i = 1;
2196 else if (OPTION (Opt_mouseWheelScrollPage)) 2195 else if (option (Opt_mouseWheelScrollPage))
2197 i = nrow - 1; 2196 i = nrow - 1;
2198 else 2197 else
2199 i = 5; 2198 i = 5;
2200 2199
2201# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
… …
2211 slip_wheel_ev.start (); 2210 slip_wheel_ev.start ();
2212 } 2211 }
2213 else 2212 else
2214 { 2213 {
2215# endif 2214# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2215 scr_page (v, i);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2216 scrollbar_show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING 2217# ifdef MOUSE_SLIP_WHEELING
2229 } 2218 }
2230#endif 2219# endif
2231 } 2220 }
2232 break; 2221 break;
2233#endif 2222#endif
2234 } 2223 }
2235 } 2224 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2225}
2241
2242#ifdef TRANSPARENT
2243#if TINTING
2244/* taken from aterm-0.4.2 */
2245
2246typedef uint32_t RUINT32T;
2247
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{
2250 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i;
2256
2257 Visual *visual = display->visual;
2258
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260
2261 /* for convenience */
2262 mask_r = visual->red_mask;
2263 mask_g = visual->green_mask;
2264 mask_b = visual->blue_mask;
2265
2266 /* boring lookup table pre-initialization */
2267 switch (srcImage->bits_per_pixel) {
2268 case 15:
2269 if ((mask_r != 0x7c00) ||
2270 (mask_g != 0x03e0) ||
2271 (mask_b != 0x001f))
2272 return;
2273 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2274 lookup_r = lookup;
2275 lookup_g = lookup+32;
2276 lookup_b = lookup+32+32;
2277 sh_r = 10;
2278 sh_g = 5;
2279 sh_b = 0;
2280 break;
2281 case 16:
2282 if ((mask_r != 0xf800) ||
2283 (mask_g != 0x07e0) ||
2284 (mask_b != 0x001f))
2285 return;
2286 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2287 lookup_r = lookup;
2288 lookup_g = lookup+32;
2289 lookup_b = lookup+32+64;
2290 sh_r = 11;
2291 sh_g = 5;
2292 sh_b = 0;
2293 break;
2294 case 24:
2295 if ((mask_r != 0xff0000) ||
2296 (mask_g != 0x00ff00) ||
2297 (mask_b != 0x0000ff))
2298 return;
2299 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2300 lookup_r = lookup;
2301 lookup_g = lookup+256;
2302 lookup_b = lookup+256+256;
2303 sh_r = 16;
2304 sh_g = 8;
2305 sh_b = 0;
2306 break;
2307 case 32:
2308 if ((mask_r != 0xff0000) ||
2309 (mask_g != 0x00ff00) ||
2310 (mask_b != 0x0000ff))
2311 return;
2312 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2313 lookup_r = lookup;
2314 lookup_g = lookup+256;
2315 lookup_b = lookup+256+256;
2316 sh_r = 16;
2317 sh_g = 8;
2318 sh_b = 0;
2319 break;
2320 default:
2321 return; /* we do not support this color depth */
2322 }
2323
2324 /* prepare limits for color transformation (each channel is handled separately) */
2325 if (shade < 0) {
2326 shade = -shade;
2327 if (shade < 0) shade = 0;
2328 if (shade > 100) shade = 100;
2329
2330 lower_lim_r = 65535-rm;
2331 lower_lim_g = 65535-gm;
2332 lower_lim_b = 65535-bm;
2333
2334 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2335 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2336 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2337
2338 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2339 } else {
2340 if (shade < 0) shade = 0;
2341 if (shade > 100) shade = 100;
2342
2343 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2344
2345 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2346 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2347 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2348 }
2349
2350 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2351 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2352 {
2353 unsigned int tmp;
2354
2355 tmp = lower_lim_r;
2356 lower_lim_r = lower_lim_b;
2357 lower_lim_b = tmp;
2358
2359 tmp = upper_lim_r;
2360 upper_lim_r = upper_lim_b;
2361 upper_lim_b = tmp;
2362 }
2363
2364 /* fill our lookup tables */
2365 for (i = 0; i <= mask_r>>sh_r; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2369 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2370 lookup_r[i] = (tmp/65535)<<sh_r;
2371 }
2372 for (i = 0; i <= mask_g>>sh_g; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2376 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2377 lookup_g[i] = (tmp/65535)<<sh_g;
2378 }
2379 for (i = 0; i <= mask_b>>sh_b; i++)
2380 {
2381 RUINT32T tmp;
2382 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2383 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2384 lookup_b[i] = (tmp/65535)<<sh_b;
2385 }
2386
2387 /* apply table to input image (replacing colors by newly calculated ones) */
2388 switch (srcImage->bits_per_pixel)
2389 {
2390 case 15:
2391 {
2392 unsigned short *p1, *pf, *p, *pl;
2393 p1 = (unsigned short *) srcImage->data;
2394 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0x7c00)>>10] |
2402 lookup_g[(*p & 0x03e0)>> 5] |
2403 lookup_b[(*p & 0x001f)];
2404 }
2405 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 16:
2410 {
2411 unsigned short *p1, *pf, *p, *pl;
2412 p1 = (unsigned short *) srcImage->data;
2413 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414 while (p1 < pf)
2415 {
2416 p = p1;
2417 pl = p1 + srcImage->width;
2418 for (; p < pl; p++)
2419 {
2420 *p = lookup_r[(*p & 0xf800)>>11] |
2421 lookup_g[(*p & 0x07e0)>> 5] |
2422 lookup_b[(*p & 0x001f)];
2423 }
2424 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2425 }
2426 break;
2427 }
2428 case 24:
2429 {
2430 unsigned char *p1, *pf, *p, *pl;
2431 p1 = (unsigned char *) srcImage->data;
2432 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2433 while (p1 < pf)
2434 {
2435 p = p1;
2436 pl = p1 + srcImage->width * 3;
2437 for (; p < pl; p += 3)
2438 {
2439 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2440 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2441 p[2] = lookup_r[(p[2] & 0x0000ff)];
2442 }
2443 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2444 }
2445 break;
2446 }
2447 case 32:
2448 {
2449 RUINT32T *p1, *pf, *p, *pl;
2450 p1 = (RUINT32T *) srcImage->data;
2451 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2452
2453 while (p1 < pf)
2454 {
2455 p = p1;
2456 pl = p1 + srcImage->width;
2457 for (; p < pl; p++)
2458 {
2459 *p = lookup_r[(*p & 0xff0000)>>16] |
2460 lookup_g[(*p & 0x00ff00)>> 8] |
2461 lookup_b[(*p & 0x0000ff)] |
2462 (*p & ~0xffffff);
2463 }
2464 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2465 }
2466 break;
2467 }
2468 }
2469
2470 free (lookup);
2471}
2472#endif
2473
2474/*
2475 * Check our parents are still who we think they are.
2476 * Do transparency updates if required
2477 */
2478int
2479rxvt_term::check_our_parents ()
2480{
2481 int i, pchanged, aformat, have_pixmap, rootdepth;
2482 unsigned long nitems, bytes_after;
2483 Atom atype;
2484 unsigned char *prop = NULL;
2485 Window root, oldp, *list;
2486 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2489
2490 pchanged = 0;
2491
2492 if (!OPTION (Opt_transparent))
2493 return pchanged; /* Don't try any more */
2494
2495 XGetWindowAttributes (disp, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth;
2497
2498 XGetWindowAttributes (disp, parent[0], &wattr);
2499
2500 if (rootdepth != wattr.depth)
2501 {
2502 if (am_transparent)
2503 {
2504 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0;
2507 }
2508
2509 return pchanged; /* Don't try any more */
2510 }
2511
2512 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False);
2514
2515 /*
2516 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that.
2519 */
2520 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success);
2524
2525 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success);
2530
2531 if (!i || prop == NULL
2532#if TINTING
2533 || !rs[Rs_color + Color_tint]
2534#endif
2535 )
2536 have_pixmap = 0;
2537 else
2538 {
2539 have_pixmap = 1;
2540 rootpixmap = *(Pixmap *)prop;
2541 XFree (prop);
2542 }
2543
2544 if (have_pixmap)
2545 {
2546 /*
2547 * Copy display->root pixmap transparency
2548 */
2549 int sx, sy, nx, ny;
2550 unsigned int nw, nh;
2551 Window cr;
2552 XImage *image;
2553 GC gc;
2554 XGCValues gcvalue;
2555
2556 XTranslateCoordinates (disp, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height;
2560 nx = ny = 0;
2561
2562 if (sx < 0)
2563 {
2564 nw += sx;
2565 nx = -sx;
2566 sx = 0;
2567 }
2568
2569 if (sy < 0)
2570 {
2571 nh += sy;
2572 ny = -sy;
2573 sy = 0;
2574 }
2575
2576 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578
2579 XSync (disp, False);
2580 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */
2585 allowedxerror = 0;
2586
2587 if (image == NULL)
2588 {
2589 if (am_transparent && am_pixmap_trans)
2590 {
2591 pchanged = 1;
2592 if (pixmap != None)
2593 {
2594 XFreePixmap (disp, pixmap);
2595 pixmap = None;
2596 }
2597 }
2598
2599 am_pixmap_trans = 0;
2600 }
2601 else
2602 {
2603 if (pixmap != None)
2604 XFreePixmap (disp, pixmap);
2605
2606#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint))
2608 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2613
2614 ShadeXImage (display, image, shade, rm, gm, bm);
2615 }
2616#endif
2617
2618 pixmap = XCreatePixmap (disp, vt,
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc);
2624 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]);
2627
2628 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1;
2630
2631 am_transparent = am_pixmap_trans = 1;
2632 }
2633 }
2634
2635 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2637 else
2638 {
2639 unsigned int n;
2640 /*
2641 * InheritPixmap transparency
2642 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 {
2645 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root,
2647 &parent[i], &list, &n);
2648 XFree (list);
2649
2650 if (parent[i] == display->root)
2651 {
2652 if (oldp != None)
2653 pchanged = 1;
2654
2655 break;
2656 }
2657
2658 if (oldp != parent[i])
2659 pchanged = 1;
2660 }
2661
2662 n = 0;
2663
2664 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++)
2667 {
2668 XGetWindowAttributes (disp, parent[n], &wattr);
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break;
2673 }
2674 }
2675 }
2676
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2678 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */
2683 }
2684 else
2685 {
2686#if WAIT_FOR_WM
2687 /* wait (an arbitrary period) for the WM to do its thing
2688 * needed for fvwm2.2.2 (and before?) */
2689 sleep (1);
2690#endif
2691 for (n = 0; n < (unsigned int)i; n++)
2692 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]);
2695 }
2696
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2698 am_transparent = 1;
2699 }
2700
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None;
2703 }
2704
2705 if (scrollBar.win)
2706 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle ();
2709 scrollbar_show (0);
2710 }
2711
2712 if (am_transparent)
2713 {
2714 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans)
2716 flush ();
2717 }
2718
2719 return pchanged;
2720}
2721#endif
2722 2226
2723/*}}} */ 2227/*}}} */
2724 2228
2725bool 2229bool
2726rxvt_term::cmd_parse () 2230rxvt_term::cmd_parse ()
… …
2775 if (ch == C0_LF) 2279 if (ch == C0_LF)
2776 nlines++; 2280 nlines++;
2777 2281
2778 refresh_count++; 2282 refresh_count++;
2779 2283
2780 if (!OPTION (Opt_jumpScroll) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2781 || (refresh_count >= refresh_limit * (nrow - 1)))
2782 { 2285 {
2783 refreshnow = true;
2784 refresh_count = 0; 2286 refresh_count = 0;
2287
2288 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2289 {
2290 refreshnow = true;
2785 ch = NOCHAR; 2291 ch = NOCHAR;
2786 break; 2292 break;
2293 }
2787 } 2294 }
2788 2295
2789 // scr_add_lines only works for nlines <= nrow - 1. 2296 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2297 if (nlines >= nrow - 1)
2791 { 2298 {
2299 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2300 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2301 scr_add_lines (buf, str - buf, nlines);
2794 2302
2795 nlines = 0; 2303 nlines = 0;
2796 str = buf; 2304 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2305 eol = str + min (ncol, UBUFSIZ);
… …
2812 2320
2813 seq_begin = cmdbuf_ptr; 2321 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2322 ch = next_char ();
2815 } 2323 }
2816 2324
2325 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818 scr_add_lines (buf, str - buf, nlines); 2327 scr_add_lines (buf, str - buf, nlines);
2819 2328
2820 /* 2329 /*
2821 * If there have been a lot of new lines, then update the screen 2330 * If there have been a lot of new lines, then update the screen
2822 * What the heck I'll cheat and only refresh less than every page-full. 2331 * What the heck we'll cheat and only refresh less than every page-full.
2823 * the number of pages between refreshes is refresh_limit, which 2332 * if skipScroll is enabled.
2824 * is incremented here because we must be doing flat-out scrolling.
2825 */ 2333 */
2826 if (refreshnow) 2334 if (refreshnow)
2827 { 2335 {
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++;
2830 else
2831 {
2832 flag = true; 2336 flag = true;
2833 scr_refresh (refresh_type); 2337 scr_refresh ();
2834 flush_ev.stop (); 2338 want_refresh = 1;
2835 }
2836 } 2339 }
2837 2340
2838 } 2341 }
2839 else 2342 else
2840 { 2343 {
… …
2856 return flag; 2359 return flag;
2857} 2360}
2858 2361
2859// read the next character 2362// read the next character
2860wchar_t 2363wchar_t
2861rxvt_term::next_char () 2364rxvt_term::next_char () NOTHROW
2862{ 2365{
2863 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2864 { 2367 {
2865 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2887 return NOCHAR; 2390 return NOCHAR;
2888} 2391}
2889 2392
2890// read the next octet 2393// read the next octet
2891uint32_t 2394uint32_t
2892rxvt_term::next_octet () 2395rxvt_term::next_octet () NOTHROW
2893{ 2396{
2894 return cmdbuf_ptr < cmdbuf_endp 2397 return cmdbuf_ptr < cmdbuf_endp
2895 ? *cmdbuf_ptr++ 2398 ? (unsigned char)*cmdbuf_ptr++
2896 : NOCHAR; 2399 : NOCHAR;
2897} 2400}
2401
2402static class out_of_input out_of_input;
2898 2403
2899/* rxvt_cmd_getc () - Return next input character */ 2404/* rxvt_cmd_getc () - Return next input character */
2900/* 2405/*
2901 * Return the next input character after first passing any keyboard input 2406 * Return the next input character after first passing any keyboard input
2902 * to the command. 2407 * to the command.
2903 */ 2408 */
2904wchar_t 2409wchar_t
2905rxvt_term::cmd_getc () 2410rxvt_term::cmd_getc () THROW ((class out_of_input))
2906{ 2411{
2907 wchar_t c = next_char (); 2412 wchar_t c = next_char ();
2908 2413
2909 if (c == NOCHAR) 2414 if (c == NOCHAR)
2910 throw out_of_input; 2415 throw out_of_input;
2911 2416
2912 return c; 2417 return c;
2913} 2418}
2914 2419
2915uint32_t 2420uint32_t
2916rxvt_term::cmd_get8 () 2421rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 2422{
2918 uint32_t c = next_octet (); 2423 uint32_t c = next_octet ();
2919 2424
2920 if (c == NOCHAR) 2425 if (c == NOCHAR)
2921 throw out_of_input; 2426 throw out_of_input;
… …
2987 { 2492 {
2988 if ((buf[len++] = cmd_getc ()) == 'i') 2493 if ((buf[len++] = cmd_getc ()) == 'i')
2989 break; /* done = 1 */ 2494 break; /* done = 1 */
2990 } 2495 }
2991 } 2496 }
2992 2497
2993 for (i = 0; i < len; i++) 2498 for (i = 0; i < len; i++)
2994 if (putc (buf[i], fd) == EOF) 2499 if (putc (buf[i], fd) == EOF)
2995 { 2500 {
2996 done = 1; 2501 done = 1;
2997 break; 2502 break;
… …
3059 process_dcs_seq (); 2564 process_dcs_seq ();
3060 break; 2565 break;
3061 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
3062 process_csi_seq (); 2567 process_csi_seq ();
3063 break; 2568 break;
3064 case 0x9d: /* CSI */ 2569 case 0x9d: /* OSC */
3065 process_osc_seq (); 2570 process_osc_seq ();
3066 break; 2571 break;
3067#endif 2572#endif
3068 } 2573 }
3069} 2574}
… …
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 2664 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 2665 break;
3161 case '+': 2666 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 2667 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 2668 break;
3164#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
3165 case '6': 2670 case '6':
3166 scr_backindex (); 2671 scr_backindex ();
3167 break; 2672 break;
3168#endif 2673#endif
3169 case '7': 2674 case '7':
3170 scr_cursor (SAVE); 2675 scr_cursor (SAVE);
3171 break; 2676 break;
3172 case '8': 2677 case '8':
3173 scr_cursor (RESTORE); 2678 scr_cursor (RESTORE);
3174 break; 2679 break;
3175#if ENABLE_FRILLS 2680#if !ENABLE_MINIMAL
3176 case '9': 2681 case '9':
3177 scr_forwardindex (); 2682 scr_forwardindex ();
3178 break; 2683 break;
3179#endif 2684#endif
3180 case '=': 2685 case '=':
… …
3297 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
3298 unsigned int nargs, p; 2803 unsigned int nargs, p;
3299 int n, ndef; 2804 int n, ndef;
3300 int arg[ESC_ARGS]; 2805 int arg[ESC_ARGS];
3301 2806
3302 for (nargs = ESC_ARGS; nargs > 0;) 2807 memset (arg, 0, sizeof (arg));
3303 arg[--nargs] = 0; 2808 nargs = 0;
3304 2809
3305 priv = 0; 2810 priv = 0;
3306 ch = cmd_getc (); 2811 ch = cmd_getc ();
3307 if (ch >= '<' && ch <= '?') 2812 if (ch >= '<' && ch <= '?')
3308 { /* '<' '=' '>' '?' */ 2813 { /* '<' '=' '>' '?' */
… …
3342 ndef = get_byte_array_bit (csi_defaults, i); 2847 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 2848 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 2849 if (arg[p] == -1)
3345 arg[p] = ndef; 2850 arg[p] = ndef;
3346 2851
3347#ifdef DEBUG_CMD
3348 fprintf (stderr, "CSI ");
3349 for (p = 0; p < nargs; p++)
3350 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351 fprintf (stderr, "%c\n", ch);
3352#endif
3353
3354 /* 2852 /*
3355 * private mode handling 2853 * private mode handling
3356 */ 2854 */
3357 if (priv) 2855 if (priv)
3358 { 2856 {
3359 switch (priv) 2857 switch (priv)
3360 { 2858 {
3361 case '>': 2859 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 2860 if (ch == CSI_DA) /* secondary device attributes */
3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2861 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2867 // that we do not support xterm mouse reporting (should be 95 when we do).
2868 //
2869 tt_printf ("\033[>%d;94;0c", 'U');
2870 }
3364 break; 2871 break;
3365 case '?': 2872 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 2875 break;
… …
3494 break; 3001 break;
3495 case 6: /* CPR requested */ 3002 case 6: /* CPR requested */
3496 scr_report_position (); 3003 scr_report_position ();
3497 break; 3004 break;
3498 case 7: /* unofficial extension */ 3005 case 7: /* unofficial extension */
3499 if (OPTION (Opt_insecure)) 3006 if (option (Opt_insecure))
3500 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3007 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3501 break; 3008 break;
3502 case 8: /* unofficial extension */ 3009 case 8: /* unofficial extension */
3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3010 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3504 break; 3011 break;
… …
3571 break; 3078 break;
3572 case CSI_75: 3079 case CSI_75:
3573 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3574 break; 3081 break;
3575 3082
3576#if ENABLE_FRILLS 3083#if !ENABLE_MINIMAL
3577 case CSI_74: 3084 case CSI_74:
3578 process_window_ops (arg, nargs); 3085 process_window_ops (arg, nargs);
3579 break; 3086 break;
3580#endif 3087#endif
3581 3088
… …
3588 break; 3095 break;
3589 } 3096 }
3590} 3097}
3591/*}}} */ 3098/*}}} */
3592 3099
3593#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3594/* ARGSUSED */ 3101/* ARGSUSED */
3595void 3102void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3103rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3104{
3598 int x, y; 3105 int x, y;
3599 XWindowAttributes wattr; 3106 XWindowAttributes wattr;
3600 Window wdummy; 3107 Window wdummy;
3601 dDisp; 3108
3109 dLocal (Display *, dpy);
3602 3110
3603 if (nargs == 0) 3111 if (nargs == 0)
3604 return; 3112 return;
3605 3113
3606 switch (args[0]) 3114 switch (args[0])
3607 { 3115 {
3608 /* 3116 /*
3609 * commands 3117 * commands
3610 */ 3118 */
3611 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3120 XMapWindow (dpy, parent[0]);
3613 break; 3121 break;
3614 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent[0], display->screen);
3616 break; 3124 break;
3617 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent[0], args[1], args[2]);
3619 break; 3127 break;
3620 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3130 break;
3623 case 5: /* raise window */ 3131 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3132 XRaiseWindow (dpy, parent[0]);
3625 break; 3133 break;
3626 case 6: /* lower window */ 3134 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3135 XLowerWindow (dpy, parent[0]);
3628 break; 3136 break;
3629 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3630 scr_touch (true); 3138 scr_touch (true);
3631 break; 3139 break;
3632 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3639 if (args[0] >= 24) /* set height (chars) */ 3147 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3148 set_widthheight ((unsigned int)width,
3641 (unsigned int) (args[1] * fheight)); 3149 (unsigned int) (args[1] * fheight));
3642 break; 3150 break;
3643 3151
3644
3645 /* 3152 /*
3646 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3647 */ 3154 */
3648 case 11: /* report window state */ 3155 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3158 break;
3652 case 13: /* report window position */ 3159 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent[0], wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3165 break;
3659 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3169 break;
3663 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3172 break;
… …
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3175 break;
3669 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3670 { 3177 {
3671 char *s; 3178 char *s;
3672 XGetIconName (disp, parent[0], &s); 3179 XGetIconName (dpy, parent[0], &s);
3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s); 3181 XFree (s);
3675 } 3182 }
3676 break; 3183 break;
3677 case 21: /* report window title */ 3184 case 21: /* report window title */
3678 { 3185 {
3679 char *s; 3186 char *s;
3680 XFetchName (disp, parent[0], &s); 3187 XFetchName (dpy, parent[0], &s);
3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s); 3189 XFree (s);
3683 } 3190 }
3684 break; 3191 break;
3685 } 3192 }
3686} 3193}
… …
3713 seen_esc = true; 3220 seen_esc = true;
3714 continue; 3221 continue;
3715 } 3222 }
3716 else if (ch == C0_BEL || ch == CHAR_ST) 3223 else if (ch == C0_BEL || ch == CHAR_ST)
3717 break; 3224 break;
3225 else if (ch == C0_SYN)
3226 ch = cmd_get8 ();
3718 else if (ch < 0x20) 3227 else if (ch < 0x20)
3719 return NULL; /* other control character - exit */ 3228 return NULL; /* other control character - exit */
3720 3229
3721 seen_esc = false; 3230 seen_esc = false;
3722 3231
3723 if (n >= STRING_MAX - 1) 3232 if (n >= STRING_MAX - 1)
3724 // stop at some sane length 3233 // stop at some sane length
3725 return NULL; 3234 return NULL;
3726 3235
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
3730 string[n++] = ch; 3236 string[n++] = ch;
3731 } 3237 }
3732 3238
3733 string[n++] = '\0'; 3239 string[n++] = '\0';
3734 3240
3735 ends_how = (ch == 0x5c ? C0_ESC : ch); 3241 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3786void 3292void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3293rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{ 3294{
3789 if (str[0] == '?' && !str[1]) 3295 if (str[0] == '?' && !str[1])
3790 { 3296 {
3791 unsigned short r, g, b; 3297 rgba c;
3792 pix_colors_focused[color].get (display, r, g, b); 3298 pix_colors_focused[color].get (c);
3299
3300#if XFT
3301 if (c.a != rgba::MAX_CC)
3302 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3303 else
3304#endif
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3305 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794 } 3306 }
3795 else 3307 else
3796 set_window_color (color, str); 3308 set_window_color (color, str);
3797} 3309}
3798 3310
… …
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3313 */
3802void 3314void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3315rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804{ 3316{
3805 int changed = 0;
3806 int color; 3317 int color;
3807 char *buf, *name; 3318 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3319 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3320 int saveop = op;
3810 dDisp; 3321
3322 dLocal (Display *, dpy);
3811 3323
3812 assert (str != NULL); 3324 assert (str != NULL);
3325
3326 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3327 return;
3328
3813 switch (op) 3329 switch (op)
3814 { 3330 {
3815 case XTerm_name: 3331 case XTerm_name:
3816 set_title (str); 3332 set_title (str);
3817 /* FALLTHROUGH */ 3333 /* FALLTHROUGH */
… …
3831 unsigned long bytes_after; 3347 unsigned long bytes_after;
3832 unsigned char *value = 0; 3348 unsigned char *value = 0;
3833 const char *str = ""; 3349 const char *str = "";
3834 3350
3835 if (prop 3351 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3352 && XGetWindowProperty (dpy, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3353 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3354 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3355 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3356 && actual_type != None
3841 && actual_format == 8) 3357 && actual_format == 8)
3842 str = (const char *)(value); 3358 str = (const char *)(value);
3843 3359
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3360 tt_printf ("\033]%d;%s%c", op, str, resp);
3845 3361
3846 XFree (value); 3362 XFree (value);
3847 } 3363 }
3848 else 3364 else
3849 { 3365 {
… …
3853 { 3369 {
3854 *eq = 0; 3370 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 3371 set_utf8_property (display->atom (str), eq + 1);
3856 } 3372 }
3857 else 3373 else
3858 XDeleteProperty (disp, parent[0], 3374 XDeleteProperty (dpy, parent[0],
3859 display->atom (str)); 3375 display->atom (str));
3860 } 3376 }
3861 break; 3377 break;
3862 3378
3863 case XTerm_Color: 3379 case XTerm_Color:
… …
3865 { 3381 {
3866 if ((name = strchr (buf, ';')) == NULL) 3382 if ((name = strchr (buf, ';')) == NULL)
3867 break; 3383 break;
3868 3384
3869 *name++ = '\0'; 3385 *name++ = '\0';
3870 color = atoi (buf); 3386 color = atoi (buf) + minCOLOR;
3871 3387
3872 if (color < 0 || color >= TOTAL_COLORS) 3388 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 3389 break;
3874 3390
3875 if ((buf = strchr (name, ';')) != NULL) 3391 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 3392 *buf++ = '\0';
3877 3393
3878 if (name[0] == '?' && !name[1]) 3394 process_color_seq (op, color, name, resp);
3879 {
3880 unsigned short r, g, b;
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883 }
3884 else
3885 set_window_color (color + minCOLOR, name);
3886 } 3395 }
3887 break; 3396 break;
3888 case XTerm_Color00: 3397 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3398 process_color_seq (op, Color_fg, str, resp);
3890 break; 3399 break;
3891 case XTerm_Color01: 3400 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3401 process_color_seq (op, Color_bg, str, resp);
3893 break; 3402 break;
3894#ifndef NO_CURSORCOLOR 3403#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor: 3404 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3405 process_color_seq (op, Color_cursor, str, resp);
3897 break; 3406 break;
3898#endif 3407#endif
3899 case XTerm_Color_pointer_fg: 3408 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3409 process_color_seq (op, Color_pointer_fg, str, resp);
3901 break; 3410 break;
3902 case XTerm_Color_pointer_bg: 3411 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3412 process_color_seq (op, Color_pointer_bg, str, resp);
3904 break; 3413 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3906 case XTerm_Color_BD:
3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908 break;
3909 case XTerm_Color_UL:
3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911 break;
3912 case XTerm_Color_RV: 3415 case XTerm_Color_RV:
3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3416 process_color_seq (op, Color_RV, str, resp);
3417 break;
3418 case Rxvt_Color_BD:
3419 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp);
3421 break;
3422 case Rxvt_Color_UL:
3423 case URxvt_Color_UL:
3424 process_color_seq (op, Color_UL, str, resp);
3914 break; 3425 break;
3915 case URxvt_Color_IT: 3426 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3427 process_color_seq (op, Color_IT, str, resp);
3917 break; 3428 break;
3918#endif 3429#endif
3919#if TRANSPARENT && TINTING 3430#if ENABLE_TRANSPARENCY
3920 case URxvt_Color_tint: 3431 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3432 process_color_seq (op, Color_tint, str, resp);
3922 check_our_parents (); 3433 {
3923 if (am_transparent) 3434 bool changed = false;
3924 want_full_refresh = want_refresh = 1; 3435 if (ISSET_PIXCOLOR (Color_tint))
3925 break; 3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3926#endif 3437 else
3438 changed = bgPixmap.unset_tint ();
3439 if (changed)
3440 bgPixmap.render ();
3441 }
3927 3442
3443 break;
3444#endif
3445
3446#if XPM_BACKGROUND
3928 case XTerm_Pixmap: 3447 case Rxvt_Pixmap:
3929 if (*str != ';') 3448 if (!strcmp (str, "?"))
3930 { 3449 {
3931#if XPM_BACKGROUND 3450 char str[256];
3932 scale_pixmap (""); /* reset to default scaling */ 3451
3933 set_bgPixmap (str); /* change pixmap */ 3452 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3934#endif 3453 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3935 scr_touch (true); 3454 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3455 process_xterm_seq (XTerm_title, str, CHAR_ST);
3936 } 3456 }
3937 while ((str = strchr (str, ';')) != NULL) 3457 else
3938 { 3458 {
3459 int changed = 0;
3460
3461 if (*str != ';')
3462 {
3463 /* reset to default scaling :*/
3464 bgPixmap.unset_geometry ();
3465 if (bgPixmap.set_file (str)) /* change pixmap */
3466 changed++;
3467 str = strchr (str, ';');
3468 if (str == NULL)
3469 bgPixmap.set_defaultGeometry ();
3470 }
3471 while (str)
3472 {
3939 str++; 3473 str++;
3940#if XPM_BACKGROUND 3474 if (bgPixmap.set_geometry (str))
3941 changed += scale_pixmap (str); 3475 changed++;
3942#endif 3476 str = strchr (str, ';');
3477 }
3478 if (changed)
3479 {
3480 bgPixmap.render ();
3481 scr_touch (true);
3482 }
3943 } 3483 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949#endif
3950 scr_touch (true);
3951 }
3952 break; 3484 break;
3485#endif
3953 3486
3954 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3956 break; 3489 break;
3957 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3959 break; 3492 break;
3960 3493
3961 case XTerm_logfile: 3494 case XTerm_logfile:
3962 // TODO, when secure mode? 3495 // TODO, when secure mode?
3963 break; 3496 break;
3964 3497
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3498#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 3499 case Rxvt_dumpscreen: /* no error notices */
3973 { 3500 {
3974 int fd; 3501 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3502 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 { 3503 {
3977 scr_dump (fd); 3504 scr_dump (fd);
… …
3988 case URxvt_italicFont: 3515 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3990#endif 3517#endif
3991 if (query) 3518 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3522 resp);
3996 else 3523 else
3997 { 3524 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
4002 set_fonts (); 3529 set_fonts ();
4003 } 3530 }
4004 break; 3531 break;
4005 3532
4006#if ENABLE_FRILLS 3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3542 case URxvt_locale:
4008 if (query) 3543 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 3545 else
4011 { 3546 {
4012 set_locale (str); 3547 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3549 init_xlocale ();
4015 } 3550 }
4016 break; 3551 break;
4017 3552
4018 case URxvt_view_up: 3553 case URxvt_view_up:
… …
4029 break; 3564 break;
4030#endif 3565#endif
4031 3566
4032#if ENABLE_PERL 3567#if ENABLE_PERL
4033 case URxvt_perl: 3568 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 3570 ; // no responses yet
4036 break; 3571 break;
4037#endif 3572#endif
4038 } 3573 }
4039} 3574}
… …
4071 return state; 3606 return state;
4072} 3607}
4073 3608
4074/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
4075void 3610void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 3612{
4078 unsigned int i, j; 3613 unsigned int i, j;
4079 int state; 3614 int state;
4080 3615
4081 static const struct 3616 static const struct
4082 { 3617 {
4083 const int argval; 3618 const int argval;
4084 const unsigned long bit; 3619 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3620 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3621 { 1, PrivMode_aplCUR },
4089 { 2, PrivMode_vt52 }, 3622 { 2, PrivMode_vt52 },
4090 { 3, PrivMode_132 }, 3623 { 3, PrivMode_132 },
4091 { 4, PrivMode_smoothScroll }, 3624 { 4, PrivMode_smoothScroll },
4092 { 5, PrivMode_rVideo }, 3625 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 3626 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 3627 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 3628 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 3629 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 3630 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3631 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3634#endif
… …
4151 /* extra handling for values with state unkept */ 3681 /* extra handling for values with state unkept */
4152 switch (arg[i]) 3682 switch (arg[i])
4153 { 3683 {
4154#if ENABLE_STYLES 3684#if ENABLE_STYLES
4155 case 1021: 3685 case 1021:
4156 if (mode) 3686 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 3687
4161 scr_touch (true); 3688 scr_touch (true);
4162 break; 3689 break;
4163#endif 3690#endif
4164 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
4165 case 1049: 3692 case 1049:
4166 if (OPTION (Opt_secondaryScreen)) 3693 if (option (Opt_secondaryScreen))
4167 if (mode == 0) 3694 if (mode == 0)
4168 scr_cursor (RESTORE); 3695 scr_cursor (RESTORE);
4169 else if (mode == 1) 3696 else if (mode == 1)
4170 scr_cursor (SAVE); 3697 scr_cursor (SAVE);
4171 break; 3698 break;
… …
4186 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 3715 set_widthheight (((state ? 132 : 80) * fwidth), height);
4189 break; 3716 break;
4190 case 4: /* smooth scrolling */ 3717 case 4: /* smooth scrolling */
4191 if (!state) 3718 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 3719 break;
4196 case 5: /* reverse video */ 3720 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 3721 scr_rvideo_mode (state);
4198 break; 3722 break;
4199 case 6: /* relative/absolute origins */ 3723 case 6: /* relative/absolute origins */
… …
4205 /* case 8: - auto repeat, can't do on a per window basis */ 3729 /* case 8: - auto repeat, can't do on a per window basis */
4206 case 9: /* X10 mouse reporting */ 3730 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 3732 priv_modes &= ~PrivMode_MouseX11;
4209 break; 3733 break;
4210#ifdef menuBar_esc
4211 case menuBar_esc:
4212#ifdef MENUBAR
4213 map_menuBar (state);
4214#endif
4215 break;
4216#endif
4217#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
4218 case scrollBar_esc: 3735 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 3736 if (scrollbar_mapping (state))
4220 { 3737 {
4221 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
… …
4240#if 0 3757#if 0
4241 case 1001: 3758 case 1001:
4242 break; /* X11 mouse highlighting */ 3759 break; /* X11 mouse highlighting */
4243#endif 3760#endif
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 3761 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 3762 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 3763 break;
4250 case 1011: /* scroll to bottom on key press */ 3764 case 1011: /* scroll to bottom on key press */
4251 if (state) 3765 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 3766 break;
4256 case 1047: /* secondary screen w/ clearing last */ 3767 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 3770 scr_erase_screen (2);
4260 scr_change_screen (state); 3771 scr_change_screen (state);
4261 break; 3772 break;
4262 case 1049: /* secondary screen w/ clearing first */ 3773 case 1049: /* secondary screen w/ clearing first */
4263 scr_change_screen (state); 3774 scr_change_screen (state);
4264 if (OPTION (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
4265 if (current_screen != PRIMARY) 3776 if (current_screen != PRIMARY)
4266 scr_erase_screen (2); 3777 scr_erase_screen (2);
4267 break; 3778 break;
4268 default: 3779 default:
4269 break; 3780 break;
… …
4397 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4398 break; 3909 break;
4399 3910
4400 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4401 3912
4402#if ENABLE_FRILLS 3913#if !ENABLE_MINIMAL
4403 case 90: 3914 case 90:
4404 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4405 case 92: 3916 case 92:
4406 case 93: 3917 case 93:
4407 case 94: 3918 case 94:
… …
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470 3981
4471void 3982void
4472rxvt_term::tt_write (const char *data, unsigned int len) 3983rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 3984{
4474 if (pty.pty < 0) 3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 3986 return;
4476 3987
3988 if (pty->pty < 0)
3989 return;
3990
4477 if (v_buflen == 0) 3991 if (v_buflen == 0)
4478 { 3992 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480 3994
4481 if ((unsigned int)written == len) 3995 if ((unsigned int)written == len)
4482 return; 3996 return;
4483 3997
4484 data += written; 3998 data += written;
… …
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 4007 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494} 4008}
4495 4009
4496void rxvt_term::pty_write () 4010void rxvt_term::pty_write ()
4497{ 4011{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499 4013
4500 if (written > 0) 4014 if (written > 0)
4501 { 4015 {
4502 v_buflen -= written; 4016 v_buflen -= written;
4503 4017

Diff Legend

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