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.197 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#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 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
136{ 139{
137 x = Pixel2Col (x); 140 x = Pixel2Col (x);
138 y = Pixel2Row (y); 141 y = Pixel2Row (y);
139 142
140 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
147 152
148 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
149 { 154 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
153 break; 157 break;
154 } 158 }
155 159
156 x--; 160 x--;
157 } 161 }
158
159} 162}
160#endif
161 163
162#if ENABLE_OVERLAY
163void 164void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 166{
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
170 171
172 fname = rxvt_utf8towcs (f->name);
173
171#if ENABLE_COMBINING 174# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
173 { 176 {
174 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
177 } 180 }
178 else 181 else
179#endif 182# endif
180 { 183 {
181 ch2 = ch; 184 ch2 = ch;
182 185
183 alloc = 0; 186 alloc = 0;
184 chr = &ch2; 187 chr = &ch2;
185 len = 1; 188 len = 1;
186 } 189 }
187 190
188 int width = strlen (f->name); 191 char attr[80]; // plenty
189 192
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
191 215
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 217
194 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
195 { 219 {
… …
198 ch = *chr++; 222 ch = *chr++;
199 223
200 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
203#if !UNICODE3 227# if !UNICODE3
204 if (ch >= 0x10000) 228 if (ch >= 0x10000)
205 ch = 0xfffd; 229 ch = 0xfffd;
206#endif 230# endif
207 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
209 } 233 }
210 234
235 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 236 scr_overlay_set (0, len + 1, fname);
212 237
238 free (fname);
239
213#if ENABLE_COMBINING 240# if ENABLE_COMBINING
214 if (alloc) 241 if (alloc)
215 delete [] alloc; 242 delete [] alloc;
216#endif 243# endif
217} 244}
218#endif 245#endif
219 246
220void 247void
221rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
238 mb[0] = ch[0]; 265 mb[0] = ch[0];
239 len = 1; 266 len = 1;
240 } 267 }
241 268
242 if (len > 0) 269 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
244 else 271 else
245 scr_bell (); 272 scr_bell ();
246 } 273 }
247 274
248 iso14755buf = 0; 275 iso14755buf = 0;
… …
276 KeySym keysym; 303 KeySym keysym;
277#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
279#endif 306#endif
280 int valid_keysym; 307 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
282 309
283 /* 310 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
286 * 313 *
… …
304 Status status_return; 331 Status status_return;
305 332
306#if 0 333#if 0
307#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
311 else 338 else
312#endif 339#endif
313#endif 340#endif
314 { 341 {
… …
316 343
317 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
321 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
324 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 354 SET_LOCALE (locale);
326 355
327 if (status_return == XLookupChars 356 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
350 } 379 }
351 else 380 else
352#endif 381#endif
353 { 382 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
356 } 385 }
357 386
358 if (valid_keysym) 387 if (valid_keysym)
359 { 388 {
360#ifdef KEYSYM_RESOURCE 389#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 390 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 391 return;
363#endif 392#endif
364 393
365 if (TermWin.saveLines) 394 if (saveLines)
366 { 395 {
367#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 397 if (!ctrl && !meta)
369#else 398#else
370 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
371#endif 400#endif
372 { 401 {
373 int lnsppg; 402 int lnsppg;
374 403
375#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 406#else
378 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
379#endif 408#endif
380 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
381 { 410 {
382 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
383 return; 412 return;
… …
411 scr_move_to (0, 1); 440 scr_move_to (0, 1);
412 return; 441 return;
413 } 442 }
414 else if (keysym == XK_End) 443 else if (keysym == XK_End)
415 { 444 {
416 scr_move_to (1, 0); 445 scr_move_to (1, 1);
417 return; 446 return;
418 } 447 }
419 } 448 }
420#endif 449#endif
421 } 450 }
… …
432 { 461 {
433 switch (keysym) 462 switch (keysym)
434 { 463 {
435 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
436 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
437 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
438 return; 467 return;
439#if TODO 468#if TODO
440 /* rxvt extras */ 469 /* rxvt extras */
441 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
442 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
823 { 852 {
824#ifdef META8_OPTION 853#ifdef META8_OPTION
825 /* set 8-bit on */ 854 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
827 { 856 {
828 unsigned char *ch; 857 char *ch;
829 858
830 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 860 *ch |= 0x80;
832 861
833 meta = 0; 862 meta = 0;
… …
835#endif 864#endif
836 /* nil */ ; 865 /* nil */ ;
837 } 866 }
838 } 867 }
839 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
840 if (len <= 0) 872 if (len <= 0)
841 return; /* not mapped */ 873 return; /* not mapped */
842 874
843 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 876 if (view_start)
845 { 877 {
846 TermWin.view_start = 0; 878 view_start = 0;
847 want_refresh = 1; 879 want_refresh = 1;
848 } 880 }
849 881
850 /* 882 /*
851 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 898#ifdef META8_OPTION
867 && meta_char == C0_ESC 899 && meta_char == C0_ESC
868#endif 900#endif
869 ) 901 )
870 { 902 {
871 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
872 tt_write (&ch, 1); 904 tt_write (&ch, 1);
873 } 905 }
874 906
875#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
884#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
885 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
886} 918}
887/*}}} */ 919/*}}} */
888 920
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */
892unsigned int 922unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 924{
895 unsigned int n, s; 925 unsigned int n, s;
896 926
897 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 965 }
936#endif 966#endif
937 967
938 if (want_refresh) 968 if (want_refresh)
939 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
940 scr_refresh (refresh_type); 1008 scr_refresh ();
941 scrollbar_show (1); 1009 scrollbar_show (1);
942#ifdef USE_XIM 1010#ifdef USE_XIM
943 IMSendSpot (); 1011 IMSendSpot ();
944#endif 1012#endif
945 } 1013 }
… …
948} 1016}
949 1017
950void 1018void
951rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
952{ 1020{
953 SET_R (this); 1021 make_current ();
954 SET_LOCALE (locale);
955 1022
956 display->flush (); 1023 display->flush ();
957 1024
958 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1027}
961 1028
962void 1029void
963rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
964{ 1031{
965 SET_R (this); 1032 make_current ();
966 SET_LOCALE (locale);
967 1033
968 refresh_limit = 1; 1034 refresh_limit = 1;
969 refresh_count = 0; 1035 refresh_count = 0;
970 flush (); 1036 flush ();
971} 1037}
… …
975rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
976{ 1042{
977 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1044 want_refresh = 1;
979 1045
980 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
981} 1047}
982#endif 1048#endif
983 1049
984#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
985void 1051void
… …
999rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1000{ 1066{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 { 1069 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1070 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 } 1072 }
1008} 1073}
1009#endif 1074#endif
… …
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1014{ 1079{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1081 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1083 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 } 1085 }
1022} 1086}
1023#endif 1087#endif
… …
1028{ 1092{
1029 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1096 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1097 if (view_start == top_row || view_start == 0)
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1036 1099
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1100 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1102 }
1041} 1103}
1042#endif 1104#endif
1043 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1044bool 1124bool
1045rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1046{ 1126{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1128
1049 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1050 { 1130 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1132 n = 0;
1053 } 1133 }
1054 1134
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1058 1138
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1140
1061 if (n > 0) 1141 if (r > 0)
1062 { 1142 {
1063 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1064 return true; 1144 return true;
1065 } 1145 }
1066 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1067 destroy (); 1158 destroy ();
1159 }
1068 1160
1069 return false; 1161 return false;
1070} 1162}
1071 1163
1072void 1164void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1074{ 1166{
1075 SET_R (this); 1167 make_current ();
1076 SET_LOCALE (locale);
1077 1168
1078 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1171 while (pty_fill ())
1081 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1086} 1177}
1087 1178
1088void 1179void
1089rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1090{ 1181{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1183 recolour_cursor ();
1093 1184
1094#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1186 hidden_pointer = 0;
1096 1187
1097 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1190#endif
1100} 1191}
1101 1192
1102#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1103void 1194void
1104rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1105{ 1196{
1106 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1107 return; 1198 return;
1108 1199
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1201 XFlush (display->display);
1111 1202
1112 hidden_pointer = 1; 1203 hidden_pointer = 1;
1113} 1204}
1114 1205
1115void 1206void
1116rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1117{ 1208{
1118 SET_R (this); 1209 make_current ();
1119 SET_LOCALE (locale);
1120 1210
1121 pointer_blank (); 1211 pointer_blank ();
1122} 1212}
1123#endif 1213#endif
1124 1214
… …
1203 1293
1204/*{{{ process an X event */ 1294/*{{{ process an X event */
1205void 1295void
1206rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1207{ 1297{
1298 make_current ();
1299
1208 dDisp; 1300 dDisp;
1209 1301
1210 SET_R (this); 1302 if (ev.xany.window == vt
1211 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1212 1306
1213#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1215 {
1216 if (hidden_cursor)
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 }
1224#endif
1225
1226#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1228 {
1229 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease)
1232 if (hidden_pointer)
1233 pointer_unblank ();
1234
1235 if (ev.type == KeyPress && hidden_pointer == 0)
1236 pointer_blank ();
1237 }
1238#endif
1239
1240 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1310 unsigned int unused_mask;
1243 1311
1244 switch (ev.type) 1312 switch (ev.type)
… …
1251 1319
1252 break; 1320 break;
1253 1321
1254 case KeyRelease: 1322 case KeyRelease:
1255 { 1323 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1257 KeySym ks; 1325 KeySym keysym;
1258 1326
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif 1328#endif
1261 1329
1262#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support 1331 // ISO 14755 support
1264 if (iso14755buf) 1332 if (iso14755buf)
… …
1269# endif 1337# endif
1270# if ISO_14755 1338# if ISO_14755
1271 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1272 // first: controls 1340 // first: controls
1273 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1276 { 1344 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1278 commit_iso14755 (); 1346 commit_iso14755 ();
1279 return; // case-break; 1347 goto skip_switch;
1280 } 1348 }
1281 1349
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks) 1351 if (i[0] == keysym)
1284 { 1352 {
1285 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 (); 1354 commit_iso14755 ();
1287 return; // case-break; 1355 goto skip_switch;
1288 } 1356 }
1289 1357
1290 scr_bell (); 1358 scr_bell ();
1291# endif 1359# endif
1292 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1311 else 1379 else
1312 iso14755buf = 0; 1380 iso14755buf = 0;
1313 } 1381 }
1314#endif 1382#endif
1315 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1320 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1321#endif 1393#endif
1322 break; 1394 break;
1323 } 1395 }
1324 1396
… …
1330 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1331 break; 1403 break;
1332 1404
1333 case ClientMessage: 1405 case ClientMessage:
1334 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1408 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1410 destroy ();
1411#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev);
1416#endif
1417 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1337#ifdef OFFIX_DND 1427#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1428 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1430 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1431 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1432 || ev.xclient.data.l[0] == DndLink))
1343 { 1433 {
1344 /* Get Dnd data */ 1434 /* Get Dnd data */
1345 Atom ActualType; 1435 Atom ActualType;
1346 int ActualFormat; 1436 int ActualFormat;
1347 unsigned char *data; 1437 unsigned char *data;
… …
1390 break; 1480 break;
1391 } 1481 }
1392 break; 1482 break;
1393 1483
1394 case FocusIn: 1484 case FocusIn:
1395 if (!TermWin.focus) 1485 focus_in ();
1486 break;
1487
1488 case FocusOut:
1489 focus_out ();
1490 break;
1491
1492 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0])
1396 { 1494 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ;
1464 1497
1465 if (szHint.width != width || szHint.height != height) 1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1499 {
1467 seen_resize = 1; 1500 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1502 }
1470 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1507 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1508 check_our_parents ();
1474#endif 1509#endif
1475 } 1510 }
1476 break; 1511 break;
1477 1512
… …
1493 1528
1494 case SelectionRequest: 1529 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1496 break; 1531 break;
1497 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1498 case UnmapNotify: 1541 case UnmapNotify:
1499 TermWin.mapped = 0; 1542 mapped = 0;
1500#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1502#endif 1545#endif
1503 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505 case MapNotify:
1506 TermWin.mapped = 1;
1507#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif
1510 break; 1547 break;
1511 1548
1512#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1513 case ReparentNotify: 1550 case ReparentNotify:
1514 rootwin_cb (ev); 1551 rootwin_cb (ev);
1515 break; 1552 break;
1516#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1517 1554
1518 case GraphicsExpose: 1555 case GraphicsExpose:
1519 case Expose: 1556 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1521 { 1558 {
1522 do 1559 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1563
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1565
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1532 1569
1533 scr_refresh (refresh_type); 1570 want_refresh = 1;
1534 } 1571 }
1535 else 1572 else
1536 { 1573 {
1537 XEvent unused_event; 1574 XEvent unused_event;
1538 1575
… …
1544 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1545 { 1582 {
1546 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1547 scrollbar_show (0); 1584 scrollbar_show (0);
1548 } 1585 }
1549#ifdef MENUBAR
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose ();
1552#endif
1553 1586
1554#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1557#endif 1590#endif
1558 } 1591 }
1559 break; 1592 break;
1560 1593
1561 case MotionNotify: 1594 case MotionNotify:
1562#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1596 if (hidden_pointer)
1564 pointer_unblank (); 1597 pointer_unblank ();
1565#endif 1598#endif
1566#if MENUBAR
1567 if (isMenuBarWindow (ev.xany.window))
1568 {
1569 menubar_control (ev.xbutton);
1570 break;
1571 }
1572#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1600 break;
1575 1601
1576 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1577 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1608 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1610 ;
1582 1611
1583 XQueryPointer (disp, TermWin.vt, 1612 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1616 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1600#endif 1629#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1632
1604#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1636 {
1608 int dist; 1637 int dist;
1609 1638
1610 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1651
1623 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1625 { 1654 {
1626 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1628 } 1657 }
1629 else 1658 else
1630 { 1659 {
1631 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1662 }
1634 1663
1635 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1666 + 1;
1638 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1640 } 1669 }
1641 else 1670 else
1642 { 1671 {
1643 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1663 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1694 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1696 scrollbar_size ());
1668 scr_refresh (refresh_type); 1697 want_refresh = 1;
1669 refresh_limit = 0; 1698 refresh_limit = 0;
1670 scrollbar_show (1); 1699 scrollbar_show (1);
1671 } 1700 }
1672 break; 1701 break;
1673 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1732}
1733
1734void
1735rxvt_term::focus_in ()
1736{
1737 if (!focus)
1738 {
1739 focus = 1;
1740 want_refresh = 1;
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM
1745 if (Input_Context != NULL)
1746 {
1747 IMSetStatusPosition ();
1748 XSetICFocus (Input_Context);
1749 }
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 pix_colors = pix_colors_focused;
1759 scr_recolour ();
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ENABLE_OVERLAY
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1674} 1801}
1675 1802
1676#if TRANSPARENT 1803#if TRANSPARENT
1677void 1804void
1678rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1806{
1680 SET_R (this); 1807 make_current ();
1681 SET_LOCALE (locale);
1682 1808
1683 switch (ev.type) 1809 switch (ev.type)
1684 { 1810 {
1685 case PropertyNotify: 1811 case PropertyNotify:
1686 /* 1812 /*
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1818 return;
1693 1819
1694 /* FALLTHROUGH */ 1820 /* FALLTHROUGH */
1695 case ReparentNotify: 1821 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1823 want_refresh = want_full_refresh = 1;
1698 break; 1824 break;
1699 } 1825 }
1700} 1826}
1701#endif 1827#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1705{ 1831{
1706 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1707 1833
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1709 if (!bypass_keystate) 1836 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1838
1712 /* 1839 /*
1713 * VT window processing of button press 1840 * VT window processing of button press
1714 */ 1841 */
1715 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1716 { 1843 {
1717#if ISO_14755 1844#if ISO_14755
1718 // 5.4 1845 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1847 {
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1735 { 1862 {
1736 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1737 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1738 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1739 { 1867 {
1740 /* only report double clicks */ 1868 /* only report double clicks */
1741 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1742 mouse_report (ev); 1870 mouse_report (ev);
… …
1762 else 1890 else
1763 { 1891 {
1764 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1765 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1766 1894
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1767 switch (ev.button) 1896 switch (ev.button)
1768 { 1897 {
1769 case Button1: 1898 case Button1:
1770 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1772#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1774#else 1903#else
1775 selection.rect = false; 1904 selection.rect = false;
1776#endif 1905#endif
1777 1906
1778 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1909 {
1781 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1783 else 1912 else
1784 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1785 } 1914 }
1786 else 1915 else
1787 { 1916 {
1788 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1789 MEvent.clicks++; 1918 MEvent.clicks++;
1790 else 1919 else
1791 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1792 1921
1793 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1794 } 1923 }
1795 1924
1796 MEvent.button = Button1; 1925 MEvent.button = Button1;
1797 break; 1926 break;
1798 1927
1799 case Button3: 1928 case Button3:
1800 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1801 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1802 else 1931 else
1803 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1804 1933
1805 MEvent.button = Button3; 1934 MEvent.button = Button3;
1806 break; 1935 break;
1807 } 1936 }
1808 } 1937 }
1809 1938
1810 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1811 return; 1940 return;
1812 } 1941 }
1813 1942
… …
1925 case Button3: 2054 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1927 { 2056 {
1928 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1931# else 2060# else
1932 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1933# endif 2062# endif
1934 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1937# else 2066# else
1938 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1939# endif 2068# endif
1940 else 2069 else
1941 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1942 } 2071 }
1943 else 2072 else
1944 { 2073 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2075 (nrow
1947 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2077 / scrollbar_size ()));
1949 } 2078 }
1950 2079
1951 break; 2080 break;
1952 } 2081 }
1953 } 2082 }
2083
1954 return; 2084 return;
1955 } 2085 }
1956#if MENUBAR
1957 /*
1958 * Menubar window processing of button press
1959 */
1960 if (isMenuBarWindow (ev.window))
1961 menubar_control (ev);
1962#endif
1963} 2086}
1964 2087
1965void 2088void
1966rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1967{ 2090{
… …
1973 2096
1974 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1975 { 2098 {
1976 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1977 scrollbar_show (0); 2100 scrollbar_show (0);
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 refresh_type &= ~SMOOTH_REFRESH;
1980#endif
1981 } 2101 }
1982 2102
1983#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
1986#endif 2106#endif
1987 2107
1988 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1989 { 2109 {
1990#if ISO_14755 2110#if ISO_14755
1991 // 5.4 2111 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2113 return;
… …
2023 if (priv_modes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
2024 && bypass_keystate 2144 && bypass_keystate
2025 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
2026 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2027 2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2028 switch (ev.button) 2151 switch (ev.button)
2029 { 2152 {
2030 case Button1: 2153 case Button1:
2031 case Button3: 2154 case Button3:
2032 selection_make (ev.time); 2155 selection_make (ev.time);
2033 break; 2156 break;
2157
2034 case Button2: 2158 case Button2:
2035 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2036 break; 2161 break;
2162
2037#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2038 case Button4: 2164 case Button4:
2039 case Button5: 2165 case Button5:
2040 { 2166 {
2041 int i; 2167 int i;
… …
2043 2169
2044 v = ev.button == Button4 ? UP : DN; 2170 v = ev.button == Button4 ? UP : DN;
2045 2171
2046 if (ev.state & ShiftMask) 2172 if (ev.state & ShiftMask)
2047 i = 1; 2173 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2174 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2175 i = nrow - 1;
2050 else 2176 else
2051 i = 5; 2177 i = 5;
2052 2178
2053# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2180 if (ev.state & ControlMask)
2055 { 2181 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2182 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2185
2060 if (slip_wheel_ev.at < NOW) 2186 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2188
2063 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2064 } 2190 }
2065 else 2191 else
2066 { 2192 {
2067# endif 2193# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2194 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2195 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2081 } 2197 }
2082#endif 2198# endif
2083 } 2199 }
2084 break; 2200 break;
2085#endif 2201#endif
2086 } 2202 }
2087 } 2203 }
2088#ifdef MENUBAR
2089 else if (isMenuBarWindow (ev.window))
2090 menubar_control (ev);
2091#endif
2092} 2204}
2093 2205
2094#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2095#if TINTING 2207#if TINTING
2096/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2339 XWindowAttributes wattr, wrootattr; 2451 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2452 dDisp;
2341 2453
2342 pchanged = 0; 2454 pchanged = 0;
2343 2455
2344 if (!(options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2346 2458
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2349 2461
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2463
2352 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2353 { 2465 {
2354 if (am_transparent) 2466 if (am_transparent)
2355 { 2467 {
2356 pchanged = 1; 2468 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2359 } 2471 }
2360 2472
2361 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2362 } 2474 }
… …
2403 Window cr; 2515 Window cr;
2404 XImage *image; 2516 XImage *image;
2405 GC gc; 2517 GC gc;
2406 XGCValues gcvalue; 2518 XGCValues gcvalue;
2407 2519
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2524 nx = ny = 0;
2413 2525
… …
2423 nh += sy; 2535 nh += sy;
2424 ny = -sy; 2536 ny = -sy;
2425 sy = 0; 2537 sy = 0;
2426 } 2538 }
2427 2539
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2542
2431 XSync (disp, False); 2543 XSync (disp, False);
2432 allowedxerror = -1; 2544 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2546
… …
2439 if (image == NULL) 2551 if (image == NULL)
2440 { 2552 {
2441 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2442 { 2554 {
2443 pchanged = 1; 2555 pchanged = 1;
2444 if (TermWin.pixmap != None) 2556 if (pixmap != None)
2445 { 2557 {
2446 XFreePixmap (disp, TermWin.pixmap); 2558 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2559 pixmap = None;
2448 } 2560 }
2449 } 2561 }
2450 2562
2451 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2452 } 2564 }
2453 else 2565 else
2454 { 2566 {
2455 if (TermWin.pixmap != None) 2567 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2568 XFreePixmap (disp, pixmap);
2457 2569
2458#if TINTING 2570#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2572 {
2461 unsigned short rm, gm, bm; 2573 unsigned short rm, gm, bm;
… …
2465 2577
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2579 }
2468#endif 2580#endif
2469 2581
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2582 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2583 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2586 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2587 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2588 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2590 XClearWindow (disp, parent[0]);
2479 2591
2480 if (!am_transparent || !am_pixmap_trans) 2592 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2593 pchanged = 1;
2482 2594
2483 am_transparent = am_pixmap_trans = 1; 2595 am_transparent = am_pixmap_trans = 1;
2484 } 2596 }
2485 } 2597 }
2486 2598
2487 if (am_pixmap_trans) 2599 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2601 else
2490 { 2602 {
2491 unsigned int n; 2603 unsigned int n;
2492 /* 2604 /*
2493 * InheritPixmap transparency 2605 * InheritPixmap transparency
2494 */ 2606 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2608 {
2497 oldp = TermWin.parent[i]; 2609 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2610 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2611 &parent[i], &list, &n);
2500 XFree (list); 2612 XFree (list);
2501 2613
2502 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
2503 { 2615 {
2504 if (oldp != None) 2616 if (oldp != None)
2505 pchanged = 1; 2617 pchanged = 1;
2506 2618
2507 break; 2619 break;
2508 } 2620 }
2509 2621
2510 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
2511 pchanged = 1; 2623 pchanged = 1;
2512 } 2624 }
2513 2625
2514 n = 0; 2626 n = 0;
2515 2627
2516 if (pchanged) 2628 if (pchanged)
2517 { 2629 {
2518 for (; n < (unsigned int)i; n++) 2630 for (; n < (unsigned int)i; n++)
2519 { 2631 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2632 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2634 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2636 break;
2525 } 2637 }
2526 } 2638 }
2527 } 2639 }
2528 2640
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2642 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2645 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2646 /* XXX: also turn off Opt_transparent? */
2535 } 2647 }
2536 else 2648 else
2537 { 2649 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2652 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2653 sleep (1);
2542#endif 2654#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2655 for (n = 0; n < (unsigned int)i; n++)
2544 { 2656 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2658 XClearWindow (disp, parent[n]);
2547 } 2659 }
2548 2660
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2662 am_transparent = 1;
2551 } 2663 }
2552 2664
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2666 parent[i] = None;
2555 } 2667 }
2556 2668
2557 if (scrollBar.win) 2669 if (scrollBar.win)
2558 { 2670 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2576 2688
2577bool 2689bool
2578rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2579{ 2691{
2580 bool flag = false; 2692 bool flag = false;
2581 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2583 2695
2584 for (;;) 2696 for (;;)
2585 { 2697 {
2586 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2587 { 2699 {
2588 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2701 ch = next_char ();
2590 }
2591 2702
2592 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2593 break; 2704 break;
2705 }
2594 2706
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2708 {
2597 if (!seen_input) 2709 if (!seen_input)
2598 { 2710 {
… …
2607 if (seen_resize && cmd_pid) 2719 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2609 } 2721 }
2610 2722
2611 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2725 bool refreshnow = false;
2614 int nlines = 0; 2726 int nlines = 0;
2615 unicode_t *str = buf; 2727 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2729
2617 for (;;) 2730 for (;;)
2618 { 2731 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2733 break;
2621 2734
2622 *str++ = ch; 2735 *str++ = ch;
2623 2736
2624 if (ch == C0_LF) 2737 if (ch == C0_LF || str >= eol)
2625 { 2738 {
2739 if (ch == C0_LF)
2626 nlines++; 2740 nlines++;
2741
2627 refresh_count++; 2742 refresh_count++;
2628 2743
2629 if (!(options & Opt_jumpScroll) 2744 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2746 {
2632 refreshnow = true; 2747 refreshnow = true;
2748 refresh_count = 0;
2633 ch = NOCHAR; 2749 ch = NOCHAR;
2634 break; 2750 break;
2635 } 2751 }
2636 2752
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2754 if (nlines >= nrow - 1)
2639 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2641 nlines = 0; 2760 nlines = 0;
2642 str = buf; 2761 str = buf;
2762 eol = str + min (ncol, UBUFSIZ);
2643 } 2763 }
2644 }
2645 2764
2646 if (str >= buf + UBUFSIZ) 2765 if (str >= eol)
2647 { 2766 {
2767 if (eol >= buf + UBUFSIZ)
2768 {
2648 ch = NOCHAR; 2769 ch = NOCHAR;
2649 break; 2770 break;
2771 }
2772 else
2773 eol = min (eol + ncol, buf + UBUFSIZ);
2774 }
2775
2650 } 2776 }
2651 2777
2652 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2779 ch = next_char ();
2654 } 2780 }
2655 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2656 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2657 2785
2658 /* 2786 /*
2659 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2790 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2791 */
2664 if (refreshnow) 2792 if (refreshnow)
2665 { 2793 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2795 refresh_limit++;
2668 else 2796 else
2669 { 2797 {
2670 flag = true; 2798 flag = true;
2671 scr_refresh (refresh_type); 2799 scr_refresh ();
2800 want_refresh = 1;
2672 } 2801 }
2673 } 2802 }
2674 2803
2675 } 2804 }
2676 else 2805 else
… …
2691 } 2820 }
2692 2821
2693 return flag; 2822 return flag;
2694} 2823}
2695 2824
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character 2825// read the next character
2706unicode_t 2826wchar_t
2707rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2708{ 2828{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2830 {
2711 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2714 2834
2715 wchar_t wc; 2835 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2837
2718 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2719 { 2839 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2842 break;
2723 } 2843 }
2724 2844
2725 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2847
2728 // assume wchar == unicode 2848 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2731 } 2851 }
2732 2852
2733 return NOCHAR; 2853 return NOCHAR;
2734} 2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet () NOTHROW
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2863}
2864
2865static class out_of_input out_of_input;
2735 2866
2736/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2737/* 2868/*
2738 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2739 * to the command. 2870 * to the command.
2740 */ 2871 */
2741unicode_t 2872wchar_t
2742rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2743{ 2874{
2744 unicode_t c = next_char (); 2875 wchar_t c = next_char ();
2745 2876
2746 if (c == NOCHAR) 2877 if (c == NOCHAR)
2747 throw out_of_input; 2878 throw out_of_input;
2748 2879
2749 return c; 2880 return c;
2750} 2881}
2751 2882
2752unicode_t 2883uint32_t
2753rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2754{ 2885{
2755 unicode_t c = next_octet (); 2886 uint32_t c = next_octet ();
2756 2887
2757 if (c == NOCHAR) 2888 if (c == NOCHAR)
2758 throw out_of_input; 2889 throw out_of_input;
2759 2890
2760 return c; 2891 return c;
… …
2860 case C0_ESC: 2991 case C0_ESC:
2861 process_escape_seq (); 2992 process_escape_seq ();
2862 break; 2993 break;
2863 case C0_ENQ: /* terminal Status */ 2994 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 2995 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2996 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 2997 else
2868 tt_write ((unsigned char *)VT100_ANS, 2998 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 2999 break;
2871 case C0_BEL: /* bell */ 3000 case C0_BEL: /* bell */
2872 scr_bell (); 3001 scr_bell ();
2873 break; 3002 break;
2874 case C0_BS: /* backspace */ 3003 case C0_BS: /* backspace */
… …
3029 break; 3158 break;
3030 3159
3031 /* 8.3.87: NEXT LINE */ 3160 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3161 case C1_NEL: /* ESC E */
3033 { 3162 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3163 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3164 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3165 }
3037 break; 3166 break;
3038 3167
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3168 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3169 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3191 process_dcs_seq ();
3063 break; 3192 break;
3064 3193
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3194 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3195 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3196 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3197 break; /* steal obsolete ESC [ c */
3070 3198
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3199 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3200 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3201 process_csi_seq ();
… …
3313 3441
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3442 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3443 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3444 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3445 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3446 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3447 break;
3320 3448
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3449 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3450 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3451 break;
3325 3452
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3453 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3454 process_sgr_mode (nargs, arg);
3328 break; 3455 break;
… …
3335 break; 3462 break;
3336 case 6: /* CPR requested */ 3463 case 6: /* CPR requested */
3337 scr_report_position (); 3464 scr_report_position ();
3338 break; 3465 break;
3339 case 7: /* unofficial extension */ 3466 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3467 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3468 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3469 break;
3343 case 8: /* unofficial extension */ 3470 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3472 break;
… …
3448 { 3575 {
3449 /* 3576 /*
3450 * commands 3577 * commands
3451 */ 3578 */
3452 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3580 XMapWindow (disp, parent[0]);
3454 break; 3581 break;
3455 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3583 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3584 break;
3458 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3586 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3587 break;
3461 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3590 break;
3464 case 5: /* raise window */ 3591 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3592 XRaiseWindow (disp, parent[0]);
3466 break; 3593 break;
3467 case 6: /* lower window */ 3594 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3595 XLowerWindow (disp, parent[0]);
3469 break; 3596 break;
3470 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3471 scr_touch (true); 3598 scr_touch (true);
3472 break; 3599 break;
3473 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3601 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3602 (unsigned int) (args[1] * fheight));
3476 break; 3603 break;
3477 3604
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3605 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3606 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3608 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3609 (unsigned int) (args[1] * fheight));
3483 break; 3610 break;
3484 3611
3485 3612
3486 /* 3613 /*
3487 * reports - some output format copied from XTerm 3614 * reports - some output format copied from XTerm
3488 */ 3615 */
3489 case 11: /* report window state */ 3616 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3619 break;
3493 case 13: /* report window position */ 3620 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3621 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3622 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3623 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3624 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3625 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3626 break;
3500 case 14: /* report window size (pixels) */ 3627 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3628 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3630 break;
3504 case 18: /* report text area size (chars) */ 3631 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3633 break;
3507 case 19: /* report window size (chars) */ 3634 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3635 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3636 break;
3510 case 20: /* report icon label */ 3637 case 20: /* report icon label */
3511 { 3638 {
3512 char *s; 3639 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3640 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3642 XFree (s);
3516 } 3643 }
3517 break; 3644 break;
3518 case 21: /* report window title */ 3645 case 21: /* report window title */
3519 { 3646 {
3520 char *s; 3647 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3648 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3650 XFree (s);
3524 } 3651 }
3525 break; 3652 break;
3526 } 3653 }
3527} 3654}
… …
3530/*----------------------------------------------------------------------*/ 3657/*----------------------------------------------------------------------*/
3531/* 3658/*
3532 * get input up until STRING TERMINATOR (or BEL) 3659 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3660 * ends_how is terminator used. returned input must be free()'d
3534 */ 3661 */
3535unsigned char * 3662char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3663rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3664{
3538 unicode_t ch; 3665 unicode_t ch;
3539 bool seen_esc = false; 3666 bool seen_esc = false;
3540 unsigned int n = 0; 3667 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3686 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3687 return NULL; /* other control character - exit */
3561 3688
3562 seen_esc = false; 3689 seen_esc = false;
3563 3690
3564 if (n >= sizeof (string) - 1) 3691 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3692 // stop at some sane length
3566 return NULL; 3693 return NULL;
3567 3694
3568 if (ch == C0_SYN) 3695 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3696 string[n++] = cmd_get8 ();
… …
3573 3700
3574 string[n++] = '\0'; 3701 string[n++] = '\0';
3575 3702
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3703 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3704
3578 return (unsigned char *)rxvt_wcstombs (string); 3705 return rxvt_wcstombs (string);
3579} 3706}
3580 3707
3581/*----------------------------------------------------------------------*/ 3708/*----------------------------------------------------------------------*/
3582/* 3709/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3710 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3711 */
3585void 3712void
3586rxvt_term::process_dcs_seq () 3713rxvt_term::process_dcs_seq ()
3587{ 3714{
3588 unsigned char *s; 3715 char *s;
3589 unicode_t eh; 3716 unicode_t eh;
3590 3717
3591 /* 3718 /*
3592 * Not handled yet 3719 * Not handled yet
3593 */ 3720 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3739 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3740 arg = arg * 10 + (ch - '0');
3614 3741
3615 if (ch == ';') 3742 if (ch == ';')
3616 { 3743 {
3617 unsigned char *s = get_to_st (eh); 3744 char *s = get_to_st (eh);
3618 3745
3619 if (s) 3746 if (s)
3620 { 3747 {
3621 process_xterm_seq (arg, (char *)s, eh); 3748 process_xterm_seq (arg, s, eh);
3622 free (s); 3749 free (s);
3623 } 3750 }
3624 } 3751 }
3625} 3752}
3626 3753
3627void 3754void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3756{
3630 if (str[0] == '?' && !str[1]) 3757 if (str[0] == '?' && !str[1])
3631 { 3758 {
3632 unsigned short r, g, b; 3759 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b); 3760 pix_colors_focused[color].get (display, r, g, b);
… …
3637 set_window_color (color, str); 3764 set_window_color (color, str);
3638} 3765}
3639 3766
3640/* 3767/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3769 */
3665void 3770void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3772{
3668 int changed = 0;
3669 int color; 3773 int color;
3670 char *buf, *name; 3774 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3672 int saveop = op; 3776 int saveop = op;
3673 dDisp; 3777 dDisp;
… …
3694 unsigned long bytes_after; 3798 unsigned long bytes_after;
3695 unsigned char *value = 0; 3799 unsigned char *value = 0;
3696 const char *str = ""; 3800 const char *str = "";
3697 3801
3698 if (prop 3802 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3803 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3804 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3805 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3806 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3807 && actual_type != None
3704 && actual_format == 8) 3808 && actual_format == 8)
… …
3716 { 3820 {
3717 *eq = 0; 3821 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3822 set_utf8_property (display->atom (str), eq + 1);
3719 } 3823 }
3720 else 3824 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3825 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3826 display->atom (str));
3723 } 3827 }
3724 break; 3828 break;
3725 3829
3726 case XTerm_Color: 3830 case XTerm_Color:
… …
3728 { 3832 {
3729 if ((name = strchr (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3834 break;
3731 3835
3732 *name++ = '\0'; 3836 *name++ = '\0';
3733 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
3734 3838
3735 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3840 break;
3737 3841
3738 if ((buf = strchr (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3843 *buf++ = '\0';
3740 3844
3741 if (name[0] == '?' && !name[1]) 3845 if (name[0] == '?' && !name[1])
3742 { 3846 {
3743 unsigned short r, g, b; 3847 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3848 pix_colors_focused[color].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 } 3850 }
3747 else 3851 else
3748 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
3749 } 3853 }
3750 break; 3854 break;
3751 case XTerm_Color00: 3855 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3753 break; 3857 break;
3754 case XTerm_Color01: 3858 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3756 break; 3860 break;
3757#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3760 break; 3864 break;
… …
3764 break; 3868 break;
3765 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3767 break; 3871 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break;
3778 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3886 break;
3781#endif 3887#endif
3782#if TRANSPARENT && TINTING 3888#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3889 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3891 check_our_parents ();
3786 if (am_transparent) 3892 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3788 break; 3894 break;
3789#endif 3895#endif
3790 3896
3791 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3792 if (*str != ';') 3899 if (*str != ';')
3793 { 3900 {
3794#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3904 scr_touch (true);
3905#endif
3799 } 3906 }
3907
3908 int changed = 0;
3909
3800 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3801 { 3911 {
3802 str++; 3912 str++;
3803#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3805#endif 3915#endif
3806 } 3916 }
3807 3917
3808 if (changed) 3918 if (changed)
3809 { 3919 {
3810#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3921 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3922 scr_touch (true);
3923#endif
3814 } 3924 }
3925 }
3815 break; 3926 break;
3816 3927
3817 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3819 break; 3930 break;
3820 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3822 break; 3933 break;
3823 3934
3824 case XTerm_logfile: 3935 case XTerm_logfile:
3825 // TODO, when secure mode? 3936 // TODO, when secure mode?
3826 break; 3937 break;
3827 3938
3939#if 0
3940 case Rxvt_dumpscreen: /* no error notices */
3941 {
3942 int fd;
3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3944 {
3945 scr_dump (fd);
3946 close (fd);
3947 }
3948 }
3949 break;
3950#endif
3828 case XTerm_font: 3951 case XTerm_font:
3829 op = URxvt_font; 3952 op = URxvt_font;
3830 case URxvt_font: 3953 case URxvt_font:
3831#if ENABLE_STYLES 3954#if ENABLE_STYLES
3832 case URxvt_boldFont: 3955 case URxvt_boldFont:
3833 case URxvt_italicFont: 3956 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3957 case URxvt_boldItalicFont:
3835#endif 3958#endif
3836 if (query) 3959 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3960 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3962 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3963 resp);
3841 else 3964 else
3842 { 3965 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3966 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3967
… …
3847 set_fonts (); 3970 set_fonts ();
3848 } 3971 }
3849 break; 3972 break;
3850 3973
3851#if ENABLE_FRILLS 3974#if ENABLE_FRILLS
3852 case XTerm_locale: 3975 case URxvt_locale:
3853 if (query) 3976 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 3978 else
3856 { 3979 {
3857 set_locale (str); 3980 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3981 pty->set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3982 init_xlocale ();
3861# endif
3862 } 3983 }
3863 break; 3984 break;
3864#endif
3865 3985
3866#ifdef MENUBAR 3986 case URxvt_view_up:
3867 case XTerm_Menu: 3987 case URxvt_view_down:
3868 if (options & Opt_insecure) 3988 {
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3989 int lines = atoi (str);
3990
3991 if (lines)
3992 scr_page (op == URxvt_view_up ? UP : DN, lines);
3993 else
3994 scr_erase_savelines ();
3995 }
3996
3870 break; 3997 break;
3871#endif 3998#endif
3872#if 0 3999
3873 case XTerm_dumpscreen: /* no error notices */ 4000#if ENABLE_PERL
3874 { 4001 case URxvt_perl:
3875 int fd; 4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4003 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 4004 break;
3883#endif 4005#endif
3884 } 4006 }
3885} 4007}
3886/*----------------------------------------------------------------------*/ 4008/*----------------------------------------------------------------------*/
… …
3917 return state; 4039 return state;
3918} 4040}
3919 4041
3920/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
3921void 4043void
3922rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3923{ 4045{
3924 unsigned int i, j; 4046 unsigned int i, j;
3925 int state; 4047 int state;
3926 4048
3927 static const struct 4049 static const struct
… …
3938 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
3939 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
3940 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode 4063 // 8, bi-directional support mode
3942 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
3943#ifdef menuBar_esc
3944 { menuBar_esc, PrivMode_menuBar },
3945#endif
3946 // 18, 19 printing-related 4065 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor }, 4066 { 25, PrivMode_VisibleCursor },
3948#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
3949 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
3950#endif 4069#endif
… …
3995 } 4114 }
3996 4115
3997 /* extra handling for values with state unkept */ 4116 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4117 switch (arg[i])
3999 { 4118 {
4119#if ENABLE_STYLES
4120 case 1021:
4121 set_option (Opt_intensityStyles, mode);
4122
4123 scr_touch (true);
4124 break;
4125#endif
4000 case 1048: /* alternative cursor save */ 4126 case 1048: /* alternative cursor save */
4001 case 1049: 4127 case 1049:
4002 if (options & Opt_secondaryScreen) 4128 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4129 if (mode == 0)
4004 scr_cursor (RESTORE); 4130 scr_cursor (RESTORE);
4005 else if (mode == 1) 4131 else if (mode == 1)
4006 scr_cursor (SAVE); 4132 scr_cursor (SAVE);
4007 break; 4133 break;
… …
4019 */ 4145 */
4020 PrivMode (1, PrivMode_vt52); 4146 PrivMode (1, PrivMode_vt52);
4021 break; 4147 break;
4022 case 3: /* 80/132 */ 4148 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4149 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4150 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4151 break;
4026 case 4: /* smooth scrolling */ 4152 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 4153 set_option (Opt_jumpScroll, !state);
4031 break; 4154 break;
4032 case 5: /* reverse video */ 4155 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4156 scr_rvideo_mode (state);
4034 break; 4157 break;
4035 case 6: /* relative/absolute origins */ 4158 case 6: /* relative/absolute origins */
… …
4041 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
4042 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
4043 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
4044 priv_modes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
4045 break; 4168 break;
4046#ifdef menuBar_esc
4047 case menuBar_esc:
4048#ifdef MENUBAR
4049 map_menuBar (state);
4050#endif
4051 break;
4052#endif
4053#ifdef scrollBar_esc 4169#ifdef scrollBar_esc
4054 case scrollBar_esc: 4170 case scrollBar_esc:
4055 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
4056 { 4172 {
4057 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
4076#if 0 4192#if 0
4077 case 1001: 4193 case 1001:
4078 break; /* X11 mouse highlighting */ 4194 break; /* X11 mouse highlighting */
4079#endif 4195#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4196 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 4197 set_option (Opt_scrollTtyOutput, !state);
4085 break; 4198 break;
4086 case 1011: /* scroll to bottom on key press */ 4199 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 4200 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 4201 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4205 scr_erase_screen (2);
4096 scr_change_screen (state); 4206 scr_change_screen (state);
4097 break; 4207 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4208 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4209 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4210 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4211 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4212 scr_erase_screen (2);
4103 break; 4213 break;
4104 default: 4214 default:
4105 break; 4215 break;
… …
4233 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
4234 break; 4344 break;
4235 4345
4236 //case 50: // not variable spacing 4346 //case 50: // not variable spacing
4237 4347
4238#ifndef NO_BRIGHTCOLOR 4348#if ENABLE_FRILLS
4239 case 90: 4349 case 90:
4240 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
4241 case 92: 4351 case 92:
4242 case 93: 4352 case 93:
4243 case 94: 4353 case 94:
… …
4255 case 106: 4365 case 106:
4256 case 107: 4366 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4368 break;
4259#endif 4369#endif
4260
4261 } 4370 }
4262 } 4371 }
4263} 4372}
4264/*}}} */ 4373/*}}} */
4265 4374
… …
4289 */ 4398 */
4290void 4399void
4291rxvt_term::tt_printf (const char *fmt,...) 4400rxvt_term::tt_printf (const char *fmt,...)
4292{ 4401{
4293 va_list arg_ptr; 4402 va_list arg_ptr;
4294 unsigned char buf[256]; 4403 char buf[256];
4295 4404
4296 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4407 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4408 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4413 * or generated by us in response to a query ESC sequence.
4305 */ 4414 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4416
4308void 4417void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 4419{
4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4421 return;
4422
4423 if (pty->pty < 0)
4424 return;
4425
4311 if (v_buflen == 0) 4426 if (v_buflen == 0)
4312 { 4427 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4314 4429
4315 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4316 return; 4431 return;
4317 4432
4318 data += written; 4433 data += written;
4319 len -= written; 4434 len -= written;
4320 } 4435 }
4321 4436
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4438
4324 memcpy (v_buffer + v_buflen, data, len); 4439 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4440 v_buflen += len;
4326 4441
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328} 4443}
4329 4444
4330void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4331{ 4446{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333 4448
4334 if (written > 0) 4449 if (written > 0)
4335 { 4450 {
4336 v_buflen -= written; 4451 v_buflen -= written;
4337 4452
… …
4346 } 4461 }
4347 4462
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4463 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4464 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4466 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4467}
4354 4468
4355/*----------------------- end-of-file (C source) -----------------------*/ 4469/*----------------------- end-of-file (C source) -----------------------*/
4356 4470

Diff Legend

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