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.212 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(-view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 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// }
241 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
… …
276rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
277{ 306{
278 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
279 unsigned int newlen; 308 unsigned int newlen;
280 KeySym keysym; 309 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 310 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
286 312
287 /* 313 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
290 * 316 *
… …
308 Status status_return; 334 Status status_return;
309 335
310#if 0 336#if 0
311#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
315 else 341 else
316#endif 342#endif
317#endif 343#endif
318 { 344 {
… …
355 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
356 } 382 }
357 else 383 else
358#endif 384#endif
359 { 385 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
362 } 388 }
363 389
364 if (valid_keysym) 390 if (valid_keysym)
365 { 391 {
… …
417 scr_move_to (0, 1); 443 scr_move_to (0, 1);
418 return; 444 return;
419 } 445 }
420 else if (keysym == XK_End) 446 else if (keysym == XK_End)
421 { 447 {
422 scr_move_to (1, 0); 448 scr_move_to (1, 1);
423 return; 449 return;
424 } 450 }
425 } 451 }
426#endif 452#endif
427 } 453 }
… …
438 { 464 {
439 switch (keysym) 465 switch (keysym)
440 { 466 {
441 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
444 return; 470 return;
445#if TODO 471#if TODO
446 /* rxvt extras */ 472 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
829 { 855 {
830#ifdef META8_OPTION 856#ifdef META8_OPTION
831 /* set 8-bit on */ 857 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
833 { 859 {
834 unsigned char *ch; 860 char *ch;
835 861
836 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 863 *ch |= 0x80;
838 864
839 meta = 0; 865 meta = 0;
… …
841#endif 867#endif
842 /* nil */ ; 868 /* nil */ ;
843 } 869 }
844 } 870 }
845 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
846 if (len <= 0) 875 if (len <= 0)
847 return; /* not mapped */ 876 return; /* not mapped */
848 877
849 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 879 if (view_start)
851 { 880 {
852 view_start = 0; 881 view_start = 0;
853 want_refresh = 1; 882 want_refresh = 1;
854 } 883 }
… …
872#ifdef META8_OPTION 901#ifdef META8_OPTION
873 && meta_char == C0_ESC 902 && meta_char == C0_ESC
874#endif 903#endif
875 ) 904 )
876 { 905 {
877 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
878 tt_write (&ch, 1); 907 tt_write (&ch, 1);
879 } 908 }
880 909
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 910 tt_write (kbuf, (unsigned int)len);
892} 911}
893/*}}} */ 912/*}}} */
894 913
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 914#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 915unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 916rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 917{
901 unsigned int n, s; 918 unsigned int n, s;
902 919
903 n = cmdbuf_ptr - cmdbuf_base; 920 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 921 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 958 }
942#endif 959#endif
943 960
944 if (want_refresh) 961 if (want_refresh)
945 { 962 {
963 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
964 {
965 int row = view_start;
966 int end_row = row + nrow;
967
968 while (row > top_row && ROW (row - 1).is_longer ())
969 --row;
970
971 do
972 {
973 int start_row = row;
974 line_t *l;
975
976 do
977 {
978 l = &ROW (row++);
979
980 if (!(l->f & LINE_FILTERED))
981 {
982 // line not filtered, mark it as filtered
983 l->f |= LINE_FILTERED;
984 while (l->is_longer ())
985 {
986 l = &ROW (row++);
987 l->f |= LINE_FILTERED;
988 }
989
990 // and filter it
991 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
992
993 break;
994 }
995 }
996 while (l->is_longer () && row < end_row);
997 }
998 while (row < end_row);
999 }
1000
946 scr_refresh (refresh_type); 1001 scr_refresh ();
947 scrollbar_show (1); 1002 scrollbar_show (1);
948#ifdef USE_XIM 1003#ifdef USE_XIM
949 IMSendSpot (); 1004 IMSendSpot ();
950#endif 1005#endif
951 } 1006 }
… …
954} 1009}
955 1010
956void 1011void
957rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
958{ 1013{
959 SET_R (this); 1014 make_current ();
960 SET_LOCALE (locale);
961 1015
962 display->flush (); 1016 display->flush ();
963 1017
964 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1020}
967 1021
968void 1022void
969rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
970{ 1024{
971 SET_R (this); 1025 make_current ();
972 SET_LOCALE (locale);
973 1026
974 refresh_limit = 1; 1027 refresh_limit = 1;
975 refresh_count = 0; 1028 refresh_count = 0;
976 flush (); 1029 flush ();
977} 1030}
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1035{
983 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1037 want_refresh = 1;
985 1038
986 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1040}
988#endif 1041#endif
989 1042
990#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
991void 1044void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1059{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1062 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1063 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1065 }
1014} 1066}
1015#endif 1067#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1072{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1074 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1076 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1078 }
1028} 1079}
1029#endif 1080#endif
… …
1034{ 1085{
1035 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1089 {
1039 if (view_start == nsaved || 1090 if (view_start == top_row || view_start == 0)
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1091 mouse_slip_wheel_speed = 0;
1042 1092
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1093 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1095 }
1047} 1096}
1048#endif 1097#endif
1049 1098
1099#if LINUX_YIELD_HACK
1100static struct event_handler
1101{
1102 check_watcher yield_ev;
1103
1104 void yield_cb (check_watcher &w)
1105 {
1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS.
1110
1111 struct timespec ts = { 0, 0 };
1112 nanosleep (&ts, 0);
1113
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : yield_ev (this, &event_handler::yield_cb)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1050bool 1124bool
1051rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1052{ 1126{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1128
1055 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1056 { 1130 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1132 n = 0;
1059 } 1133 }
1060 1134
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1064 1138
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1140
1067 if (n > 0) 1141 if (r > 0)
1068 { 1142 {
1069 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1070 return true; 1144 return true;
1071 } 1145 }
1072 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if LINUX_YIELD_HACK
1149 if (display->is_local)
1150 event_handler.yield_ev.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1073 destroy (); 1158 destroy ();
1159 }
1074 1160
1075 return false; 1161 return false;
1076} 1162}
1077 1163
1078void 1164void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1166{
1081 SET_R (this); 1167 make_current ();
1082 SET_LOCALE (locale);
1083 1168
1084 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1171 while (pty_fill ())
1087 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1092} 1177}
1093 1178
1094void 1179void
1095rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1096{ 1181{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1182 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1183 recolour_cursor ();
1099 1184
1100#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1186 hidden_pointer = 0;
1102 1187
1103 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1190#endif
1106} 1191}
1107 1192
1108#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1109void 1194void
1110rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1111{ 1196{
1112 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1113 return; 1198 return;
1114 1199
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1201 XFlush (dpy);
1117 1202
1118 hidden_pointer = 1; 1203 hidden_pointer = 1;
1119} 1204}
1120 1205
1121void 1206void
1122rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1123{ 1208{
1124 SET_R (this); 1209 make_current ();
1125 SET_LOCALE (locale);
1126 1210
1127 pointer_blank (); 1211 pointer_blank ();
1128} 1212}
1129#endif 1213#endif
1130 1214
… …
1195 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1196 (32 + x + 1), 1280 (32 + x + 1),
1197 (32 + y + 1)); 1281 (32 + y + 1));
1198} 1282}
1199 1283
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209
1210/*{{{ process an X event */ 1284/*{{{ process an X event */
1211void 1285void
1212rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1213{ 1287{
1214 dDisp; 1288 make_current ();
1215 1289
1216 SET_R (this); 1290 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1291
1219#if defined(CURSOR_BLINK) 1292 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1295 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1296
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1297 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1298 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1299 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1300 unsigned int unused_mask;
1249 1301
1250 switch (ev.type) 1302 switch (ev.type)
… …
1257 1309
1258 break; 1310 break;
1259 1311
1260 case KeyRelease: 1312 case KeyRelease:
1261 { 1313 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1315 KeySym keysym;
1264 1316
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1318#endif
1267 1319
1268#if ENABLE_FRILLS || ISO_14755 1320#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1321 // ISO 14755 support
1270 if (iso14755buf) 1322 if (iso14755buf)
… …
1275# endif 1327# endif
1276# if ISO_14755 1328# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1329 // iso14755 part 5.2 handling: release time
1278 // first: controls 1330 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1331 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1334 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1336 commit_iso14755 ();
1285 return; // case-break; 1337 goto skip_switch;
1286 } 1338 }
1287 1339
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1341 if (i[0] == keysym)
1290 { 1342 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1343 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1344 commit_iso14755 ();
1293 return; // case-break; 1345 goto skip_switch;
1294 } 1346 }
1295 1347
1296 scr_bell (); 1348 scr_bell ();
1297# endif 1349# endif
1298 iso14755buf = 0; 1350 iso14755buf = 0;
… …
1317 else 1369 else
1318 iso14755buf = 0; 1370 iso14755buf = 0;
1319 } 1371 }
1320#endif 1372#endif
1321 1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1379 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1380 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1382 mouse_slip_wheel_speed = 0;
1327#endif 1383#endif
1328 break; 1384 break;
1329 } 1385 }
1330 1386
… …
1336 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1337 break; 1393 break;
1338 1394
1339 case ClientMessage: 1395 case ClientMessage:
1340 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1397 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1398 {
1399 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1400 {
1401 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1402 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1403 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1404 {
1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1406 destroy ();
1407 }
1345#if ENABLE_EWMH 1408#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1410 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1412 &ev);
1413#endif
1414 }
1415 }
1416#if ENABLE_XEMBED
1417 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1418 {
1419 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1420 focus_in ();
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out ();
1423 }
1350#endif 1424#endif
1351 } 1425 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break; 1426 break;
1388 1427
1389 case MappingNotify: 1428 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1429 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1430 break;
… …
1424 break; 1463 break;
1425 1464
1426 case ConfigureNotify: 1465 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1428 { 1467 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1469 ;
1431 1470
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1472 {
1434 seen_resize = 1; 1473 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1475 }
1437 1476
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent) 1480 if (OPTION (Opt_transparent))
1440 check_our_parents (); 1481 check_our_parents ();
1441#endif 1482#endif
1442 } 1483 }
1443 break; 1484 break;
1444 1485
1445 case PropertyNotify: 1486 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1488 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1489 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1490 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1491
1450 break; 1492 break;
1451 1493
1452 case SelectionClear: 1494 case SelectionClear:
1453 selection_clear (); 1495 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1500 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1501 break;
1460 1502
1461 case SelectionRequest: 1503 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1504 selection_send (ev.xselectionrequest);
1505 break;
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1513 break;
1464 1514
1465 case UnmapNotify: 1515 case UnmapNotify:
1466 mapped = 0; 1516 mapped = 0;
1467#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1469#endif 1519#endif
1470 break; 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break; 1521 break;
1478 1522
1479#ifdef TRANSPARENT 1523#ifdef TRANSPARENT
1480 case ReparentNotify: 1524 case ReparentNotify:
1481 rootwin_cb (ev); 1525 rootwin_cb (ev);
… …
1487 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1488 { 1532 {
1489 do 1533 do
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1537
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1539
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1499 1543
1500 scr_refresh (refresh_type); 1544 want_refresh = 1;
1501 } 1545 }
1502 else 1546 else
1503 { 1547 {
1504 XEvent unused_event; 1548 XEvent unused_event;
1505 1549
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1551 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1553 ;
1510 1554
1511 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1512 { 1556 {
1513 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1514 scrollbar_show (0); 1558 scrollbar_show (0);
1515 } 1559 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520 1560
1521#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window); 1563 XClearWindow (dpy, ev.xany.window);
1524#endif 1564#endif
1525 } 1565 }
1526 break; 1566 break;
1527 1567
1528 case MotionNotify: 1568 case MotionNotify:
1529#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1570 if (hidden_pointer)
1531 pointer_unblank (); 1571 pointer_unblank ();
1532#endif 1572#endif
1533#if MENUBAR
1534 if (isMenuBarWindow (ev.xany.window))
1535 {
1536 menubar_control (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1574 break;
1542 1575
1543 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1544 { 1577 {
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1582 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1584 ;
1549 1585
1550 XQueryPointer (disp, vt, 1586 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1590 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1619#endif 1655#endif
1620 } 1656 }
1621 } 1657 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1623 { 1659 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1626 ; 1662 ;
1627 1663
1628 XQueryPointer (disp, scrollBar.win, 1664 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1668 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1670 scrollbar_size ());
1635 scr_refresh (refresh_type); 1671 want_refresh = 1;
1636 refresh_limit = 0; 1672 refresh_limit = 0;
1637 scrollbar_show (1); 1673 scrollbar_show (1);
1638 } 1674 }
1639 break; 1675 break;
1640 } 1676 }
1677
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1682 {
1683 if (hidden_cursor)
1684 {
1685 hidden_cursor = 0;
1686 want_refresh = 1;
1687 }
1688
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690 }
1691#endif
1692
1693#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 {
1696 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease)
1699 if (hidden_pointer)
1700 pointer_unblank ();
1701
1702 if (ev.type == KeyPress && hidden_pointer == 0)
1703 pointer_blank ();
1704 }
1705#endif
1641} 1706}
1642 1707
1643void 1708void
1644rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1645{ 1710{
1646 if (!focus) 1711 if (!focus)
1647 { 1712 {
1648 focus = 1; 1713 focus = 1;
1649 want_refresh = 1; 1714 want_refresh = 1;
1715
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1717
1650#if USE_XIM 1718#if USE_XIM
1651 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1652 { 1720 {
1653 IMSetStatusPosition (); 1721 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context); 1722 XSetICFocus (Input_Context);
1655 } 1723 }
1656#endif 1724#endif
1657#if CURSOR_BLINK 1725#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1726 if (OPTION (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1660#endif 1728#endif
1661#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1663 { 1731 {
1664 pix_colors = pix_colors_focused; 1732 pix_colors = pix_colors_focused;
… …
1674 if (focus) 1742 if (focus)
1675 { 1743 {
1676 focus = 0; 1744 focus = 0;
1677 want_refresh = 1; 1745 want_refresh = 1;
1678 1746
1747 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748
1679#if ENABLE_FRILLS || ISO_14755 1749#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf)
1751 {
1680 iso14755buf = 0; 1752 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY 1753# if ENABLE_OVERLAY
1683 scr_overlay_off (); 1754 scr_overlay_off ();
1755# endif
1756 }
1684#endif 1757#endif
1685#if USE_XIM 1758#if USE_XIM
1686 if (Input_Context != NULL) 1759 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1760 XUnsetICFocus (Input_Context);
1688#endif 1761#endif
1689#if CURSOR_BLINK 1762#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1763 if (OPTION (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1764 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1765 hidden_cursor = 0;
1693#endif 1766#endif
1694#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
… …
1703 1776
1704#if TRANSPARENT 1777#if TRANSPARENT
1705void 1778void
1706rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1780{
1708 SET_R (this); 1781 make_current ();
1709 SET_LOCALE (locale);
1710 1782
1711 switch (ev.type) 1783 switch (ev.type)
1712 { 1784 {
1713 case PropertyNotify: 1785 case PropertyNotify:
1714 /* 1786 /*
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1792 return;
1721 1793
1722 /* FALLTHROUGH */ 1794 /* FALLTHROUGH */
1723 case ReparentNotify: 1795 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1797 want_refresh = want_full_refresh = 1;
1726 break; 1798 break;
1727 } 1799 }
1728} 1800}
1729#endif 1801#endif
… …
1732rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
1733{ 1805{
1734 int reportmode = 0, clickintime; 1806 int reportmode = 0, clickintime;
1735 1807
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1808 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1809
1737 if (!bypass_keystate) 1810 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1811 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1812
1740 /* 1813 /*
1741 * VT window processing of button press 1814 * VT window processing of button press
1742 */ 1815 */
1743 if (ev.window == vt) 1816 if (ev.window == vt)
1744 { 1817 {
1818 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1819 return;
1820
1745#if ISO_14755 1821#if ISO_14755
1746 // 5.4 1822 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1823 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1824 {
1749 iso14755_54 (ev.x, ev.y); 1825 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1837#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1838 if (ev.button == MEvent.button && clickintime)
1763 { 1839 {
1764 /* same button, within alloted time */ 1840 /* same button, within alloted time */
1765 MEvent.clicks++; 1841 MEvent.clicks++;
1842
1766 if (MEvent.clicks > 1) 1843 if (MEvent.clicks > 1)
1767 { 1844 {
1768 /* only report double clicks */ 1845 /* only report double clicks */
1769 MEvent.clicks = 2; 1846 MEvent.clicks = 2;
1770 mouse_report (ev); 1847 mouse_report (ev);
… …
1802#else 1879#else
1803 selection.rect = false; 1880 selection.rect = false;
1804#endif 1881#endif
1805 1882
1806 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1885 {
1809 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1811 else 1888 else
1812 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
… …
1977 } 2054 }
1978 2055
1979 break; 2056 break;
1980 } 2057 }
1981 } 2058 }
2059
1982 return; 2060 return;
1983 } 2061 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2062}
1992 2063
1993void 2064void
1994rxvt_term::button_release (XButtonEvent &ev) 2065rxvt_term::button_release (XButtonEvent &ev)
1995{ 2066{
… …
2001 2072
2002 if (scrollbar_isUpDn ()) 2073 if (scrollbar_isUpDn ())
2003 { 2074 {
2004 scrollBar.setIdle (); 2075 scrollBar.setIdle ();
2005 scrollbar_show (0); 2076 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2077 }
2010 2078
2011#ifdef SELECTION_SCROLLING 2079#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active) 2080 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2081 sel_scroll_ev.stop();
2014#endif 2082#endif
2015 2083
2016 if (ev.window == vt) 2084 if (ev.window == vt)
2017 { 2085 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2087 return;
2088
2018#if ISO_14755 2089#if ISO_14755
2019 // 5.4 2090 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2092 return;
2022#endif 2093#endif
2094
2023 if (reportmode) 2095 if (reportmode)
2024 { 2096 {
2025 /* mouse report from vt window */ 2097 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2098 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2099 if (ev.button >= 4)
… …
2057 { 2129 {
2058 case Button1: 2130 case Button1:
2059 case Button3: 2131 case Button3:
2060 selection_make (ev.time); 2132 selection_make (ev.time);
2061 break; 2133 break;
2134
2062 case Button2: 2135 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2064 break; 2138 break;
2139
2065#ifdef MOUSE_WHEEL 2140#ifdef MOUSE_WHEEL
2066 case Button4: 2141 case Button4:
2067 case Button5: 2142 case Button5:
2068 { 2143 {
2069 int i; 2144 int i;
… …
2071 2146
2072 v = ev.button == Button4 ? UP : DN; 2147 v = ev.button == Button4 ? UP : DN;
2073 2148
2074 if (ev.state & ShiftMask) 2149 if (ev.state & ShiftMask)
2075 i = 1; 2150 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2151 else if (OPTION (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2152 i = nrow - 1;
2078 else 2153 else
2079 i = 5; 2154 i = 5;
2080 2155
2081# ifdef MOUSE_SLIP_WHEELING 2156# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2166 slip_wheel_ev.start ();
2092 } 2167 }
2093 else 2168 else
2094 { 2169 {
2095# endif 2170# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2171 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2172 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING 2173# ifdef MOUSE_SLIP_WHEELING
2109 } 2174 }
2110#endif 2175# endif
2111 } 2176 }
2112 break; 2177 break;
2113#endif 2178#endif
2114 } 2179 }
2115 } 2180 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2181}
2121 2182
2122#ifdef TRANSPARENT 2183#ifdef TRANSPARENT
2123#if TINTING 2184#if TINTING
2124/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
2125 2186
2126typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
2127 2188
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{ 2190{
2130 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i; 2196 int i;
2136 2197
2137 Visual *visual = display->visual; 2198 Visual *visual = term->visual;
2138 2199
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140 2201
2141 /* for convenience */ 2202 /* for convenience */
2142 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2363 Atom atype; 2424 Atom atype;
2364 unsigned char *prop = NULL; 2425 unsigned char *prop = NULL;
2365 Window root, oldp, *list; 2426 Window root, oldp, *list;
2366 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369 2429
2370 pchanged = 0; 2430 pchanged = 0;
2371 2431
2372 if (!(options & Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2373 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2374 2434
2375 XGetWindowAttributes (disp, display->root, &wrootattr); 2435 XGetWindowAttributes (dpy, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2377 2437
2378 XGetWindowAttributes (disp, parent[0], &wattr); 2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2379 2439
2380 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2381 { 2441 {
2382 if (am_transparent) 2442 if (am_transparent)
2383 { 2443 {
2384 pchanged = 1; 2444 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2387 } 2447 }
2388 2448
2389 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2390 } 2450 }
2391 2451
2392 /* Get all X ops out of the queue so that our information is up-to-date. */ 2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False); 2453 XSync (dpy, False);
2394 2454
2395 /* 2455 /*
2396 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that. 2458 * windows for each client, so we have to take care about that.
2399 */ 2459 */
2400 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2404 2464
2405 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2410 2470
2411 if (!i || prop == NULL 2471 if (!i || prop == NULL
2412#if TINTING 2472#if TINTING
2413 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2414#endif 2474#endif
2415 ) 2475 )
2416 have_pixmap = 0; 2476 have_pixmap = 0;
2417 else 2477 else
2418 { 2478 {
… …
2431 Window cr; 2491 Window cr;
2432 XImage *image; 2492 XImage *image;
2433 GC gc; 2493 GC gc;
2434 XGCValues gcvalue; 2494 XGCValues gcvalue;
2435 2495
2436 XTranslateCoordinates (disp, parent[0], display->root, 2496 XTranslateCoordinates (dpy, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2440 nx = ny = 0; 2500 nx = ny = 0;
2441 2501
… …
2454 } 2514 }
2455 2515
2456 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458 2518
2459 XSync (disp, False); 2519 XSync (dpy, False);
2460 allowedxerror = -1; 2520 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462 2522
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2465 allowedxerror = 0; 2525 allowedxerror = 0;
2466 2526
… …
2469 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2470 { 2530 {
2471 pchanged = 1; 2531 pchanged = 1;
2472 if (pixmap != None) 2532 if (pixmap != None)
2473 { 2533 {
2474 XFreePixmap (disp, pixmap); 2534 XFreePixmap (dpy, pixmap);
2475 pixmap = None; 2535 pixmap = None;
2476 } 2536 }
2477 } 2537 }
2478 2538
2479 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2480 } 2540 }
2481 else 2541 else
2482 { 2542 {
2483 if (pixmap != None) 2543 if (pixmap != None)
2484 XFreePixmap (disp, pixmap); 2544 XFreePixmap (dpy, pixmap);
2485 2545
2486#if TINTING 2546#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2488 { 2548 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491 2550
2551 rgba c;
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2493 2553
2494 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2495 } 2555 }
2496#endif 2556#endif
2497 2557
2498 pixmap = XCreatePixmap (disp, vt, 2558 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0, 2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc); 2562 XFreeGC (dpy, gc);
2504 XDestroyImage (image); 2563 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]); 2565 XClearWindow (dpy, parent[0]);
2507 2566
2508 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1; 2568 pchanged = 1;
2510 2569
2511 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2512 } 2571 }
2513 } 2572 }
2514 2573
2515 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2517 else 2576 else
2518 { 2577 {
2519 unsigned int n; 2578 unsigned int n;
2520 /* 2579 /*
2521 * InheritPixmap transparency 2580 * InheritPixmap transparency
2522 */ 2581 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 { 2583 {
2525 oldp = parent[i]; 2584 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root, 2585 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2527 &parent[i], &list, &n);
2528 XFree (list); 2586 XFree (list);
2529 2587
2530 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2531 { 2589 {
2532 if (oldp != None) 2590 if (oldp != None)
… …
2540 } 2598 }
2541 2599
2542 n = 0; 2600 n = 0;
2543 2601
2544 if (pchanged) 2602 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2547 { 2604 {
2548 XGetWindowAttributes (disp, parent[n], &wattr); 2605 XGetWindowAttributes (dpy, parent[n], &wattr);
2606
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 { 2608 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break; 2610 break;
2553 } 2611 }
2554 } 2612 }
2555 }
2556 2613
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2558 { 2615 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0; 2618 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2563 } 2620 }
2564 else 2621 else
2565 { 2622 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2572 { 2624 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]); 2626 XClearWindow (dpy, parent[n]);
2575 } 2627 }
2576 2628
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2578 am_transparent = 1; 2630 am_transparent = 1;
2579 } 2631 }
2580 2632
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None; 2634 parent[i] = None;
2583 } 2635 }
2584 2636
2585 if (scrollBar.win) 2637 if (scrollBar.win)
2586 { 2638 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2589 scrollbar_show (0); 2641 scrollbar_show (0);
2590 } 2642 }
2591 2643
2592 if (am_transparent) 2644 if (am_transparent)
… …
2604 2656
2605bool 2657bool
2606rxvt_term::cmd_parse () 2658rxvt_term::cmd_parse ()
2607{ 2659{
2608 bool flag = false; 2660 bool flag = false;
2609 unicode_t ch = NOCHAR; 2661 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2662 char *seq_begin; // remember start of esc-sequence here
2611 2663
2612 for (;;) 2664 for (;;)
2613 { 2665 {
2614 if (ch == NOCHAR) 2666 if (ch == NOCHAR)
2615 { 2667 {
2616 seq_begin = cmdbuf_ptr; 2668 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2669 ch = next_char ();
2618 }
2619 2670
2620 if (ch == NOCHAR) // TODO: improve 2671 if (ch == NOCHAR)
2621 break; 2672 break;
2673 }
2622 2674
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2675 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2676 {
2625 if (!seen_input) 2677 if (!seen_input)
2626 { 2678 {
… …
2635 if (seen_resize && cmd_pid) 2687 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2688 kill (-cmd_pid, SIGWINCH);
2637 } 2689 }
2638 2690
2639 /* Read a text string from the input buffer */ 2691 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2692 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2693 bool refreshnow = false;
2642 int nlines = 0; 2694 int nlines = 0;
2643 unicode_t *str = buf; 2695 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2696 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2697
2646 for (;;) 2698 for (;;)
2647 { 2699 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2700 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2701 break;
… …
2655 if (ch == C0_LF) 2707 if (ch == C0_LF)
2656 nlines++; 2708 nlines++;
2657 2709
2658 refresh_count++; 2710 refresh_count++;
2659 2711
2660 if (!(options & Opt_jumpScroll) 2712 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1))) 2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2714 {
2663 refreshnow = true; 2715 refreshnow = true;
2716 refresh_count = 0;
2664 ch = NOCHAR; 2717 ch = NOCHAR;
2665 break; 2718 break;
2666 } 2719 }
2667 2720
2668 // scr_add_lines only works for nlines <= nrow - 1. 2721 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2722 if (nlines >= nrow - 1)
2670 { 2723 {
2724 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2725 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2726 scr_add_lines (buf, str - buf, nlines);
2727
2672 nlines = 0; 2728 nlines = 0;
2673 str = buf; 2729 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2730 eol = str + min (ncol, UBUFSIZ);
2675 } 2731 }
2676 2732
… …
2689 2745
2690 seq_begin = cmdbuf_ptr; 2746 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2747 ch = next_char ();
2692 } 2748 }
2693 2749
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2752 scr_add_lines (buf, str - buf, nlines);
2695 2753
2696 /* 2754 /*
2697 * If there have been a lot of new lines, then update the screen 2755 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2756 * What the heck I'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2757 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling. 2758 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2759 */
2702 if (refreshnow) 2760 if (refreshnow)
2703 { 2761 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++; 2763 refresh_limit++;
2706 else 2764 else
2707 { 2765 {
2708 flag = true; 2766 flag = true;
2709 scr_refresh (refresh_type); 2767 scr_refresh ();
2768 want_refresh = 1;
2710 } 2769 }
2711 } 2770 }
2712 2771
2713 } 2772 }
2714 else 2773 else
… …
2729 } 2788 }
2730 2789
2731 return flag; 2790 return flag;
2732} 2791}
2733 2792
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2793// read the next character
2744unicode_t 2794wchar_t
2745rxvt_term::next_char () 2795rxvt_term::next_char () NOTHROW
2746{ 2796{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2797 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2798 {
2749 // assume 7-bit to be ascii ALWAYS 2799 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2800 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2801 return *cmdbuf_ptr++;
2752 2802
2753 wchar_t wc; 2803 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2804 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2805
2756 if (len == (size_t)-2) 2806 if (len == (size_t)-2)
2757 { 2807 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2808 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2809 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2810 break;
2761 } 2811 }
2762 2812
2763 if (len == (size_t)-1) 2813 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2814 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2815
2766 // assume wchar == unicode 2816 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2817 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2818 return wc & UNICODE_MASK;
2769 } 2819 }
2770 2820
2771 return NOCHAR; 2821 return NOCHAR;
2772} 2822}
2823
2824// read the next octet
2825uint32_t
2826rxvt_term::next_octet () NOTHROW
2827{
2828 return cmdbuf_ptr < cmdbuf_endp
2829 ? (unsigned char)*cmdbuf_ptr++
2830 : NOCHAR;
2831}
2832
2833static class out_of_input out_of_input;
2773 2834
2774/* rxvt_cmd_getc () - Return next input character */ 2835/* rxvt_cmd_getc () - Return next input character */
2775/* 2836/*
2776 * Return the next input character after first passing any keyboard input 2837 * Return the next input character after first passing any keyboard input
2777 * to the command. 2838 * to the command.
2778 */ 2839 */
2779unicode_t 2840wchar_t
2780rxvt_term::cmd_getc () 2841rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2842{
2782 unicode_t c = next_char (); 2843 wchar_t c = next_char ();
2783 2844
2784 if (c == NOCHAR) 2845 if (c == NOCHAR)
2785 throw out_of_input; 2846 throw out_of_input;
2786 2847
2787 return c; 2848 return c;
2788} 2849}
2789 2850
2790unicode_t 2851uint32_t
2791rxvt_term::cmd_get8 () 2852rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2853{
2793 unicode_t c = next_octet (); 2854 uint32_t c = next_octet ();
2794 2855
2795 if (c == NOCHAR) 2856 if (c == NOCHAR)
2796 throw out_of_input; 2857 throw out_of_input;
2797 2858
2798 return c; 2859 return c;
… …
2898 case C0_ESC: 2959 case C0_ESC:
2899 process_escape_seq (); 2960 process_escape_seq ();
2900 break; 2961 break;
2901 case C0_ENQ: /* terminal Status */ 2962 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2963 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2964 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2965 else
2906 tt_write ((unsigned char *)VT100_ANS, 2966 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2967 break;
2909 case C0_BEL: /* bell */ 2968 case C0_BEL: /* bell */
2910 scr_bell (); 2969 scr_bell ();
2911 break; 2970 break;
2912 case C0_BS: /* backspace */ 2971 case C0_BS: /* backspace */
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 3096 break;
3038 case '+': 3097 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 3099 break;
3041#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3042 case '6': 3101 case '6':
3043 scr_backindex (); 3102 scr_backindex ();
3044 break; 3103 break;
3045#endif 3104#endif
3046 case '7': 3105 case '7':
3047 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3048 break; 3107 break;
3049 case '8': 3108 case '8':
3050 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3051 break; 3110 break;
3052#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3053 case '9': 3112 case '9':
3054 scr_forwardindex (); 3113 scr_forwardindex ();
3055 break; 3114 break;
3056#endif 3115#endif
3057 case '=': 3116 case '=':
… …
3067 break; 3126 break;
3068 3127
3069 /* 8.3.87: NEXT LINE */ 3128 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 3129 case C1_NEL: /* ESC E */
3071 { 3130 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 3131 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 3132 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 3133 }
3075 break; 3134 break;
3076 3135
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 3136 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 3137 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 3159 process_dcs_seq ();
3101 break; 3160 break;
3102 3161
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3162 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 3163 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 3164 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 3165 break; /* steal obsolete ESC [ c */
3108 3166
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3167 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 3168 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 3169 process_csi_seq ();
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 3280 if (arg[p] == -1)
3223 arg[p] = ndef; 3281 arg[p] = ndef;
3224 3282
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 3283 /*
3233 * private mode handling 3284 * private mode handling
3234 */ 3285 */
3235 if (priv) 3286 if (priv)
3236 { 3287 {
3237 switch (priv) 3288 switch (priv)
3238 { 3289 {
3239 case '>': 3290 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3292 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3298 // that we do not support xterm mouse reporting (should be 95 when we do).
3299 //
3300 tt_printf ("\033[>%d;94;0c", 'U');
3301 }
3242 break; 3302 break;
3243 case '?': 3303 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 3306 break;
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3415 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3416 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 3417 break;
3358 3418
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3419 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 3420 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 3421 break;
3363 3422
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3423 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 3424 process_sgr_mode (nargs, arg);
3366 break; 3425 break;
… …
3373 break; 3432 break;
3374 case 6: /* CPR requested */ 3433 case 6: /* CPR requested */
3375 scr_report_position (); 3434 scr_report_position ();
3376 break; 3435 break;
3377 case 7: /* unofficial extension */ 3436 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3437 if (OPTION (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3438 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3439 break;
3381 case 8: /* unofficial extension */ 3440 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3442 break;
… …
3450 break; 3509 break;
3451 case CSI_75: 3510 case CSI_75:
3452 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3453 break; 3512 break;
3454 3513
3455#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3456 case CSI_74: 3515 case CSI_74:
3457 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3458 break; 3517 break;
3459#endif 3518#endif
3460 3519
… …
3467 break; 3526 break;
3468 } 3527 }
3469} 3528}
3470/*}}} */ 3529/*}}} */
3471 3530
3472#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3532/* ARGSUSED */
3474void 3533void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3535{
3477 int x, y; 3536 int x, y;
3478 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3479 Window wdummy; 3538 Window wdummy;
3480 dDisp; 3539
3540 dLocal (Display *, dpy);
3481 3541
3482 if (nargs == 0) 3542 if (nargs == 0)
3483 return; 3543 return;
3484 3544
3485 switch (args[0]) 3545 switch (args[0])
3486 { 3546 {
3487 /* 3547 /*
3488 * commands 3548 * commands
3489 */ 3549 */
3490 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3551 XMapWindow (dpy, parent[0]);
3492 break; 3552 break;
3493 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3554 XIconifyWindow (dpy, parent[0], display->screen);
3495 break; 3555 break;
3496 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3557 XMoveWindow (dpy, parent[0], args[1], args[2]);
3498 break; 3558 break;
3499 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3561 break;
3502 case 5: /* raise window */ 3562 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3563 XRaiseWindow (dpy, parent[0]);
3504 break; 3564 break;
3505 case 6: /* lower window */ 3565 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3566 XLowerWindow (dpy, parent[0]);
3507 break; 3567 break;
3508 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3509 scr_touch (true); 3569 scr_touch (true);
3510 break; 3570 break;
3511 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3521 break; 3581 break;
3522 3582
3523
3524 /* 3583 /*
3525 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3526 */ 3585 */
3527 case 11: /* report window state */ 3586 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (dpy, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3589 break;
3531 case 13: /* report window position */ 3590 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3592 XTranslateCoordinates (dpy, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3596 break;
3538 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3598 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3600 break;
3542 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3603 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3606 break;
3548 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3549 { 3608 {
3550 char *s; 3609 char *s;
3551 XGetIconName (disp, parent[0], &s); 3610 XGetIconName (dpy, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3612 XFree (s);
3554 } 3613 }
3555 break; 3614 break;
3556 case 21: /* report window title */ 3615 case 21: /* report window title */
3557 { 3616 {
3558 char *s; 3617 char *s;
3559 XFetchName (disp, parent[0], &s); 3618 XFetchName (dpy, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3620 XFree (s);
3562 } 3621 }
3563 break; 3622 break;
3564 } 3623 }
3565} 3624}
… …
3568/*----------------------------------------------------------------------*/ 3627/*----------------------------------------------------------------------*/
3569/* 3628/*
3570 * get input up until STRING TERMINATOR (or BEL) 3629 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3630 * ends_how is terminator used. returned input must be free()'d
3572 */ 3631 */
3573unsigned char * 3632char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3633rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3634{
3576 unicode_t ch; 3635 unicode_t ch;
3577 bool seen_esc = false; 3636 bool seen_esc = false;
3578 unsigned int n = 0; 3637 unsigned int n = 0;
… …
3611 3670
3612 string[n++] = '\0'; 3671 string[n++] = '\0';
3613 3672
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3673 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3674
3616 return (unsigned char *)rxvt_wcstombs (string); 3675 return rxvt_wcstombs (string);
3617} 3676}
3618 3677
3619/*----------------------------------------------------------------------*/ 3678/*----------------------------------------------------------------------*/
3620/* 3679/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3680 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3681 */
3623void 3682void
3624rxvt_term::process_dcs_seq () 3683rxvt_term::process_dcs_seq ()
3625{ 3684{
3626 unsigned char *s; 3685 char *s;
3627 unicode_t eh; 3686 unicode_t eh;
3628 3687
3629 /* 3688 /*
3630 * Not handled yet 3689 * Not handled yet
3631 */ 3690 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3709 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3710 arg = arg * 10 + (ch - '0');
3652 3711
3653 if (ch == ';') 3712 if (ch == ';')
3654 { 3713 {
3655 unsigned char *s = get_to_st (eh); 3714 char *s = get_to_st (eh);
3656 3715
3657 if (s) 3716 if (s)
3658 { 3717 {
3659 process_xterm_seq (arg, (char *)s, eh); 3718 process_xterm_seq (arg, s, eh);
3660 free (s); 3719 free (s);
3661 } 3720 }
3662 } 3721 }
3663} 3722}
3664 3723
3665void 3724void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3725rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3726{
3668 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3669 { 3728 {
3670 unsigned short r, g, b; 3729 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3730 pix_colors_focused[color].get (c);
3731
3732#if XFT
3733 if (c.a != rgba::MAX_CC)
3734 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3735 else
3736#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3738 }
3674 else 3739 else
3675 set_window_color (color, str); 3740 set_window_color (color, str);
3676} 3741}
3677 3742
3678/* 3743/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3745 */
3681void 3746void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3747rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3748{
3684 int changed = 0;
3685 int color; 3749 int color;
3686 char *buf, *name; 3750 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3752 int saveop = op;
3689 dDisp; 3753
3754 dLocal (Display *, dpy);
3690 3755
3691 assert (str != NULL); 3756 assert (str != NULL);
3692 switch (op) 3757 switch (op)
3693 { 3758 {
3694 case XTerm_name: 3759 case XTerm_name:
… …
3710 unsigned long bytes_after; 3775 unsigned long bytes_after;
3711 unsigned char *value = 0; 3776 unsigned char *value = 0;
3712 const char *str = ""; 3777 const char *str = "";
3713 3778
3714 if (prop 3779 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3780 && XGetWindowProperty (dpy, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3784 && actual_type != None
3720 && actual_format == 8) 3785 && actual_format == 8)
3721 str = (const char *)(value); 3786 str = (const char *)(value);
3722 3787
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3789
3725 XFree (value); 3790 XFree (value);
3726 } 3791 }
3727 else 3792 else
3728 { 3793 {
… …
3732 { 3797 {
3733 *eq = 0; 3798 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3735 } 3800 }
3736 else 3801 else
3737 XDeleteProperty (disp, parent[0], 3802 XDeleteProperty (dpy, parent[0],
3738 display->atom (str)); 3803 display->atom (str));
3739 } 3804 }
3740 break; 3805 break;
3741 3806
3742 case XTerm_Color: 3807 case XTerm_Color:
… …
3744 { 3809 {
3745 if ((name = strchr (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3811 break;
3747 3812
3748 *name++ = '\0'; 3813 *name++ = '\0';
3749 color = atoi (buf); 3814 color = atoi (buf) + minCOLOR;
3750 3815
3751 if (color < 0 || color >= TOTAL_COLORS) 3816 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3817 break;
3753 3818
3754 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3820 *buf++ = '\0';
3756 3821
3757 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color + minCOLOR, name);
3765 } 3823 }
3766 break; 3824 break;
3767 case XTerm_Color00: 3825 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3769 break; 3827 break;
3770 case XTerm_Color01: 3828 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3772 break; 3830 break;
3773#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3834 break;
3777#endif 3835#endif
3778 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3838 break;
3781 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3841 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3845 break;
3846 case Rxvt_Color_BD:
3847 case URxvt_Color_BD:
3848 process_color_seq (op, Color_BD, str, resp);
3849 break;
3850 case Rxvt_Color_UL:
3851 case URxvt_Color_UL:
3852 process_color_seq (op, Color_UL, str, resp);
3793 break; 3853 break;
3794 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3796 break; 3856 break;
3797#endif 3857#endif
3798#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3801 check_our_parents (); 3862 check_our_parents ();
3863
3802 if (am_transparent) 3864 if (am_transparent)
3803 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806 3866
3867 break;
3868#endif
3869
3807 case XTerm_Pixmap: 3870 case Rxvt_Pixmap:
3871 {
3808 if (*str != ';') 3872 if (*str != ';')
3809 { 3873 {
3810#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true); 3877 scr_touch (true);
3878#endif
3815 } 3879 }
3880
3881 int changed = 0;
3882
3816 while ((str = strchr (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3817 { 3884 {
3818 str++; 3885 str++;
3819#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3820 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3821#endif 3888#endif
3822 } 3889 }
3823 3890
3824 if (changed) 3891 if (changed)
3825 { 3892 {
3826#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3827 resize_pixmap (); 3894 resize_pixmap ();
3828#endif
3829 scr_touch (true); 3895 scr_touch (true);
3896#endif
3830 } 3897 }
3898 }
3831 break; 3899 break;
3832 3900
3833 case XTerm_restoreFG: 3901 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3902 set_window_color (Color_fg, str);
3835 break; 3903 break;
3836 case XTerm_restoreBG: 3904 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3905 set_window_color (Color_bg, str);
3838 break; 3906 break;
3839 3907
3840 case XTerm_logfile: 3908 case XTerm_logfile:
3841 // TODO, when secure mode? 3909 // TODO, when secure mode?
3842 break; 3910 break;
3843 3911
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3912#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3913 case Rxvt_dumpscreen: /* no error notices */
3852 { 3914 {
3853 int fd; 3915 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3916 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3917 {
3856 scr_dump (fd); 3918 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3929 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3930 case URxvt_boldItalicFont:
3869#endif 3931#endif
3870 if (query) 3932 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3933 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3935 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3936 resp);
3875 else 3937 else
3876 { 3938 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3939 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3881 set_fonts (); 3943 set_fonts ();
3882 } 3944 }
3883 break; 3945 break;
3884 3946
3885#if ENABLE_FRILLS 3947 case URxvt_version:
3948 if (query)
3949 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3950 op,
3951 rs[Rs_name], VERSION[0], VERSION[2],
3952 resp);
3953 break;
3954
3955#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3956 case URxvt_locale:
3887 if (query) 3957 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3889 else 3959 else
3890 { 3960 {
3891 set_locale (str); 3961 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3963 init_xlocale ();
3894 } 3964 }
3895 break; 3965 break;
3896 3966
3897 case URxvt_view_up: 3967 case URxvt_view_up:
3898 case URxvt_view_down: 3968 case URxvt_view_down:
3969 {
3899 int lines = atoi (str); 3970 int lines = atoi (str);
3900 3971
3901 if (lines) 3972 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3973 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3974 else
3904 {
3905 scr_erase_savelines (); 3975 scr_erase_savelines ();
3906 } 3976 }
3907 3977
3978 break;
3979#endif
3980
3981#if ENABLE_PERL
3982 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3984 ; // no responses yet
3908 break; 3985 break;
3909#endif 3986#endif
3910 } 3987 }
3911} 3988}
3912/*----------------------------------------------------------------------*/ 3989/*----------------------------------------------------------------------*/
… …
3943 return state; 4020 return state;
3944} 4021}
3945 4022
3946/* we're not using priv _yet_ */ 4023/* we're not using priv _yet_ */
3947void 4024void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4025rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 4026{
3950 unsigned int i, j; 4027 unsigned int i, j;
3951 int state; 4028 int state;
3952 4029
3953 static const struct 4030 static const struct
… …
3964 { 5, PrivMode_rVideo }, 4041 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 4042 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 4043 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 4044 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 4045 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 4046 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 4047 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 4050#endif
… …
4021 } 4095 }
4022 4096
4023 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4098 switch (arg[i])
4025 { 4099 {
4100#if ENABLE_STYLES
4101 case 1021:
4102 set_option (Opt_intensityStyles, mode);
4103
4104 scr_touch (true);
4105 break;
4106#endif
4026 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4027 case 1049: 4108 case 1049:
4028 if (options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
4029 if (mode == 0) 4110 if (mode == 0)
4030 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
4031 else if (mode == 1) 4112 else if (mode == 1)
4032 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
4033 break; 4114 break;
… …
4048 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 4132 break;
4052 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 4134 set_option (Opt_jumpScroll, !state);
4057 break; 4135 break;
4058 case 5: /* reverse video */ 4136 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4137 scr_rvideo_mode (state);
4060 break; 4138 break;
4061 case 6: /* relative/absolute origins */ 4139 case 6: /* relative/absolute origins */
… …
4067 /* case 8: - auto repeat, can't do on a per window basis */ 4145 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 4146 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 4147 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 4148 priv_modes &= ~PrivMode_MouseX11;
4071 break; 4149 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 4150#ifdef scrollBar_esc
4080 case scrollBar_esc: 4151 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 4152 if (scrollbar_mapping (state))
4082 { 4153 {
4083 resize_all_windows (0, 0, 0); 4154 resize_all_windows (0, 0, 0);
… …
4102#if 0 4173#if 0
4103 case 1001: 4174 case 1001:
4104 break; /* X11 mouse highlighting */ 4175 break; /* X11 mouse highlighting */
4105#endif 4176#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4177 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 4178 set_option (Opt_scrollTtyOutput, !state);
4111 break; 4179 break;
4112 case 1011: /* scroll to bottom on key press */ 4180 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 4181 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 4182 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4183 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4184 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4185 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4186 scr_erase_screen (2);
4122 scr_change_screen (state); 4187 scr_change_screen (state);
4123 break; 4188 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4189 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4190 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4191 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4192 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4193 scr_erase_screen (2);
4129 break; 4194 break;
4130 default: 4195 default:
4131 break; 4196 break;
… …
4259 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4260 break; 4325 break;
4261 4326
4262 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4263 4328
4264#ifndef NO_BRIGHTCOLOR 4329#if !ENABLE_MINIMAL
4265 case 90: 4330 case 90:
4266 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4267 case 92: 4332 case 92:
4268 case 93: 4333 case 93:
4269 case 94: 4334 case 94:
… …
4281 case 106: 4346 case 106:
4282 case 107: 4347 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4349 break;
4285#endif 4350#endif
4286
4287 } 4351 }
4288 } 4352 }
4289} 4353}
4290/*}}} */ 4354/*}}} */
4291 4355
… …
4315 */ 4379 */
4316void 4380void
4317rxvt_term::tt_printf (const char *fmt,...) 4381rxvt_term::tt_printf (const char *fmt,...)
4318{ 4382{
4319 va_list arg_ptr; 4383 va_list arg_ptr;
4320 unsigned char buf[256]; 4384 char buf[256];
4321 4385
4322 va_start (arg_ptr, fmt); 4386 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4387 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4388 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4389 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 4394 * or generated by us in response to a query ESC sequence.
4331 */ 4395 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4396const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 4397
4334void 4398void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4399rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 4400{
4401 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4402 return;
4403
4404 if (pty->pty < 0)
4405 return;
4406
4337 if (v_buflen == 0) 4407 if (v_buflen == 0)
4338 { 4408 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4409 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 4410
4341 if ((unsigned int)written == len) 4411 if ((unsigned int)written == len)
4342 return; 4412 return;
4343 4413
4344 data += written; 4414 data += written;
4345 len -= written; 4415 len -= written;
4346 } 4416 }
4347 4417
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4418 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4419
4350 memcpy (v_buffer + v_buflen, data, len); 4420 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4421 v_buflen += len;
4352 4422
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4423 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354} 4424}
4355 4425
4356void rxvt_term::pty_write () 4426void rxvt_term::pty_write ()
4357{ 4427{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4428 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 4429
4360 if (written > 0) 4430 if (written > 0)
4361 { 4431 {
4362 v_buflen -= written; 4432 v_buflen -= written;
4363 4433
… …
4372 } 4442 }
4373 4443
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4444 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4445 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4446 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this... 4447 pty_ev.set (EVENT_READ);
4378 destroy ();
4379} 4448}
4380 4449
4381/*----------------------- end-of-file (C source) -----------------------*/ 4450/*----------------------- end-of-file (C source) -----------------------*/
4382 4451

Diff Legend

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