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.211 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 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.
1109
1110 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0);
1112
1113 w.stop ();
1114 }
1115
1116 event_handler ()
1117 : yield_ev (this, &event_handler::yield_cb)
1118 {
1119 }
1120} event_handler;
1121#endif
1122
1050bool 1123bool
1051rxvt_term::pty_fill () 1124rxvt_term::pty_fill ()
1052{ 1125{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1126 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1127
1055 if (CBUFSIZ == n) 1128 if (CBUFSIZ == n)
1056 { 1129 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1130 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1131 n = 0;
1059 } 1132 }
1060 1133
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1134 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1135 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1136 cmdbuf_endp = cmdbuf_ptr + n;
1064 1137
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1138 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1139
1067 if (n > 0) 1140 if (r > 0)
1068 { 1141 {
1069 cmdbuf_endp += n; 1142 cmdbuf_endp += r;
1070 return true; 1143 return true;
1071 } 1144 }
1072 else if (n < 0 && errno != EAGAIN) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1146 {
1147#if LINUX_YIELD_HACK
1148 if (display->is_local)
1149 event_handler.yield_ev.start ();
1150#endif
1151 }
1152 else
1153 {
1154 pty_ev.stop ();
1155
1156 if (!OPTION (Opt_hold))
1073 destroy (); 1157 destroy ();
1158 }
1074 1159
1075 return false; 1160 return false;
1076} 1161}
1077 1162
1078void 1163void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1164rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1165{
1081 SET_R (this); 1166 make_current ();
1082 SET_LOCALE (locale);
1083 1167
1084 if (revents & EVENT_READ) 1168 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1169 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1170 while (pty_fill ())
1087 if (cmd_parse ()) 1171 if (cmd_parse ())
… …
1092} 1176}
1093 1177
1094void 1178void
1095rxvt_term::pointer_unblank () 1179rxvt_term::pointer_unblank ()
1096{ 1180{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1181 XDefineCursor (xdisp, vt, TermWin_cursor);
1098 recolour_cursor (); 1182 recolour_cursor ();
1099 1183
1100#ifdef POINTER_BLANK 1184#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1185 hidden_pointer = 0;
1102 1186
1103 if (options & Opt_pointerBlank) 1187 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1188 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1189#endif
1106} 1190}
1107 1191
1108#ifdef POINTER_BLANK 1192#ifdef POINTER_BLANK
1109void 1193void
1110rxvt_term::pointer_blank () 1194rxvt_term::pointer_blank ()
1111{ 1195{
1112 if (! (options & Opt_pointerBlank)) 1196 if (!OPTION (Opt_pointerBlank))
1113 return; 1197 return;
1114 1198
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1199 XDefineCursor (xdisp, vt, display->blank_cursor);
1116 XFlush (display->display); 1200 XFlush (xdisp);
1117 1201
1118 hidden_pointer = 1; 1202 hidden_pointer = 1;
1119} 1203}
1120 1204
1121void 1205void
1122rxvt_term::pointer_cb (time_watcher &w) 1206rxvt_term::pointer_cb (time_watcher &w)
1123{ 1207{
1124 SET_R (this); 1208 make_current ();
1125 SET_LOCALE (locale);
1126 1209
1127 pointer_blank (); 1210 pointer_blank ();
1128} 1211}
1129#endif 1212#endif
1130 1213
… …
1195 (32 + button_number + key_state), 1278 (32 + button_number + key_state),
1196 (32 + x + 1), 1279 (32 + x + 1),
1197 (32 + y + 1)); 1280 (32 + y + 1));
1198} 1281}
1199 1282
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 */ 1283/*{{{ process an X event */
1211void 1284void
1212rxvt_term::x_cb (XEvent &ev) 1285rxvt_term::x_cb (XEvent &ev)
1213{ 1286{
1214 dDisp; 1287 make_current ();
1215 1288
1216 SET_R (this); 1289 dLocal (Display *, xdisp);
1217 SET_LOCALE (locale);
1218 1290
1219#if defined(CURSOR_BLINK) 1291 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1292 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1294 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1295
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1296 // 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; 1297 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1298 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1299 unsigned int unused_mask;
1249 1300
1250 switch (ev.type) 1301 switch (ev.type)
… …
1257 1308
1258 break; 1309 break;
1259 1310
1260 case KeyRelease: 1311 case KeyRelease:
1261 { 1312 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1314 KeySym keysym;
1264 1315
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1317#endif
1267 1318
1268#if ENABLE_FRILLS || ISO_14755 1319#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1320 // ISO 14755 support
1270 if (iso14755buf) 1321 if (iso14755buf)
… …
1275# endif 1326# endif
1276# if ISO_14755 1327# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1328 // iso14755 part 5.2 handling: release time
1278 // first: controls 1329 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1330 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1333 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1335 commit_iso14755 ();
1285 return; // case-break; 1336 goto skip_switch;
1286 } 1337 }
1287 1338
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1340 if (i[0] == keysym)
1290 { 1341 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1342 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1343 commit_iso14755 ();
1293 return; // case-break; 1344 goto skip_switch;
1294 } 1345 }
1295 1346
1296 scr_bell (); 1347 scr_bell ();
1297# endif 1348# endif
1298 iso14755buf = 0; 1349 iso14755buf = 0;
… …
1317 else 1368 else
1318 iso14755buf = 0; 1369 iso14755buf = 0;
1319 } 1370 }
1320#endif 1371#endif
1321 1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1327#endif 1382#endif
1328 break; 1383 break;
1329 } 1384 }
1330 1385
… …
1336 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1337 break; 1392 break;
1338 1393
1339 case ClientMessage: 1394 case ClientMessage:
1340 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1396 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1397 {
1398 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1399 {
1400 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1401 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1402 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1405 destroy ();
1406 }
1345#if ENABLE_EWMH 1407#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1409 XSendEvent (xdisp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1410 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1411 &ev);
1412#endif
1413 }
1414 }
1415#if ENABLE_XEMBED
1416 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1417 {
1418 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1419 focus_in ();
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out ();
1422 }
1350#endif 1423#endif
1351 } 1424 }
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; 1425 break;
1388 1426
1389 case MappingNotify: 1427 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1428 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1429 break;
… …
1424 break; 1462 break;
1425 1463
1426 case ConfigureNotify: 1464 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent[0])
1428 { 1466 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1468 ;
1431 1469
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1471 {
1434 seen_resize = 1; 1472 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1474 }
1437 1475
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent) 1479 if (OPTION (Opt_transparent))
1440 check_our_parents (); 1480 check_our_parents ();
1441#endif 1481#endif
1442 } 1482 }
1443 break; 1483 break;
1444 1484
1445 case PropertyNotify: 1485 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1488 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1489 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1490
1450 break; 1491 break;
1451 1492
1452 case SelectionClear: 1493 case SelectionClear:
1453 selection_clear (); 1494 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1500 break;
1460 1501
1461 case SelectionRequest: 1502 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1504 break;
1505
1506 case MapNotify:
1507 mapped = 1;
1508#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1510#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1512 break;
1464 1513
1465 case UnmapNotify: 1514 case UnmapNotify:
1466 mapped = 0; 1515 mapped = 0;
1467#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1517 text_blink_ev.stop ();
1469#endif 1518#endif
1470 break; 1519 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; 1520 break;
1478 1521
1479#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1480 case ReparentNotify: 1523 case ReparentNotify:
1481 rootwin_cb (ev); 1524 rootwin_cb (ev);
… …
1487 if (ev.xany.window == vt) 1530 if (ev.xany.window == vt)
1488 { 1531 {
1489 do 1532 do
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1493 1536
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1538
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1499 1542
1500 scr_refresh (refresh_type); 1543 want_refresh = 1;
1501 } 1544 }
1502 else 1545 else
1503 { 1546 {
1504 XEvent unused_event; 1547 XEvent unused_event;
1505 1548
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1507 ; 1550 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1552 ;
1510 1553
1511 if (isScrollbarWindow (ev.xany.window)) 1554 if (isScrollbarWindow (ev.xany.window))
1512 { 1555 {
1513 scrollBar.setIdle (); 1556 scrollBar.setIdle ();
1514 scrollbar_show (0); 1557 scrollbar_show (0);
1515 } 1558 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520 1559
1521#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0]) 1561 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window); 1562 XClearWindow (xdisp, ev.xany.window);
1524#endif 1563#endif
1525 } 1564 }
1526 break; 1565 break;
1527 1566
1528 case MotionNotify: 1567 case MotionNotify:
1529#ifdef POINTER_BLANK 1568#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1569 if (hidden_pointer)
1531 pointer_unblank (); 1570 pointer_unblank ();
1532#endif 1571#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) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1573 break;
1542 1574
1543 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1544 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1581 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1548 ; 1583 ;
1549 1584
1550 XQueryPointer (disp, vt, 1585 XQueryPointer (xdisp, vt,
1551 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1589 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1600 } 1635 }
1601 1636
1602 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1603 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1604 + 1; 1639 + 1;
1605 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1606 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1607 } 1642 }
1608 else 1643 else
1609 { 1644 {
1610 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1619#endif 1654#endif
1620 } 1655 }
1621 } 1656 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1623 { 1658 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1625 MotionNotify, &ev)) 1660 MotionNotify, &ev))
1626 ; 1661 ;
1627 1662
1628 XQueryPointer (disp, scrollBar.win, 1663 XQueryPointer (xdisp, scrollBar.win,
1629 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1666 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1667 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1669 scrollbar_size ());
1635 scr_refresh (refresh_type); 1670 want_refresh = 1;
1636 refresh_limit = 0; 1671 refresh_limit = 0;
1637 scrollbar_show (1); 1672 scrollbar_show (1);
1638 } 1673 }
1639 break; 1674 break;
1640 } 1675 }
1676
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 }
1690#endif
1691
1692#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 {
1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer)
1699 pointer_unblank ();
1700
1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank ();
1703 }
1704#endif
1641} 1705}
1642 1706
1643void 1707void
1644rxvt_term::focus_in () 1708rxvt_term::focus_in ()
1645{ 1709{
1646 if (!focus) 1710 if (!focus)
1647 { 1711 {
1648 focus = 1; 1712 focus = 1;
1649 want_refresh = 1; 1713 want_refresh = 1;
1714
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1716
1650#if USE_XIM 1717#if USE_XIM
1651 if (Input_Context != NULL) 1718 if (Input_Context != NULL)
1652 { 1719 {
1653 IMSetStatusPosition (); 1720 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context); 1721 XSetICFocus (Input_Context);
1655 } 1722 }
1656#endif 1723#endif
1657#if CURSOR_BLINK 1724#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1725 if (OPTION (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1660#endif 1727#endif
1661#if OFF_FOCUS_FADING 1728#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1729 if (rs[Rs_fade])
1663 { 1730 {
1664 pix_colors = pix_colors_focused; 1731 pix_colors = pix_colors_focused;
… …
1674 if (focus) 1741 if (focus)
1675 { 1742 {
1676 focus = 0; 1743 focus = 0;
1677 want_refresh = 1; 1744 want_refresh = 1;
1678 1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1679#if ENABLE_FRILLS || ISO_14755 1748#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf)
1750 {
1680 iso14755buf = 0; 1751 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY 1752# if ENABLE_OVERLAY
1683 scr_overlay_off (); 1753 scr_overlay_off ();
1754# endif
1755 }
1684#endif 1756#endif
1685#if USE_XIM 1757#if USE_XIM
1686 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1759 XUnsetICFocus (Input_Context);
1688#endif 1760#endif
1689#if CURSOR_BLINK 1761#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1762 if (OPTION (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1763 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1764 hidden_cursor = 0;
1693#endif 1765#endif
1694#if OFF_FOCUS_FADING 1766#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1767 if (rs[Rs_fade])
… …
1703 1775
1704#if TRANSPARENT 1776#if TRANSPARENT
1705void 1777void
1706rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1779{
1708 SET_R (this); 1780 make_current ();
1709 SET_LOCALE (locale);
1710 1781
1711 switch (ev.type) 1782 switch (ev.type)
1712 { 1783 {
1713 case PropertyNotify: 1784 case PropertyNotify:
1714 /* 1785 /*
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1791 return;
1721 1792
1722 /* FALLTHROUGH */ 1793 /* FALLTHROUGH */
1723 case ReparentNotify: 1794 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1796 want_refresh = want_full_refresh = 1;
1726 break; 1797 break;
1727 } 1798 }
1728} 1799}
1729#endif 1800#endif
… …
1732rxvt_term::button_press (XButtonEvent &ev) 1803rxvt_term::button_press (XButtonEvent &ev)
1733{ 1804{
1734 int reportmode = 0, clickintime; 1805 int reportmode = 0, clickintime;
1735 1806
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1807 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1808
1737 if (!bypass_keystate) 1809 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1810 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1811
1740 /* 1812 /*
1741 * VT window processing of button press 1813 * VT window processing of button press
1742 */ 1814 */
1743 if (ev.window == vt) 1815 if (ev.window == vt)
1744 { 1816 {
1817 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1745#if ISO_14755 1820#if ISO_14755
1746 // 5.4 1821 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1823 {
1749 iso14755_54 (ev.x, ev.y); 1824 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1836#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1837 if (ev.button == MEvent.button && clickintime)
1763 { 1838 {
1764 /* same button, within alloted time */ 1839 /* same button, within alloted time */
1765 MEvent.clicks++; 1840 MEvent.clicks++;
1841
1766 if (MEvent.clicks > 1) 1842 if (MEvent.clicks > 1)
1767 { 1843 {
1768 /* only report double clicks */ 1844 /* only report double clicks */
1769 MEvent.clicks = 2; 1845 MEvent.clicks = 2;
1770 mouse_report (ev); 1846 mouse_report (ev);
… …
1802#else 1878#else
1803 selection.rect = false; 1879 selection.rect = false;
1804#endif 1880#endif
1805 1881
1806 /* allow shift+left click to extend selection */ 1882 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1883 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1884 {
1809 if (MEvent.button == Button1 && clickintime) 1885 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1886 selection_rotate (ev.x, ev.y);
1811 else 1887 else
1812 selection_extend (ev.x, ev.y, 1); 1888 selection_extend (ev.x, ev.y, 1);
… …
1977 } 2053 }
1978 2054
1979 break; 2055 break;
1980 } 2056 }
1981 } 2057 }
2058
1982 return; 2059 return;
1983 } 2060 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2061}
1992 2062
1993void 2063void
1994rxvt_term::button_release (XButtonEvent &ev) 2064rxvt_term::button_release (XButtonEvent &ev)
1995{ 2065{
… …
2001 2071
2002 if (scrollbar_isUpDn ()) 2072 if (scrollbar_isUpDn ())
2003 { 2073 {
2004 scrollBar.setIdle (); 2074 scrollBar.setIdle ();
2005 scrollbar_show (0); 2075 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2076 }
2010 2077
2011#ifdef SELECTION_SCROLLING 2078#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active) 2079 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2080 sel_scroll_ev.stop();
2014#endif 2081#endif
2015 2082
2016 if (ev.window == vt) 2083 if (ev.window == vt)
2017 { 2084 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2086 return;
2087
2018#if ISO_14755 2088#if ISO_14755
2019 // 5.4 2089 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2090 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2091 return;
2022#endif 2092#endif
2093
2023 if (reportmode) 2094 if (reportmode)
2024 { 2095 {
2025 /* mouse report from vt window */ 2096 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
2057 { 2128 {
2058 case Button1: 2129 case Button1:
2059 case Button3: 2130 case Button3:
2060 selection_make (ev.time); 2131 selection_make (ev.time);
2061 break; 2132 break;
2133
2062 case Button2: 2134 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2064 break; 2137 break;
2138
2065#ifdef MOUSE_WHEEL 2139#ifdef MOUSE_WHEEL
2066 case Button4: 2140 case Button4:
2067 case Button5: 2141 case Button5:
2068 { 2142 {
2069 int i; 2143 int i;
… …
2071 2145
2072 v = ev.button == Button4 ? UP : DN; 2146 v = ev.button == Button4 ? UP : DN;
2073 2147
2074 if (ev.state & ShiftMask) 2148 if (ev.state & ShiftMask)
2075 i = 1; 2149 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2150 else if (OPTION (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2151 i = nrow - 1;
2078 else 2152 else
2079 i = 5; 2153 i = 5;
2080 2154
2081# ifdef MOUSE_SLIP_WHEELING 2155# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2165 slip_wheel_ev.start ();
2092 } 2166 }
2093 else 2167 else
2094 { 2168 {
2095# endif 2169# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2170 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2171 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 2172# ifdef MOUSE_SLIP_WHEELING
2109 } 2173 }
2110#endif 2174# endif
2111 } 2175 }
2112 break; 2176 break;
2113#endif 2177#endif
2114 } 2178 }
2115 } 2179 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2180}
2121 2181
2122#ifdef TRANSPARENT 2182#ifdef TRANSPARENT
2123#if TINTING 2183#if TINTING
2124/* taken from aterm-0.4.2 */ 2184/* taken from aterm-0.4.2 */
2125 2185
2126typedef uint32_t RUINT32T; 2186typedef uint32_t RUINT32T;
2127 2187
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{ 2189{
2130 int sh_r, sh_g, sh_b; 2190 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b; 2191 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i; 2195 int i;
2136 2196
2137 Visual *visual = display->visual; 2197 Visual *visual = term->visual;
2138 2198
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140 2200
2141 /* for convenience */ 2201 /* for convenience */
2142 mask_r = visual->red_mask; 2202 mask_r = visual->red_mask;
… …
2363 Atom atype; 2423 Atom atype;
2364 unsigned char *prop = NULL; 2424 unsigned char *prop = NULL;
2365 Window root, oldp, *list; 2425 Window root, oldp, *list;
2366 Pixmap rootpixmap = None; 2426 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr; 2427 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369 2428
2370 pchanged = 0; 2429 pchanged = 0;
2371 2430
2372 if (!(options & Opt_transparent)) 2431 if (!OPTION (Opt_transparent))
2373 return pchanged; /* Don't try any more */ 2432 return pchanged; /* Don't try any more */
2374 2433
2375 XGetWindowAttributes (disp, display->root, &wrootattr); 2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth; 2435 rootdepth = wrootattr.depth;
2377 2436
2378 XGetWindowAttributes (disp, parent[0], &wattr); 2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2379 2438
2380 if (rootdepth != wattr.depth) 2439 if (rootdepth != wattr.depth)
2381 { 2440 {
2382 if (am_transparent) 2441 if (am_transparent)
2383 { 2442 {
2384 pchanged = 1; 2443 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0; 2445 am_transparent = am_pixmap_trans = 0;
2387 } 2446 }
2388 2447
2389 return pchanged; /* Don't try any more */ 2448 return pchanged; /* Don't try any more */
2390 } 2449 }
2391 2450
2392 /* Get all X ops out of the queue so that our information is up-to-date. */ 2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False); 2452 XSync (xdisp, False);
2394 2453
2395 /* 2454 /*
2396 * Make the frame window set by the window manager have 2455 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame 2456 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that. 2457 * windows for each client, so we have to take care about that.
2399 */ 2458 */
2400 i = (xa[XA_XROOTPMAP_ID] 2459 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success); 2462 &nitems, &bytes_after, &prop) == Success);
2404 2463
2405 if (!i || prop == NULL) 2464 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID] 2465 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2410 2469
2411 if (!i || prop == NULL 2470 if (!i || prop == NULL
2412#if TINTING 2471#if TINTING
2413 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2414#endif 2473#endif
2415 ) 2474 )
2416 have_pixmap = 0; 2475 have_pixmap = 0;
2417 else 2476 else
2418 { 2477 {
… …
2431 Window cr; 2490 Window cr;
2432 XImage *image; 2491 XImage *image;
2433 GC gc; 2492 GC gc;
2434 XGCValues gcvalue; 2493 XGCValues gcvalue;
2435 2494
2436 XTranslateCoordinates (disp, parent[0], display->root, 2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr); 2496 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width; 2497 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height; 2498 nh = (unsigned int)szHint.height;
2440 nx = ny = 0; 2499 nx = ny = 0;
2441 2500
… …
2451 nh += sy; 2510 nh += sy;
2452 ny = -sy; 2511 ny = -sy;
2453 sy = 0; 2512 sy = 0;
2454 } 2513 }
2455 2514
2456 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458 2517
2459 XSync (disp, False); 2518 XSync (xdisp, False);
2460 allowedxerror = -1; 2519 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462 2521
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */ 2523 /* XXX: may need a delay here? */
2465 allowedxerror = 0; 2524 allowedxerror = 0;
2466 2525
… …
2469 if (am_transparent && am_pixmap_trans) 2528 if (am_transparent && am_pixmap_trans)
2470 { 2529 {
2471 pchanged = 1; 2530 pchanged = 1;
2472 if (pixmap != None) 2531 if (pixmap != None)
2473 { 2532 {
2474 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2475 pixmap = None; 2534 pixmap = None;
2476 } 2535 }
2477 } 2536 }
2478 2537
2479 am_pixmap_trans = 0; 2538 am_pixmap_trans = 0;
2480 } 2539 }
2481 else 2540 else
2482 { 2541 {
2483 if (pixmap != None) 2542 if (pixmap != None)
2484 XFreePixmap (disp, pixmap); 2543 XFreePixmap (xdisp, pixmap);
2485 2544
2486#if TINTING 2545#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2488 { 2547 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491 2549
2550 rgba c;
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2493 2552
2494 ShadeXImage (display, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2495 } 2554 }
2496#endif 2555#endif
2497 2556
2498 pixmap = XCreatePixmap (disp, vt, 2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0, 2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height); 2560 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc); 2561 XFreeGC (xdisp, gc);
2504 XDestroyImage (image); 2562 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]); 2564 XClearWindow (xdisp, parent[0]);
2507 2565
2508 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1; 2567 pchanged = 1;
2510 2568
2511 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2512 } 2570 }
2513 } 2571 }
2514 2572
2515 if (am_pixmap_trans) 2573 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2517 else 2575 else
2518 { 2576 {
2519 unsigned int n; 2577 unsigned int n;
2520 /* 2578 /*
2521 * InheritPixmap transparency 2579 * InheritPixmap transparency
2522 */ 2580 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 { 2582 {
2525 oldp = parent[i]; 2583 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2527 &parent[i], &list, &n);
2528 XFree (list); 2585 XFree (list);
2529 2586
2530 if (parent[i] == display->root) 2587 if (parent[i] == display->root)
2531 { 2588 {
2532 if (oldp != None) 2589 if (oldp != None)
… …
2540 } 2597 }
2541 2598
2542 n = 0; 2599 n = 0;
2543 2600
2544 if (pchanged) 2601 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2547 { 2603 {
2548 XGetWindowAttributes (disp, parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 { 2607 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break; 2609 break;
2553 } 2610 }
2554 } 2611 }
2555 }
2556 2612
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2558 { 2614 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0; 2617 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
2563 } 2619 }
2564 else 2620 else
2565 { 2621 {
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++) 2622 for (n = 0; n < (unsigned int)i; n++)
2572 { 2623 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]); 2625 XClearWindow (xdisp, parent[n]);
2575 } 2626 }
2576 2627
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2578 am_transparent = 1; 2629 am_transparent = 1;
2579 } 2630 }
2580 2631
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None; 2633 parent[i] = None;
2583 } 2634 }
2584 2635
2585 if (scrollBar.win) 2636 if (scrollBar.win)
2586 { 2637 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle (); 2639 scrollBar.setIdle ();
2589 scrollbar_show (0); 2640 scrollbar_show (0);
2590 } 2641 }
2591 2642
2592 if (am_transparent) 2643 if (am_transparent)
… …
2604 2655
2605bool 2656bool
2606rxvt_term::cmd_parse () 2657rxvt_term::cmd_parse ()
2607{ 2658{
2608 bool flag = false; 2659 bool flag = false;
2609 unicode_t ch = NOCHAR; 2660 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2661 char *seq_begin; // remember start of esc-sequence here
2611 2662
2612 for (;;) 2663 for (;;)
2613 { 2664 {
2614 if (ch == NOCHAR) 2665 if (ch == NOCHAR)
2615 { 2666 {
2616 seq_begin = cmdbuf_ptr; 2667 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2668 ch = next_char ();
2618 }
2619 2669
2620 if (ch == NOCHAR) // TODO: improve 2670 if (ch == NOCHAR)
2621 break; 2671 break;
2672 }
2622 2673
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2674 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2675 {
2625 if (!seen_input) 2676 if (!seen_input)
2626 { 2677 {
… …
2635 if (seen_resize && cmd_pid) 2686 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2687 kill (-cmd_pid, SIGWINCH);
2637 } 2688 }
2638 2689
2639 /* Read a text string from the input buffer */ 2690 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2691 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2692 bool refreshnow = false;
2642 int nlines = 0; 2693 int nlines = 0;
2643 unicode_t *str = buf; 2694 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2695 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2696
2646 for (;;) 2697 for (;;)
2647 { 2698 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2699 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2700 break;
… …
2655 if (ch == C0_LF) 2706 if (ch == C0_LF)
2656 nlines++; 2707 nlines++;
2657 2708
2658 refresh_count++; 2709 refresh_count++;
2659 2710
2660 if (!(options & Opt_jumpScroll) 2711 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1))) 2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2713 {
2663 refreshnow = true; 2714 refreshnow = true;
2715 refresh_count = 0;
2664 ch = NOCHAR; 2716 ch = NOCHAR;
2665 break; 2717 break;
2666 } 2718 }
2667 2719
2668 // scr_add_lines only works for nlines <= nrow - 1. 2720 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2721 if (nlines >= nrow - 1)
2670 { 2722 {
2723 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2724 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2725 scr_add_lines (buf, str - buf, nlines);
2726
2672 nlines = 0; 2727 nlines = 0;
2673 str = buf; 2728 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2729 eol = str + min (ncol, UBUFSIZ);
2675 } 2730 }
2676 2731
… …
2689 2744
2690 seq_begin = cmdbuf_ptr; 2745 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2746 ch = next_char ();
2692 } 2747 }
2693 2748
2749 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2751 scr_add_lines (buf, str - buf, nlines);
2695 2752
2696 /* 2753 /*
2697 * If there have been a lot of new lines, then update the screen 2754 * 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. 2755 * 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 2756 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling. 2757 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2758 */
2702 if (refreshnow) 2759 if (refreshnow)
2703 { 2760 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++; 2762 refresh_limit++;
2706 else 2763 else
2707 { 2764 {
2708 flag = true; 2765 flag = true;
2709 scr_refresh (refresh_type); 2766 scr_refresh ();
2767 want_refresh = 1;
2710 } 2768 }
2711 } 2769 }
2712 2770
2713 } 2771 }
2714 else 2772 else
… …
2729 } 2787 }
2730 2788
2731 return flag; 2789 return flag;
2732} 2790}
2733 2791
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 2792// read the next character
2744unicode_t 2793wchar_t
2745rxvt_term::next_char () 2794rxvt_term::next_char () NOTHROW
2746{ 2795{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2796 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2797 {
2749 // assume 7-bit to be ascii ALWAYS 2798 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2800 return *cmdbuf_ptr++;
2752 2801
2753 wchar_t wc; 2802 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2803 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2804
2756 if (len == (size_t)-2) 2805 if (len == (size_t)-2)
2757 { 2806 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2807 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2808 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2809 break;
2761 } 2810 }
2762 2811
2763 if (len == (size_t)-1) 2812 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2813 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2814
2766 // assume wchar == unicode 2815 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2816 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2817 return wc & UNICODE_MASK;
2769 } 2818 }
2770 2819
2771 return NOCHAR; 2820 return NOCHAR;
2772} 2821}
2822
2823// read the next octet
2824uint32_t
2825rxvt_term::next_octet () NOTHROW
2826{
2827 return cmdbuf_ptr < cmdbuf_endp
2828 ? (unsigned char)*cmdbuf_ptr++
2829 : NOCHAR;
2830}
2831
2832static class out_of_input out_of_input;
2773 2833
2774/* rxvt_cmd_getc () - Return next input character */ 2834/* rxvt_cmd_getc () - Return next input character */
2775/* 2835/*
2776 * Return the next input character after first passing any keyboard input 2836 * Return the next input character after first passing any keyboard input
2777 * to the command. 2837 * to the command.
2778 */ 2838 */
2779unicode_t 2839wchar_t
2780rxvt_term::cmd_getc () 2840rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2841{
2782 unicode_t c = next_char (); 2842 wchar_t c = next_char ();
2783 2843
2784 if (c == NOCHAR) 2844 if (c == NOCHAR)
2785 throw out_of_input; 2845 throw out_of_input;
2786 2846
2787 return c; 2847 return c;
2788} 2848}
2789 2849
2790unicode_t 2850uint32_t
2791rxvt_term::cmd_get8 () 2851rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2852{
2793 unicode_t c = next_octet (); 2853 uint32_t c = next_octet ();
2794 2854
2795 if (c == NOCHAR) 2855 if (c == NOCHAR)
2796 throw out_of_input; 2856 throw out_of_input;
2797 2857
2798 return c; 2858 return c;
… …
2898 case C0_ESC: 2958 case C0_ESC:
2899 process_escape_seq (); 2959 process_escape_seq ();
2900 break; 2960 break;
2901 case C0_ENQ: /* terminal Status */ 2961 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2962 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2963 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2964 else
2906 tt_write ((unsigned char *)VT100_ANS, 2965 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2966 break;
2909 case C0_BEL: /* bell */ 2967 case C0_BEL: /* bell */
2910 scr_bell (); 2968 scr_bell ();
2911 break; 2969 break;
2912 case C0_BS: /* backspace */ 2970 case C0_BS: /* backspace */
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 3095 break;
3038 case '+': 3096 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 3098 break;
3041#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3042 case '6': 3100 case '6':
3043 scr_backindex (); 3101 scr_backindex ();
3044 break; 3102 break;
3045#endif 3103#endif
3046 case '7': 3104 case '7':
3047 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
3048 break; 3106 break;
3049 case '8': 3107 case '8':
3050 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
3051 break; 3109 break;
3052#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3053 case '9': 3111 case '9':
3054 scr_forwardindex (); 3112 scr_forwardindex ();
3055 break; 3113 break;
3056#endif 3114#endif
3057 case '=': 3115 case '=':
… …
3067 break; 3125 break;
3068 3126
3069 /* 8.3.87: NEXT LINE */ 3127 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 3128 case C1_NEL: /* ESC E */
3071 { 3129 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 3130 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 3131 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 3132 }
3075 break; 3133 break;
3076 3134
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 3135 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 3136 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 3158 process_dcs_seq ();
3101 break; 3159 break;
3102 3160
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3161 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 3162 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 3163 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 3164 break; /* steal obsolete ESC [ c */
3108 3165
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3166 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 3167 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 3168 process_csi_seq ();
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 3277 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 3278 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 3279 if (arg[p] == -1)
3223 arg[p] = ndef; 3280 arg[p] = ndef;
3224 3281
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 /* 3282 /*
3233 * private mode handling 3283 * private mode handling
3234 */ 3284 */
3235 if (priv) 3285 if (priv)
3236 { 3286 {
3237 switch (priv) 3287 switch (priv)
3238 { 3288 {
3239 case '>': 3289 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 3290 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3291 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3297 // that we do not support xterm mouse reporting (should be 95 when we do).
3298 //
3299 tt_printf ("\033[>%d;94;0c", 'U');
3300 }
3242 break; 3301 break;
3243 case '?': 3302 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 3304 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 3305 break;
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3414 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3415 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 3416 break;
3358 3417
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3418 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 3419 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 3420 break;
3363 3421
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3422 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 3423 process_sgr_mode (nargs, arg);
3366 break; 3424 break;
… …
3373 break; 3431 break;
3374 case 6: /* CPR requested */ 3432 case 6: /* CPR requested */
3375 scr_report_position (); 3433 scr_report_position ();
3376 break; 3434 break;
3377 case 7: /* unofficial extension */ 3435 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3436 if (OPTION (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3437 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3438 break;
3381 case 8: /* unofficial extension */ 3439 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3441 break;
… …
3450 break; 3508 break;
3451 case CSI_75: 3509 case CSI_75:
3452 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3453 break; 3511 break;
3454 3512
3455#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3456 case CSI_74: 3514 case CSI_74:
3457 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3458 break; 3516 break;
3459#endif 3517#endif
3460 3518
… …
3467 break; 3525 break;
3468 } 3526 }
3469} 3527}
3470/*}}} */ 3528/*}}} */
3471 3529
3472#if ENABLE_FRILLS 3530#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3531/* ARGSUSED */
3474void 3532void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3534{
3477 int x, y; 3535 int x, y;
3478 XWindowAttributes wattr; 3536 XWindowAttributes wattr;
3479 Window wdummy; 3537 Window wdummy;
3480 dDisp; 3538
3539 dLocal (Display *, xdisp);
3481 3540
3482 if (nargs == 0) 3541 if (nargs == 0)
3483 return; 3542 return;
3484 3543
3485 switch (args[0]) 3544 switch (args[0])
3486 { 3545 {
3487 /* 3546 /*
3488 * commands 3547 * commands
3489 */ 3548 */
3490 case 1: /* deiconify window */ 3549 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3550 XMapWindow (xdisp, parent[0]);
3492 break; 3551 break;
3493 case 2: /* iconify window */ 3552 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3553 XIconifyWindow (xdisp, parent[0], display->screen);
3495 break; 3554 break;
3496 case 3: /* set position (pixels) */ 3555 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3556 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3498 break; 3557 break;
3499 case 4: /* set size (pixels) */ 3558 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3560 break;
3502 case 5: /* raise window */ 3561 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3562 XRaiseWindow (xdisp, parent[0]);
3504 break; 3563 break;
3505 case 6: /* lower window */ 3564 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3565 XLowerWindow (xdisp, parent[0]);
3507 break; 3566 break;
3508 case 7: /* refresh window */ 3567 case 7: /* refresh window */
3509 scr_touch (true); 3568 scr_touch (true);
3510 break; 3569 break;
3511 case 8: /* set size (chars) */ 3570 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3578 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3579 (unsigned int) (args[1] * fheight));
3521 break; 3580 break;
3522 3581
3523
3524 /* 3582 /*
3525 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3526 */ 3584 */
3527 case 11: /* report window state */ 3585 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3588 break;
3531 case 13: /* report window position */ 3589 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3590 XGetWindowAttributes (xdisp, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3591 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3592 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3593 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3594 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3595 break;
3538 case 14: /* report window size (pixels) */ 3596 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3597 XGetWindowAttributes (xdisp, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3599 break;
3542 case 18: /* report text area size (chars) */ 3600 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3601 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3602 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3604 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3605 break;
3548 case 20: /* report icon label */ 3606 case 20: /* report icon label */
3549 { 3607 {
3550 char *s; 3608 char *s;
3551 XGetIconName (disp, parent[0], &s); 3609 XGetIconName (xdisp, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3611 XFree (s);
3554 } 3612 }
3555 break; 3613 break;
3556 case 21: /* report window title */ 3614 case 21: /* report window title */
3557 { 3615 {
3558 char *s; 3616 char *s;
3559 XFetchName (disp, parent[0], &s); 3617 XFetchName (xdisp, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3619 XFree (s);
3562 } 3620 }
3563 break; 3621 break;
3564 } 3622 }
3565} 3623}
… …
3568/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
3569/* 3627/*
3570 * get input up until STRING TERMINATOR (or BEL) 3628 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3629 * ends_how is terminator used. returned input must be free()'d
3572 */ 3630 */
3573unsigned char * 3631char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3632rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3633{
3576 unicode_t ch; 3634 unicode_t ch;
3577 bool seen_esc = false; 3635 bool seen_esc = false;
3578 unsigned int n = 0; 3636 unsigned int n = 0;
… …
3611 3669
3612 string[n++] = '\0'; 3670 string[n++] = '\0';
3613 3671
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3672 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3673
3616 return (unsigned char *)rxvt_wcstombs (string); 3674 return rxvt_wcstombs (string);
3617} 3675}
3618 3676
3619/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3620/* 3678/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3679 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3680 */
3623void 3681void
3624rxvt_term::process_dcs_seq () 3682rxvt_term::process_dcs_seq ()
3625{ 3683{
3626 unsigned char *s; 3684 char *s;
3627 unicode_t eh; 3685 unicode_t eh;
3628 3686
3629 /* 3687 /*
3630 * Not handled yet 3688 * Not handled yet
3631 */ 3689 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3708 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3709 arg = arg * 10 + (ch - '0');
3652 3710
3653 if (ch == ';') 3711 if (ch == ';')
3654 { 3712 {
3655 unsigned char *s = get_to_st (eh); 3713 char *s = get_to_st (eh);
3656 3714
3657 if (s) 3715 if (s)
3658 { 3716 {
3659 process_xterm_seq (arg, (char *)s, eh); 3717 process_xterm_seq (arg, s, eh);
3660 free (s); 3718 free (s);
3661 } 3719 }
3662 } 3720 }
3663} 3721}
3664 3722
3665void 3723void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3724rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3725{
3668 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3669 { 3727 {
3670 unsigned short r, g, b; 3728 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3729 pix_colors_focused[color].get (c);
3730
3731#if XFT
3732 if (c.a != rgba::MAX_CC)
3733 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3734 else
3735#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3737 }
3674 else 3738 else
3675 set_window_color (color, str); 3739 set_window_color (color, str);
3676} 3740}
3677 3741
3678/* 3742/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3744 */
3681void 3745void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3747{
3684 int changed = 0;
3685 int color; 3748 int color;
3686 char *buf, *name; 3749 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3750 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3751 int saveop = op;
3689 dDisp; 3752
3753 dLocal (Display *, xdisp);
3690 3754
3691 assert (str != NULL); 3755 assert (str != NULL);
3692 switch (op) 3756 switch (op)
3693 { 3757 {
3694 case XTerm_name: 3758 case XTerm_name:
… …
3710 unsigned long bytes_after; 3774 unsigned long bytes_after;
3711 unsigned char *value = 0; 3775 unsigned char *value = 0;
3712 const char *str = ""; 3776 const char *str = "";
3713 3777
3714 if (prop 3778 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3779 && XGetWindowProperty (xdisp, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3783 && actual_type != None
3720 && actual_format == 8) 3784 && actual_format == 8)
3721 str = (const char *)(value); 3785 str = (const char *)(value);
3722 3786
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3788
3725 XFree (value); 3789 XFree (value);
3726 } 3790 }
3727 else 3791 else
3728 { 3792 {
… …
3732 { 3796 {
3733 *eq = 0; 3797 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3735 } 3799 }
3736 else 3800 else
3737 XDeleteProperty (disp, parent[0], 3801 XDeleteProperty (xdisp, parent[0],
3738 display->atom (str)); 3802 display->atom (str));
3739 } 3803 }
3740 break; 3804 break;
3741 3805
3742 case XTerm_Color: 3806 case XTerm_Color:
… …
3744 { 3808 {
3745 if ((name = strchr (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3810 break;
3747 3811
3748 *name++ = '\0'; 3812 *name++ = '\0';
3749 color = atoi (buf); 3813 color = atoi (buf) + minCOLOR;
3750 3814
3751 if (color < 0 || color >= TOTAL_COLORS) 3815 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3816 break;
3753 3817
3754 if ((buf = strchr (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3819 *buf++ = '\0';
3756 3820
3757 if (name[0] == '?' && !name[1]) 3821 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 } 3822 }
3766 break; 3823 break;
3767 case XTerm_Color00: 3824 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3769 break; 3826 break;
3770 case XTerm_Color01: 3827 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3772 break; 3829 break;
3773#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3833 break;
3777#endif 3834#endif
3778 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3837 break;
3781 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3840 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#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: 3842 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3843 process_color_seq (op, Color_RV, str, resp);
3844 break;
3845 case Rxvt_Color_BD:
3846 case URxvt_Color_BD:
3847 process_color_seq (op, Color_BD, str, resp);
3848 break;
3849 case Rxvt_Color_UL:
3850 case URxvt_Color_UL:
3851 process_color_seq (op, Color_UL, str, resp);
3793 break; 3852 break;
3794 case URxvt_Color_IT: 3853 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3854 process_color_seq (op, Color_IT, str, resp);
3796 break; 3855 break;
3797#endif 3856#endif
3798#if TRANSPARENT && TINTING 3857#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint: 3858 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3859 process_color_seq (op, Color_tint, str, resp);
3860
3801 check_our_parents (); 3861 check_our_parents ();
3862
3802 if (am_transparent) 3863 if (am_transparent)
3803 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806 3865
3866 break;
3867#endif
3868
3807 case XTerm_Pixmap: 3869 case Rxvt_Pixmap:
3870 {
3808 if (*str != ';') 3871 if (*str != ';')
3809 { 3872 {
3810#if XPM_BACKGROUND 3873#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */ 3874 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */ 3875 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true); 3876 scr_touch (true);
3877#endif
3815 } 3878 }
3879
3880 int changed = 0;
3881
3816 while ((str = strchr (str, ';')) != NULL) 3882 while ((str = strchr (str, ';')) != NULL)
3817 { 3883 {
3818 str++; 3884 str++;
3819#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3820 changed += scale_pixmap (str); 3886 changed += scale_pixmap (str);
3821#endif 3887#endif
3822 } 3888 }
3823 3889
3824 if (changed) 3890 if (changed)
3825 { 3891 {
3826#ifdef XPM_BACKGROUND 3892#ifdef XPM_BACKGROUND
3827 resize_pixmap (); 3893 resize_pixmap ();
3828#endif
3829 scr_touch (true); 3894 scr_touch (true);
3895#endif
3830 } 3896 }
3897 }
3831 break; 3898 break;
3832 3899
3833 case XTerm_restoreFG: 3900 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3835 break; 3902 break;
3836 case XTerm_restoreBG: 3903 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3838 break; 3905 break;
3839 3906
3840 case XTerm_logfile: 3907 case XTerm_logfile:
3841 // TODO, when secure mode? 3908 // TODO, when secure mode?
3842 break; 3909 break;
3843 3910
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 3911#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3912 case Rxvt_dumpscreen: /* no error notices */
3852 { 3913 {
3853 int fd; 3914 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3915 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3916 {
3856 scr_dump (fd); 3917 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3928 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3929 case URxvt_boldItalicFont:
3869#endif 3930#endif
3870 if (query) 3931 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3932 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3934 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3935 resp);
3875 else 3936 else
3876 { 3937 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3938 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3941 allocated.push_back ((void *)res);
3881 set_fonts (); 3942 set_fonts ();
3882 } 3943 }
3883 break; 3944 break;
3884 3945
3885#if ENABLE_FRILLS 3946 case URxvt_version:
3947 if (query)
3948 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3949 op,
3950 rs[Rs_name], VERSION[0], VERSION[2],
3951 resp);
3952 break;
3953
3954#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3955 case URxvt_locale:
3887 if (query) 3956 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3889 else 3958 else
3890 { 3959 {
3891 set_locale (str); 3960 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3961 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3962 init_xlocale ();
3894 } 3963 }
3895 break; 3964 break;
3896 3965
3897 case URxvt_view_up: 3966 case URxvt_view_up:
3898 case URxvt_view_down: 3967 case URxvt_view_down:
3968 {
3899 int lines = atoi (str); 3969 int lines = atoi (str);
3900 3970
3901 if (lines) 3971 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3972 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3973 else
3904 {
3905 scr_erase_savelines (); 3974 scr_erase_savelines ();
3906 } 3975 }
3907 3976
3977 break;
3978#endif
3979
3980#if ENABLE_PERL
3981 case URxvt_perl:
3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3983 ; // no responses yet
3908 break; 3984 break;
3909#endif 3985#endif
3910 } 3986 }
3911} 3987}
3912/*----------------------------------------------------------------------*/ 3988/*----------------------------------------------------------------------*/
… …
3943 return state; 4019 return state;
3944} 4020}
3945 4021
3946/* we're not using priv _yet_ */ 4022/* we're not using priv _yet_ */
3947void 4023void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4024rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 4025{
3950 unsigned int i, j; 4026 unsigned int i, j;
3951 int state; 4027 int state;
3952 4028
3953 static const struct 4029 static const struct
… …
3964 { 5, PrivMode_rVideo }, 4040 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 4041 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 4042 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 4043 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 4044 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 4045 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 4046 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 4047#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 4048 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 4049#endif
… …
4021 } 4094 }
4022 4095
4023 /* extra handling for values with state unkept */ 4096 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4097 switch (arg[i])
4025 { 4098 {
4099#if ENABLE_STYLES
4100 case 1021:
4101 set_option (Opt_intensityStyles, mode);
4102
4103 scr_touch (true);
4104 break;
4105#endif
4026 case 1048: /* alternative cursor save */ 4106 case 1048: /* alternative cursor save */
4027 case 1049: 4107 case 1049:
4028 if (options & Opt_secondaryScreen) 4108 if (OPTION (Opt_secondaryScreen))
4029 if (mode == 0) 4109 if (mode == 0)
4030 scr_cursor (RESTORE); 4110 scr_cursor (RESTORE);
4031 else if (mode == 1) 4111 else if (mode == 1)
4032 scr_cursor (SAVE); 4112 scr_cursor (SAVE);
4033 break; 4113 break;
… …
4048 case 3: /* 80/132 */ 4128 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 4129 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 4130 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 4131 break;
4052 case 4: /* smooth scrolling */ 4132 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 4133 set_option (Opt_jumpScroll, !state);
4057 break; 4134 break;
4058 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4060 break; 4137 break;
4061 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4067 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
4071 break; 4148 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 4149#ifdef scrollBar_esc
4080 case scrollBar_esc: 4150 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 4151 if (scrollbar_mapping (state))
4082 { 4152 {
4083 resize_all_windows (0, 0, 0); 4153 resize_all_windows (0, 0, 0);
… …
4102#if 0 4172#if 0
4103 case 1001: 4173 case 1001:
4104 break; /* X11 mouse highlighting */ 4174 break; /* X11 mouse highlighting */
4105#endif 4175#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4176 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 4177 set_option (Opt_scrollTtyOutput, !state);
4111 break; 4178 break;
4112 case 1011: /* scroll to bottom on key press */ 4179 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 4180 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 4181 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4182 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4183 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4184 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4185 scr_erase_screen (2);
4122 scr_change_screen (state); 4186 scr_change_screen (state);
4123 break; 4187 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4188 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4189 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4190 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4191 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4192 scr_erase_screen (2);
4129 break; 4193 break;
4130 default: 4194 default:
4131 break; 4195 break;
… …
4259 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4260 break; 4324 break;
4261 4325
4262 //case 50: // not variable spacing 4326 //case 50: // not variable spacing
4263 4327
4264#ifndef NO_BRIGHTCOLOR 4328#if !ENABLE_MINIMAL
4265 case 90: 4329 case 90:
4266 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4267 case 92: 4331 case 92:
4268 case 93: 4332 case 93:
4269 case 94: 4333 case 94:
… …
4281 case 106: 4345 case 106:
4282 case 107: 4346 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4347 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4348 break;
4285#endif 4349#endif
4286
4287 } 4350 }
4288 } 4351 }
4289} 4352}
4290/*}}} */ 4353/*}}} */
4291 4354
… …
4315 */ 4378 */
4316void 4379void
4317rxvt_term::tt_printf (const char *fmt,...) 4380rxvt_term::tt_printf (const char *fmt,...)
4318{ 4381{
4319 va_list arg_ptr; 4382 va_list arg_ptr;
4320 unsigned char buf[256]; 4383 char buf[256];
4321 4384
4322 va_start (arg_ptr, fmt); 4385 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4386 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4387 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4388 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 4393 * or generated by us in response to a query ESC sequence.
4331 */ 4394 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4395const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 4396
4334void 4397void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4398rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 4399{
4400 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4401 return;
4402
4403 if (pty->pty < 0)
4404 return;
4405
4337 if (v_buflen == 0) 4406 if (v_buflen == 0)
4338 { 4407 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4408 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 4409
4341 if ((unsigned int)written == len) 4410 if ((unsigned int)written == len)
4342 return; 4411 return;
4343 4412
4344 data += written; 4413 data += written;
4345 len -= written; 4414 len -= written;
4346 } 4415 }
4347 4416
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4418
4350 memcpy (v_buffer + v_buflen, data, len); 4419 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4420 v_buflen += len;
4352 4421
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4422 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354} 4423}
4355 4424
4356void rxvt_term::pty_write () 4425void rxvt_term::pty_write ()
4357{ 4426{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 4428
4360 if (written > 0) 4429 if (written > 0)
4361 { 4430 {
4362 v_buflen -= written; 4431 v_buflen -= written;
4363 4432
… …
4372 } 4441 }
4373 4442
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4443 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4444 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this... 4446 pty_ev.set (EVENT_READ);
4378 destroy ();
4379} 4447}
4380 4448
4381/*----------------------- end-of-file (C source) -----------------------*/ 4449/*----------------------- end-of-file (C source) -----------------------*/
4382 4450

Diff Legend

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