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.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 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
… …
1329 case ButtonRelease: 1401 case ButtonRelease:
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)
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1336 { 1407 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 {
1337 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))
1338 destroy (); 1413 destroy ();
1414 }
1339#if ENABLE_EWMH 1415#if ENABLE_EWMH
1340 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1341 XSendEvent (disp, ev.xclient.window = display->root, 1417 XSendEvent (disp, ev.xclient.window = display->root,
1342 False, SubstructureRedirectMask | SubstructureNotifyMask, 1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1343 &ev); 1419 &ev);
1420#endif
1421 }
1422#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1426 focus_in ();
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out ();
1429 }
1344#endif 1430#endif
1345 } 1431 }
1346#if ENABLE_XEMBED
1347 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1348 {
1349 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1350 focus_in ();
1351 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1352 focus_out ();
1353 }
1354#endif
1355#ifdef OFFIX_DND
1356 /* OffiX Dnd (drag 'n' drop) protocol */
1357 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1358 && (ev.xclient.data.l[0] == DndFile
1359 || ev.xclient.data.l[0] == DndDir
1360 || ev.xclient.data.l[0] == DndLink))
1361 {
1362 /* Get Dnd data */
1363 Atom ActualType;
1364 int ActualFormat;
1365 unsigned char *data;
1366 unsigned long Size, RemainingBytes;
1367
1368 XGetWindowProperty (disp, display->root,
1369 xa[XA_DNDSELECTION],
1370 0L, 1000000L,
1371 False, AnyPropertyType,
1372 &ActualType, &ActualFormat,
1373 &Size, &RemainingBytes,
1374 &data);
1375 set_string_property (XA_CUT_BUFFER0, data);
1376 XFree (data);
1377 selection_paste (display->root, XA_CUT_BUFFER0, true);
1378 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1379 }
1380#endif /* OFFIX_DND */
1381 break; 1432 break;
1382 1433
1383 case MappingNotify: 1434 case MappingNotify:
1384 XRefreshKeyboardMapping (&ev.xmapping); 1435 XRefreshKeyboardMapping (&ev.xmapping);
1385 break; 1436 break;
… …
1416 case FocusOut: 1467 case FocusOut:
1417 focus_out (); 1468 focus_out ();
1418 break; 1469 break;
1419 1470
1420 case ConfigureNotify: 1471 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1472 if (ev.xconfigure.window == parent[0])
1422 { 1473 {
1423 int height, width;
1424
1425 do
1426 { /* Wrap lots of configures into one */
1427 width = ev.xconfigure.width;
1428 height = ev.xconfigure.height;
1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430 }
1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1474 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1475 ;
1432 1476
1433 if (szHint.width != width || szHint.height != height) 1477 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1478 {
1435 seen_resize = 1; 1479 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1481 }
1438 1482
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1486 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1487 check_our_parents ();
1442#endif 1488#endif
1443 } 1489 }
1444 break; 1490 break;
1445 1491
… …
1461 1507
1462 case SelectionRequest: 1508 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1464 break; 1510 break;
1465 1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break;
1519
1466 case UnmapNotify: 1520 case UnmapNotify:
1467 TermWin.mapped = 0; 1521 mapped = 0;
1468#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1470#endif 1524#endif
1471 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 TermWin.mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1526 break;
1479 1527
1480#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1481 case ReparentNotify: 1529 case ReparentNotify:
1482 rootwin_cb (ev); 1530 rootwin_cb (ev);
1483 break; 1531 break;
1484#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1485 1533
1486 case GraphicsExpose: 1534 case GraphicsExpose:
1487 case Expose: 1535 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1489 { 1537 {
1490 do 1538 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1542
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1544
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1500 1548
1501 scr_refresh (refresh_type); 1549 want_refresh = 1;
1502 } 1550 }
1503 else 1551 else
1504 { 1552 {
1505 XEvent unused_event; 1553 XEvent unused_event;
1506 1554
… …
1512 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1513 { 1561 {
1514 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1515 scrollbar_show (0); 1563 scrollbar_show (0);
1516 } 1564 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1565
1522#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (disp, ev.xany.window);
1525#endif 1569#endif
1526 } 1570 }
1527 break; 1571 break;
1528 1572
1529 case MotionNotify: 1573 case MotionNotify:
1530#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1575 if (hidden_pointer)
1532 pointer_unblank (); 1576 pointer_unblank ();
1533#endif 1577#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1579 break;
1543 1580
1544 if (ev.xany.window == TermWin.vt) 1581 if (ev.xany.window == vt)
1545 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1587 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1589 ;
1550 1590
1551 XQueryPointer (disp, TermWin.vt, 1591 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1595 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1568#endif 1608#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1611
1572#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1615 {
1576 int dist; 1616 int dist;
1577 1617
1578 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1630
1591 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1593 { 1633 {
1594 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1596 } 1636 }
1597 else 1637 else
1598 { 1638 {
1599 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1640 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1641 }
1602 1642
1603 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1645 + 1;
1606 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1608 } 1648 }
1609 else 1649 else
1610 { 1650 {
1611 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1631 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1673 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1675 scrollbar_size ());
1636 scr_refresh (refresh_type); 1676 want_refresh = 1;
1637 refresh_limit = 0; 1677 refresh_limit = 0;
1638 scrollbar_show (1); 1678 scrollbar_show (1);
1639 } 1679 }
1640 break; 1680 break;
1641 } 1681 }
1682
1683skip_switch: ;
1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1642} 1711}
1643 1712
1644void 1713void
1645rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1646{ 1715{
1647 if (!TermWin.focus) 1716 if (!focus)
1648 { 1717 {
1649 TermWin.focus = 1; 1718 focus = 1;
1650 want_refresh = 1; 1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1722
1651#ifdef USE_XIM 1723#if USE_XIM
1652 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1653 { 1725 {
1654 IMSetStatusPosition (); 1726 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1656 } 1728 }
1657#endif 1729#endif
1658#ifdef CURSOR_BLINK 1730#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1731 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661#endif 1733#endif
1662#ifdef OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1664 { 1736 {
1665 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1738 scr_recolour ();
1667 } 1739 }
… …
1670} 1742}
1671 1743
1672void 1744void
1673rxvt_term::focus_out () 1745rxvt_term::focus_out ()
1674{ 1746{
1675 if (TermWin.focus) 1747 if (focus)
1676 { 1748 {
1677 TermWin.focus = 0; 1749 focus = 0;
1678 want_refresh = 1; 1750 want_refresh = 1;
1679 1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1680#if ENABLE_FRILLS || ISO_14755 1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1681 iso14755buf = 0; 1757 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1758# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1759 scr_overlay_off ();
1685#endif 1760# endif
1761 }
1762#endif
1686#ifdef USE_XIM 1763#if USE_XIM
1687 if (Input_Context != NULL) 1764 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1765 XUnsetICFocus (Input_Context);
1689#endif 1766#endif
1690#ifdef CURSOR_BLINK 1767#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1768 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1769 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1770 hidden_cursor = 0;
1694#endif 1771#endif
1695#ifdef OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1697 { 1774 {
1698 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1776 scr_recolour ();
1700 } 1777 }
… …
1704 1781
1705#if TRANSPARENT 1782#if TRANSPARENT
1706void 1783void
1707rxvt_term::rootwin_cb (XEvent &ev) 1784rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1785{
1709 SET_R (this); 1786 make_current ();
1710 SET_LOCALE (locale);
1711 1787
1712 switch (ev.type) 1788 switch (ev.type)
1713 { 1789 {
1714 case PropertyNotify: 1790 case PropertyNotify:
1715 /* 1791 /*
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1796 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1797 return;
1722 1798
1723 /* FALLTHROUGH */ 1799 /* FALLTHROUGH */
1724 case ReparentNotify: 1800 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1801 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1802 want_refresh = want_full_refresh = 1;
1727 break; 1803 break;
1728 } 1804 }
1729} 1805}
1730#endif 1806#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1809rxvt_term::button_press (XButtonEvent &ev)
1734{ 1810{
1735 int reportmode = 0, clickintime; 1811 int reportmode = 0, clickintime;
1736 1812
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1813 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1814
1738 if (!bypass_keystate) 1815 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1816 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1817
1741 /* 1818 /*
1742 * VT window processing of button press 1819 * VT window processing of button press
1743 */ 1820 */
1744 if (ev.window == TermWin.vt) 1821 if (ev.window == vt)
1745 { 1822 {
1746#if ISO_14755 1823#if ISO_14755
1747 // 5.4 1824 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1826 {
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1839#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1840 if (ev.button == MEvent.button && clickintime)
1764 { 1841 {
1765 /* same button, within alloted time */ 1842 /* same button, within alloted time */
1766 MEvent.clicks++; 1843 MEvent.clicks++;
1844
1767 if (MEvent.clicks > 1) 1845 if (MEvent.clicks > 1)
1768 { 1846 {
1769 /* only report double clicks */ 1847 /* only report double clicks */
1770 MEvent.clicks = 2; 1848 MEvent.clicks = 2;
1771 mouse_report (ev); 1849 mouse_report (ev);
… …
1791 else 1869 else
1792 { 1870 {
1793 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1795 1873
1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1875 switch (ev.button)
1797 { 1876 {
1798 case Button1: 1877 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1879 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1880#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1881 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1882#else
1804 selection.rect = false; 1883 selection.rect = false;
1805#endif 1884#endif
1806 1885
1807 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1888 {
1810 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1812 else 1891 else
1813 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
1814 } 1893 }
1815 else 1894 else
1816 { 1895 {
1817 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1897 MEvent.clicks++;
1819 else 1898 else
1820 MEvent.clicks = 1; 1899 MEvent.clicks = 1;
1821 1900
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1901 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1902 }
1824 1903
1825 MEvent.button = Button1; 1904 MEvent.button = Button1;
1826 break; 1905 break;
1827 1906
1828 case Button3: 1907 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1831 else 1910 else
1832 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1833 1912
1834 MEvent.button = Button3; 1913 MEvent.button = Button3;
1835 break; 1914 break;
1836 } 1915 }
1837 } 1916 }
1838 1917
1839 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1840 return; 1919 return;
1841 } 1920 }
1842 1921
… …
1954 case Button3: 2033 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1956 { 2035 {
1957 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1960# else 2039# else
1961 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1962# endif 2041# endif
1963 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1966# else 2045# else
1967 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1968# endif 2047# endif
1969 else 2048 else
1970 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1971 } 2050 }
1972 else 2051 else
1973 { 2052 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2054 (nrow
1976 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2056 / scrollbar_size ()));
1978 } 2057 }
1979 2058
1980 break; 2059 break;
1981 } 2060 }
1982 } 2061 }
2062
1983 return; 2063 return;
1984 } 2064 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2065}
1993 2066
1994void 2067void
1995rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1996{ 2069{
… …
2002 2075
2003 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2004 { 2077 {
2005 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2006 scrollbar_show (0); 2079 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2080 }
2011 2081
2012#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2015#endif 2085#endif
2016 2086
2017 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
2018 { 2088 {
2019#if ISO_14755 2089#if ISO_14755
2020 // 5.4 2090 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2092 return;
… …
2052 if (priv_modes & PrivMode_mouse_report 2122 if (priv_modes & PrivMode_mouse_report
2053 && bypass_keystate 2123 && bypass_keystate
2054 && ev.button == Button1 && MEvent.clicks <= 1) 2124 && ev.button == Button1 && MEvent.clicks <= 1)
2055 selection_extend (ev.x, ev.y, 0); 2125 selection_extend (ev.x, ev.y, 0);
2056 2126
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2057 switch (ev.button) 2130 switch (ev.button)
2058 { 2131 {
2059 case Button1: 2132 case Button1:
2060 case Button3: 2133 case Button3:
2061 selection_make (ev.time); 2134 selection_make (ev.time);
2062 break; 2135 break;
2136
2063 case Button2: 2137 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2065 break; 2140 break;
2141
2066#ifdef MOUSE_WHEEL 2142#ifdef MOUSE_WHEEL
2067 case Button4: 2143 case Button4:
2068 case Button5: 2144 case Button5:
2069 { 2145 {
2070 int i; 2146 int i;
… …
2072 2148
2073 v = ev.button == Button4 ? UP : DN; 2149 v = ev.button == Button4 ? UP : DN;
2074 2150
2075 if (ev.state & ShiftMask) 2151 if (ev.state & ShiftMask)
2076 i = 1; 2152 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2153 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2154 i = nrow - 1;
2079 else 2155 else
2080 i = 5; 2156 i = 5;
2081 2157
2082# ifdef MOUSE_SLIP_WHEELING 2158# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2159 if (ev.state & ControlMask)
2084 { 2160 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2161 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2162 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2087 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2163 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2164
2089 if (slip_wheel_ev.at < NOW) 2165 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2166 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2167
2092 slip_wheel_ev.start (); 2168 slip_wheel_ev.start ();
2093 } 2169 }
2094 else 2170 else
2095 { 2171 {
2096# endif 2172# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2173 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2174 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
2110 } 2176 }
2111#endif 2177# endif
2112 } 2178 }
2113 break; 2179 break;
2114#endif 2180#endif
2115 } 2181 }
2116 } 2182 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2183}
2122 2184
2123#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2124#if TINTING 2186#if TINTING
2125/* taken from aterm-0.4.2 */ 2187/* taken from aterm-0.4.2 */
… …
2368 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2431 dDisp;
2370 2432
2371 pchanged = 0; 2433 pchanged = 0;
2372 2434
2373 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2375 2437
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2378 2440
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2442
2381 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2382 { 2444 {
2383 if (am_transparent) 2445 if (am_transparent)
2384 { 2446 {
2385 pchanged = 1; 2447 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2388 } 2450 }
2389 2451
2390 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2391 } 2453 }
… …
2432 Window cr; 2494 Window cr;
2433 XImage *image; 2495 XImage *image;
2434 GC gc; 2496 GC gc;
2435 XGCValues gcvalue; 2497 XGCValues gcvalue;
2436 2498
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2503 nx = ny = 0;
2442 2504
… …
2452 nh += sy; 2514 nh += sy;
2453 ny = -sy; 2515 ny = -sy;
2454 sy = 0; 2516 sy = 0;
2455 } 2517 }
2456 2518
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2521
2460 XSync (disp, False); 2522 XSync (disp, False);
2461 allowedxerror = -1; 2523 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2525
… …
2468 if (image == NULL) 2530 if (image == NULL)
2469 { 2531 {
2470 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2471 { 2533 {
2472 pchanged = 1; 2534 pchanged = 1;
2473 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2474 { 2536 {
2475 XFreePixmap (disp, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2538 pixmap = None;
2477 } 2539 }
2478 } 2540 }
2479 2541
2480 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2481 } 2543 }
2482 else 2544 else
2483 { 2545 {
2484 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2486 2548
2487#if TINTING 2549#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2551 {
2490 unsigned short rm, gm, bm; 2552 unsigned short rm, gm, bm;
… …
2494 2556
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2558 }
2497#endif 2559#endif
2498 2560
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2562 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2565 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2566 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2567 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2569 XClearWindow (disp, parent[0]);
2508 2570
2509 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2572 pchanged = 1;
2511 2573
2512 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2513 } 2575 }
2514 } 2576 }
2515 2577
2516 if (am_pixmap_trans) 2578 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2580 else
2519 { 2581 {
2520 unsigned int n; 2582 unsigned int n;
2521 /* 2583 /*
2522 * InheritPixmap transparency 2584 * InheritPixmap transparency
2523 */ 2585 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2587 {
2526 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2529 XFree (list); 2591 XFree (list);
2530 2592
2531 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2532 { 2594 {
2533 if (oldp != None) 2595 if (oldp != None)
2534 pchanged = 1; 2596 pchanged = 1;
2535 2597
2536 break; 2598 break;
2537 } 2599 }
2538 2600
2539 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2540 pchanged = 1; 2602 pchanged = 1;
2541 } 2603 }
2542 2604
2543 n = 0; 2605 n = 0;
2544 2606
2545 if (pchanged) 2607 if (pchanged)
2546 { 2608 {
2547 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2548 { 2610 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2611 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2613 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2615 break;
2554 } 2616 }
2555 } 2617 }
2556 } 2618 }
2557 2619
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2621 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2624 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2564 } 2626 }
2565 else 2627 else
2566 { 2628 {
… …
2569 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2632 sleep (1);
2571#endif 2633#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2573 { 2635 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2637 XClearWindow (disp, parent[n]);
2576 } 2638 }
2577 2639
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2641 am_transparent = 1;
2580 } 2642 }
2581 2643
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2645 parent[i] = None;
2584 } 2646 }
2585 2647
2586 if (scrollBar.win) 2648 if (scrollBar.win)
2587 { 2649 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2605 2667
2606bool 2668bool
2607rxvt_term::cmd_parse () 2669rxvt_term::cmd_parse ()
2608{ 2670{
2609 bool flag = false; 2671 bool flag = false;
2610 unicode_t ch = NOCHAR; 2672 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2673 char *seq_begin; // remember start of esc-sequence here
2612 2674
2613 for (;;) 2675 for (;;)
2614 { 2676 {
2615 if (ch == NOCHAR) 2677 if (ch == NOCHAR)
2616 { 2678 {
2617 seq_begin = cmdbuf_ptr; 2679 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2680 ch = next_char ();
2619 }
2620 2681
2621 if (ch == NOCHAR) // TODO: improve 2682 if (ch == NOCHAR)
2622 break; 2683 break;
2684 }
2623 2685
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2687 {
2626 if (!seen_input) 2688 if (!seen_input)
2627 { 2689 {
… …
2636 if (seen_resize && cmd_pid) 2698 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2699 kill (-cmd_pid, SIGWINCH);
2638 } 2700 }
2639 2701
2640 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2703 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2704 bool refreshnow = false;
2643 int nlines = 0; 2705 int nlines = 0;
2644 unicode_t *str = buf; 2706 wchar_t *str = buf;
2707 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2708
2646 for (;;) 2709 for (;;)
2647 { 2710 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2712 break;
2650 2713
2651 *str++ = ch; 2714 *str++ = ch;
2652 2715
2653 if (ch == C0_LF) 2716 if (ch == C0_LF || str >= eol)
2654 { 2717 {
2718 if (ch == C0_LF)
2655 nlines++; 2719 nlines++;
2720
2656 refresh_count++; 2721 refresh_count++;
2657 2722
2658 if (!(options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2725 {
2661 refreshnow = true; 2726 refreshnow = true;
2727 refresh_count = 0;
2662 ch = NOCHAR; 2728 ch = NOCHAR;
2663 break; 2729 break;
2664 } 2730 }
2665 2731
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
2668 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2669 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, str - buf, nlines);
2738
2670 nlines = 0; 2739 nlines = 0;
2671 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2672 } 2742 }
2673 }
2674 2743
2675 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2676 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2677 ch = NOCHAR; 2748 ch = NOCHAR;
2678 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2679 } 2755 }
2680 2756
2681 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2758 ch = next_char ();
2683 } 2759 }
2684 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2685 scr_add_lines (buf, nlines, str - buf); 2763 scr_add_lines (buf, str - buf, nlines);
2686 2764
2687 /* 2765 /*
2688 * If there have been a lot of new lines, then update the screen 2766 * If there have been a lot of new lines, then update the screen
2689 * What the heck I'll cheat and only refresh less than every page-full. 2767 * What the heck I'll cheat and only refresh less than every page-full.
2690 * the number of pages between refreshes is refresh_limit, which 2768 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2769 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2770 */
2693 if (refreshnow) 2771 if (refreshnow)
2694 { 2772 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2774 refresh_limit++;
2697 else 2775 else
2698 { 2776 {
2699 flag = true; 2777 flag = true;
2700 scr_refresh (refresh_type); 2778 scr_refresh ();
2779 want_refresh = 1;
2701 } 2780 }
2702 } 2781 }
2703 2782
2704 } 2783 }
2705 else 2784 else
… …
2720 } 2799 }
2721 2800
2722 return flag; 2801 return flag;
2723} 2802}
2724 2803
2725// read the next octet
2726unicode_t
2727rxvt_term::next_octet ()
2728{
2729 return cmdbuf_ptr < cmdbuf_endp
2730 ? *cmdbuf_ptr++
2731 : NOCHAR;
2732}
2733
2734// read the next character 2804// read the next character
2735unicode_t 2805wchar_t
2736rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2737{ 2807{
2738 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2739 { 2809 {
2740 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2741 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2742 return *cmdbuf_ptr++; 2812 return *cmdbuf_ptr++;
2743 2813
2744 wchar_t wc; 2814 wchar_t wc;
2745 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2815 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2746 2816
2747 if (len == (size_t)-2) 2817 if (len == (size_t)-2)
2748 { 2818 {
2749 // the mbstate stores incomplete sequences. didn't know this :/ 2819 // the mbstate stores incomplete sequences. didn't know this :/
2750 cmdbuf_ptr = cmdbuf_endp; 2820 cmdbuf_ptr = cmdbuf_endp;
2751 break; 2821 break;
2752 } 2822 }
2753 2823
2754 if (len == (size_t)-1) 2824 if (len == (size_t)-1)
2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2825 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2756 2826
2757 // assume wchar == unicode 2827 // assume wchar == unicode
2758 cmdbuf_ptr += len; 2828 cmdbuf_ptr += len;
2759 return wc & UNICODE_MASK; 2829 return wc & UNICODE_MASK;
2760 } 2830 }
2761 2831
2762 return NOCHAR; 2832 return NOCHAR;
2763} 2833}
2834
2835// read the next octet
2836uint32_t
2837rxvt_term::next_octet () NOTHROW
2838{
2839 return cmdbuf_ptr < cmdbuf_endp
2840 ? (unsigned char)*cmdbuf_ptr++
2841 : NOCHAR;
2842}
2843
2844static class out_of_input out_of_input;
2764 2845
2765/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2766/* 2847/*
2767 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2768 * to the command. 2849 * to the command.
2769 */ 2850 */
2770unicode_t 2851wchar_t
2771rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2772{ 2853{
2773 unicode_t c = next_char (); 2854 wchar_t c = next_char ();
2774 2855
2775 if (c == NOCHAR) 2856 if (c == NOCHAR)
2776 throw out_of_input; 2857 throw out_of_input;
2777 2858
2778 return c; 2859 return c;
2779} 2860}
2780 2861
2781unicode_t 2862uint32_t
2782rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2783{ 2864{
2784 unicode_t c = next_octet (); 2865 uint32_t c = next_octet ();
2785 2866
2786 if (c == NOCHAR) 2867 if (c == NOCHAR)
2787 throw out_of_input; 2868 throw out_of_input;
2788 2869
2789 return c; 2870 return c;
… …
2889 case C0_ESC: 2970 case C0_ESC:
2890 process_escape_seq (); 2971 process_escape_seq ();
2891 break; 2972 break;
2892 case C0_ENQ: /* terminal Status */ 2973 case C0_ENQ: /* terminal Status */
2893 if (rs[Rs_answerbackstring]) 2974 if (rs[Rs_answerbackstring])
2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2975 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2896 else 2976 else
2897 tt_write ((unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, strlen (VT100_ANS));
2898 (unsigned int)strlen (VT100_ANS));
2899 break; 2978 break;
2900 case C0_BEL: /* bell */ 2979 case C0_BEL: /* bell */
2901 scr_bell (); 2980 scr_bell ();
2902 break; 2981 break;
2903 case C0_BS: /* backspace */ 2982 case C0_BS: /* backspace */
… …
3058 break; 3137 break;
3059 3138
3060 /* 8.3.87: NEXT LINE */ 3139 /* 8.3.87: NEXT LINE */
3061 case C1_NEL: /* ESC E */ 3140 case C1_NEL: /* ESC E */
3062 { 3141 {
3063 unicode_t nlcr[] = { C0_LF, C0_CR }; 3142 wchar_t nlcr[] = { C0_LF, C0_CR };
3064 scr_add_lines (nlcr, 1, 2); 3143 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3065 } 3144 }
3066 break; 3145 break;
3067 3146
3068 /* kidnapped escape sequence: Should be 8.3.48 */ 3147 /* kidnapped escape sequence: Should be 8.3.48 */
3069 case C1_ESA: /* ESC G */ 3148 case C1_ESA: /* ESC G */
… …
3091 process_dcs_seq (); 3170 process_dcs_seq ();
3092 break; 3171 break;
3093 3172
3094 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3173 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3095 case C1_SCI: /* ESC Z */ 3174 case C1_SCI: /* ESC Z */
3096 tt_write ((const unsigned char *)ESCZ_ANSWER, 3175 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3097 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3098 break; /* steal obsolete ESC [ c */ 3176 break; /* steal obsolete ESC [ c */
3099 3177
3100 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3178 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3101 case C1_CSI: /* ESC [ */ 3179 case C1_CSI: /* ESC [ */
3102 process_csi_seq (); 3180 process_csi_seq ();
… …
3342 3420
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3421 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3422 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3423 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3424 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3425 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3426 break;
3349 3427
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3428 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3429 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3352 (unsigned int) (sizeof (VT100_ANS) - 1));
3353 break; 3430 break;
3354 3431
3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3356 process_sgr_mode (nargs, arg); 3433 process_sgr_mode (nargs, arg);
3357 break; 3434 break;
… …
3364 break; 3441 break;
3365 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
3366 scr_report_position (); 3443 scr_report_position ();
3367 break; 3444 break;
3368 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3446 if (OPTION (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3448 break;
3372 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3451 break;
… …
3477 { 3554 {
3478 /* 3555 /*
3479 * commands 3556 * commands
3480 */ 3557 */
3481 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
3483 break; 3560 break;
3484 case 2: /* iconify window */ 3561 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3562 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3563 break;
3487 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3566 break;
3490 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3569 break;
3493 case 5: /* raise window */ 3570 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
3495 break; 3572 break;
3496 case 6: /* lower window */ 3573 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
3498 break; 3575 break;
3499 case 7: /* refresh window */ 3576 case 7: /* refresh window */
3500 scr_touch (true); 3577 scr_touch (true);
3501 break; 3578 break;
3502 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
3505 break; 3582 break;
3506 3583
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3585 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
3512 break; 3589 break;
3513 3590
3514 3591
3515 /* 3592 /*
3516 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
3517 */ 3594 */
3518 case 11: /* report window state */ 3595 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3598 break;
3522 case 13: /* report window position */ 3599 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3605 break;
3529 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3609 break;
3533 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3612 break;
3536 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3615 break;
3539 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3540 { 3617 {
3541 char *s; 3618 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3621 XFree (s);
3545 } 3622 }
3546 break; 3623 break;
3547 case 21: /* report window title */ 3624 case 21: /* report window title */
3548 { 3625 {
3549 char *s; 3626 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3629 XFree (s);
3553 } 3630 }
3554 break; 3631 break;
3555 } 3632 }
3556} 3633}
… …
3559/*----------------------------------------------------------------------*/ 3636/*----------------------------------------------------------------------*/
3560/* 3637/*
3561 * get input up until STRING TERMINATOR (or BEL) 3638 * get input up until STRING TERMINATOR (or BEL)
3562 * ends_how is terminator used. returned input must be free()'d 3639 * ends_how is terminator used. returned input must be free()'d
3563 */ 3640 */
3564unsigned char * 3641char *
3565rxvt_term::get_to_st (unicode_t &ends_how) 3642rxvt_term::get_to_st (unicode_t &ends_how)
3566{ 3643{
3567 unicode_t ch; 3644 unicode_t ch;
3568 bool seen_esc = false; 3645 bool seen_esc = false;
3569 unsigned int n = 0; 3646 unsigned int n = 0;
… …
3588 else if (ch < 0x20) 3665 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
3590 3667
3591 seen_esc = false; 3668 seen_esc = false;
3592 3669
3593 if (n >= sizeof (string) - 1) 3670 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3671 // stop at some sane length
3595 return NULL; 3672 return NULL;
3596 3673
3597 if (ch == C0_SYN) 3674 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3675 string[n++] = cmd_get8 ();
… …
3602 3679
3603 string[n++] = '\0'; 3680 string[n++] = '\0';
3604 3681
3605 ends_how = (ch == 0x5c ? C0_ESC : ch); 3682 ends_how = (ch == 0x5c ? C0_ESC : ch);
3606 3683
3607 return (unsigned char *)rxvt_wcstombs (string); 3684 return rxvt_wcstombs (string);
3608} 3685}
3609 3686
3610/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3611/* 3688/*
3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3613 */ 3690 */
3614void 3691void
3615rxvt_term::process_dcs_seq () 3692rxvt_term::process_dcs_seq ()
3616{ 3693{
3617 unsigned char *s; 3694 char *s;
3618 unicode_t eh; 3695 unicode_t eh;
3619 3696
3620 /* 3697 /*
3621 * Not handled yet 3698 * Not handled yet
3622 */ 3699 */
… …
3641 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3718 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3642 arg = arg * 10 + (ch - '0'); 3719 arg = arg * 10 + (ch - '0');
3643 3720
3644 if (ch == ';') 3721 if (ch == ';')
3645 { 3722 {
3646 unsigned char *s = get_to_st (eh); 3723 char *s = get_to_st (eh);
3647 3724
3648 if (s) 3725 if (s)
3649 { 3726 {
3650 process_xterm_seq (arg, (char *)s, eh); 3727 process_xterm_seq (arg, s, eh);
3651 free (s); 3728 free (s);
3652 } 3729 }
3653 } 3730 }
3654} 3731}
3655 3732
3656void 3733void
3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3658{ 3735{
3659 if (str[0] == '?' && !str[1]) 3736 if (str[0] == '?' && !str[1])
3660 { 3737 {
3661 unsigned short r, g, b; 3738 unsigned short r, g, b;
3662 pix_colors_focused[color].get (display, r, g, b); 3739 pix_colors_focused[color].get (display, r, g, b);
… …
3666 set_window_color (color, str); 3743 set_window_color (color, str);
3667} 3744}
3668 3745
3669/* 3746/*
3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3671 * 0 = change iconName/title
3672 * 1 = change iconName
3673 * 2 = change title
3674 * 4 = change color
3675 * 10 = change fg color
3676 * 11 = change bg color
3677 * 12 = change text color
3678 * 13 = change mouse foreground color
3679 * 17 = change highlight character colour
3680 * 18 = change bold character color
3681 * 19 = change underlined character color
3682 * 46 = change logfile (not implemented)
3683 * 50 = change font
3684 *
3685 * rxvt extensions:
3686 * 20 = bg pixmap
3687 * 39 = change default fg color
3688 * 49 = change default bg color
3689 * 55 = dump scrollback buffer and all of screen
3690 * 701 = change locale
3691 * 702 = find font
3692 * 703 = menu
3693 */ 3748 */
3694void 3749void
3695rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3696{ 3751{
3697 int changed = 0;
3698 int color; 3752 int color;
3699 char *buf, *name; 3753 char *buf, *name;
3700 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3701 int saveop = op; 3755 int saveop = op;
3702 dDisp; 3756 dDisp;
… …
3723 unsigned long bytes_after; 3777 unsigned long bytes_after;
3724 unsigned char *value = 0; 3778 unsigned char *value = 0;
3725 const char *str = ""; 3779 const char *str = "";
3726 3780
3727 if (prop 3781 if (prop
3728 && XGetWindowProperty (disp, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3729 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3730 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3731 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3732 && actual_type != None 3786 && actual_type != None
3733 && actual_format == 8) 3787 && actual_format == 8)
… …
3745 { 3799 {
3746 *eq = 0; 3800 *eq = 0;
3747 set_utf8_property (display->atom (str), eq + 1); 3801 set_utf8_property (display->atom (str), eq + 1);
3748 } 3802 }
3749 else 3803 else
3750 XDeleteProperty (disp, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3751 display->atom (str)); 3805 display->atom (str));
3752 } 3806 }
3753 break; 3807 break;
3754 3808
3755 case XTerm_Color: 3809 case XTerm_Color:
… …
3757 { 3811 {
3758 if ((name = strchr (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3759 break; 3813 break;
3760 3814
3761 *name++ = '\0'; 3815 *name++ = '\0';
3762 color = atoi (buf); 3816 color = atoi (buf) + minCOLOR;
3763 3817
3764 if (color < 0 || color >= TOTAL_COLORS) 3818 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3765 break; 3819 break;
3766 3820
3767 if ((buf = strchr (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3768 *buf++ = '\0'; 3822 *buf++ = '\0';
3769 3823
3770 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3771 { 3825 {
3772 unsigned short r, g, b; 3826 unsigned short r, g, b;
3773 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3827 pix_colors_focused[color].get (display, r, g, b);
3774 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3775 } 3829 }
3776 else 3830 else
3777 set_window_color (color + minCOLOR, name); 3831 set_window_color (color, name);
3778 } 3832 }
3779 break; 3833 break;
3780 case XTerm_Color00: 3834 case XTerm_Color00:
3781 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3782 break; 3836 break;
3783 case XTerm_Color01: 3837 case XTerm_Color01:
3784 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3785 break; 3839 break;
3786#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
3787 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
3788 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3789 break; 3843 break;
… …
3793 break; 3847 break;
3794 case XTerm_Color_pointer_bg: 3848 case XTerm_Color_pointer_bg:
3795 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3796 break; 3850 break;
3797#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3798 case XTerm_Color_BD:
3799 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800 break;
3801 case XTerm_Color_IT:
3802 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3803 break;
3804 case XTerm_Color_UL:
3805 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3806 break;
3807 case XTerm_Color_RV: 3852 case XTerm_Color_RV:
3808 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3809 break; 3854 break;
3855 case Rxvt_Color_BD:
3856 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp);
3858 break;
3859 case Rxvt_Color_UL:
3860 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp);
3862 break;
3863 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3865 break;
3810#endif 3866#endif
3811#if TRANSPARENT && TINTING 3867#if TRANSPARENT && TINTING
3812 case XTerm_Color_tint: 3868 case URxvt_Color_tint:
3813 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3814 check_our_parents (); 3870 check_our_parents ();
3815 if (am_transparent) 3871 if (am_transparent)
3816 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3817 break; 3873 break;
3818#endif 3874#endif
3819 3875
3820 case XTerm_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3821 if (*str != ';') 3878 if (*str != ';')
3822 { 3879 {
3823#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3824 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3825 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3826#endif
3827 scr_touch (true); 3883 scr_touch (true);
3884#endif
3828 } 3885 }
3886
3887 int changed = 0;
3888
3829 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3830 { 3890 {
3831 str++; 3891 str++;
3832#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3833 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3834#endif 3894#endif
3835 } 3895 }
3836 3896
3837 if (changed) 3897 if (changed)
3838 { 3898 {
3839#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3840 resize_pixmap (); 3900 resize_pixmap ();
3841#endif
3842 scr_touch (true); 3901 scr_touch (true);
3902#endif
3843 } 3903 }
3904 }
3844 break; 3905 break;
3845 3906
3846 case XTerm_restoreFG: 3907 case Rxvt_restoreFG:
3847 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3848 break; 3909 break;
3849 case XTerm_restoreBG: 3910 case Rxvt_restoreBG:
3850 set_window_color (Color_bg, str); 3911 set_window_color (Color_bg, str);
3851 break; 3912 break;
3852 3913
3853 case XTerm_logfile: 3914 case XTerm_logfile:
3854 // TODO, when secure mode? 3915 // TODO, when secure mode?
3855 break; 3916 break;
3856 3917
3918#if 0
3919 case Rxvt_dumpscreen: /* no error notices */
3920 {
3921 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 {
3924 scr_dump (fd);
3925 close (fd);
3926 }
3927 }
3928 break;
3929#endif
3857 case XTerm_font: 3930 case XTerm_font:
3858 op = URxvt_font; 3931 op = URxvt_font;
3859 case URxvt_font: 3932 case URxvt_font:
3860#if ENABLE_STYLES 3933#if ENABLE_STYLES
3861 case URxvt_boldFont: 3934 case URxvt_boldFont:
3862 case URxvt_italicFont: 3935 case URxvt_italicFont:
3863 case URxvt_boldItalicFont: 3936 case URxvt_boldItalicFont:
3864#endif 3937#endif
3865 if (query) 3938 if (query)
3866 tt_printf ("\33]%d;%-.250s%c", saveop, 3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3867 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3868 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3941 ? fontset[op - URxvt_font]->fontdesc : "",
3869 resp); 3942 resp);
3870 else 3943 else
3871 { 3944 {
3872 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3873 3946
… …
3876 set_fonts (); 3949 set_fonts ();
3877 } 3950 }
3878 break; 3951 break;
3879 3952
3880#if ENABLE_FRILLS 3953#if ENABLE_FRILLS
3881 case XTerm_locale: 3954 case URxvt_locale:
3882 if (query) 3955 if (query)
3883 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3884 else 3957 else
3885 { 3958 {
3886 set_locale (str); 3959 set_locale (str);
3887 pty.set_utf8_mode (enc_utf8); 3960 pty->set_utf8_mode (enc_utf8);
3888 init_xlocale (); 3961 init_xlocale ();
3889 } 3962 }
3890 break; 3963 break;
3891#endif
3892 3964
3893#ifdef MENUBAR 3965 case URxvt_view_up:
3894 case XTerm_Menu: 3966 case URxvt_view_down:
3895 if (options & Opt_insecure) 3967 {
3896 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 int lines = atoi (str);
3969
3970 if (lines)
3971 scr_page (op == URxvt_view_up ? UP : DN, lines);
3972 else
3973 scr_erase_savelines ();
3974 }
3975
3897 break; 3976 break;
3898#endif 3977#endif
3899#if 0 3978
3900 case XTerm_dumpscreen: /* no error notices */ 3979#if ENABLE_PERL
3901 { 3980 case URxvt_perl:
3902 int fd; 3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3903 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3982 ; // no responses yet
3904 {
3905 scr_dump (fd);
3906 close (fd);
3907 }
3908 }
3909 break; 3983 break;
3910#endif 3984#endif
3911 } 3985 }
3912} 3986}
3913/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
… …
3944 return state; 4018 return state;
3945} 4019}
3946 4020
3947/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
3948void 4022void
3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3950{ 4024{
3951 unsigned int i, j; 4025 unsigned int i, j;
3952 int state; 4026 int state;
3953 4027
3954 static const struct 4028 static const struct
… …
3965 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
3966 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
3967 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
3969 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc
3971 { menuBar_esc, PrivMode_menuBar },
3972#endif
3973 // 18, 19 printing-related 4044 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
3975#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 4048#endif
… …
4022 } 4093 }
4023 4094
4024 /* extra handling for values with state unkept */ 4095 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4096 switch (arg[i])
4026 { 4097 {
4098#if ENABLE_STYLES
4099 case 1021:
4100 set_option (Opt_intensityStyles, mode);
4101
4102 scr_touch (true);
4103 break;
4104#endif
4027 case 1048: /* alternative cursor save */ 4105 case 1048: /* alternative cursor save */
4028 case 1049: 4106 case 1049:
4029 if (options & Opt_secondaryScreen) 4107 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4108 if (mode == 0)
4031 scr_cursor (RESTORE); 4109 scr_cursor (RESTORE);
4032 else if (mode == 1) 4110 else if (mode == 1)
4033 scr_cursor (SAVE); 4111 scr_cursor (SAVE);
4034 break; 4112 break;
… …
4046 */ 4124 */
4047 PrivMode (1, PrivMode_vt52); 4125 PrivMode (1, PrivMode_vt52);
4048 break; 4126 break;
4049 case 3: /* 80/132 */ 4127 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4128 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4129 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4130 break;
4053 case 4: /* smooth scrolling */ 4131 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4132 set_option (Opt_jumpScroll, !state);
4058 break; 4133 break;
4059 case 5: /* reverse video */ 4134 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4135 scr_rvideo_mode (state);
4061 break; 4136 break;
4062 case 6: /* relative/absolute origins */ 4137 case 6: /* relative/absolute origins */
… …
4068 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4072 break; 4147 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
4081 case scrollBar_esc: 4149 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4083 { 4151 {
4084 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4103#if 0 4171#if 0
4104 case 1001: 4172 case 1001:
4105 break; /* X11 mouse highlighting */ 4173 break; /* X11 mouse highlighting */
4106#endif 4174#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4175 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4176 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4177 break;
4113 case 1011: /* scroll to bottom on key press */ 4178 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4179 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4180 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4181 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4182 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4183 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4184 scr_erase_screen (2);
4123 scr_change_screen (state); 4185 scr_change_screen (state);
4124 break; 4186 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4187 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4188 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4189 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4190 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4191 scr_erase_screen (2);
4130 break; 4192 break;
4131 default: 4193 default:
4132 break; 4194 break;
… …
4260 scr_color (Color_bg, Color_bg); 4322 scr_color (Color_bg, Color_bg);
4261 break; 4323 break;
4262 4324
4263 //case 50: // not variable spacing 4325 //case 50: // not variable spacing
4264 4326
4265#ifndef NO_BRIGHTCOLOR 4327#if ENABLE_FRILLS
4266 case 90: 4328 case 90:
4267 case 91: /* set bright fg color */ 4329 case 91: /* set bright fg color */
4268 case 92: 4330 case 92:
4269 case 93: 4331 case 93:
4270 case 94: 4332 case 94:
… …
4282 case 106: 4344 case 106:
4283 case 107: 4345 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4346 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4347 break;
4286#endif 4348#endif
4287
4288 } 4349 }
4289 } 4350 }
4290} 4351}
4291/*}}} */ 4352/*}}} */
4292 4353
… …
4316 */ 4377 */
4317void 4378void
4318rxvt_term::tt_printf (const char *fmt,...) 4379rxvt_term::tt_printf (const char *fmt,...)
4319{ 4380{
4320 va_list arg_ptr; 4381 va_list arg_ptr;
4321 unsigned char buf[256]; 4382 char buf[256];
4322 4383
4323 va_start (arg_ptr, fmt); 4384 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4385 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4386 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4387 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4392 * or generated by us in response to a query ESC sequence.
4332 */ 4393 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4394const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4395
4335void 4396void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4398{
4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4400 return;
4401
4402 if (pty->pty < 0)
4403 return;
4404
4338 if (v_buflen == 0) 4405 if (v_buflen == 0)
4339 { 4406 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 4408
4342 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4343 return; 4410 return;
4344 4411
4345 data += written; 4412 data += written;
4346 len -= written; 4413 len -= written;
4347 } 4414 }
4348 4415
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4417
4351 memcpy (v_buffer + v_buflen, data, len); 4418 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4419 v_buflen += len;
4353 4420
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355} 4422}
4356 4423
4357void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4358{ 4425{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4427
4361 if (written > 0) 4428 if (written > 0)
4362 { 4429 {
4363 v_buflen -= written; 4430 v_buflen -= written;
4364 4431
… …
4373 } 4440 }
4374 4441
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4442 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4443 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4445 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4446}
4381 4447
4382/*----------------------- end-of-file (C source) -----------------------*/ 4448/*----------------------- end-of-file (C source) -----------------------*/
4383 4449

Diff Legend

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