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.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.281 by root, Tue Jan 24 17:28:06 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-2004 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)
… …
117 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
118 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
119 XK_Print, 0x2399, 122 XK_Print, 0x2399,
120 123
121 XK_space, 0x2423, 124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
122 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
123 0, 134 0,
124}; 135};
125 136
126void 137void
127rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
128{ 139{
129 x = Pixel2Col (x); 140 x = Pixel2Col (x);
130 y = Pixel2Row (y); 141 y = Pixel2Row (y);
131 142
132 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
133 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
134 return; 145 return;
135 146
136 for (;;) 147 for (;;)
137 { 148 {
138 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];
139 152
140 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
141 { 154 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
145 break; 157 break;
146 } 158 }
147 159
148 x--; 160 x--;
149 } 161 }
150
151} 162}
152#endif
153 163
154#if ENABLE_OVERLAY
155void 164void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
157{ 166{
158 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
161 int len; 170 int len;
162 171
172 fname = rxvt_utf8towcs (f->name);
173
163#if ENABLE_COMBINING 174# if ENABLE_COMBINING
164 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
165 { 176 {
166 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
169 } 180 }
170 else 181 else
171#endif 182# endif
172 { 183 {
173 ch2 = ch; 184 ch2 = ch;
174 185
175 alloc = 0; 186 alloc = 0;
176 chr = &ch2; 187 chr = &ch2;
177 len = 1; 188 len = 1;
178 } 189 }
179 190
180 int width = strlen (f->name); 191 char attr[80]; // plenty
181 192
182 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);
183 215
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185 217
186 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
187 { 219 {
… …
190 ch = *chr++; 222 ch = *chr++;
191 223
192 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
195#if !UNICODE3 227# if !UNICODE3
196 if (ch >= 0x10000) 228 if (ch >= 0x10000)
197 ch = 0xfffd; 229 ch = 0xfffd;
198#endif 230# endif
199 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
201 } 233 }
202 234
235 scr_overlay_set (0, len , attr);
203 scr_overlay_set (0, len, f->name); 236 scr_overlay_set (0, len + 1, fname);
204 237
238 free (fname);
239
205#if ENABLE_COMBINING 240# if ENABLE_COMBINING
206 if (alloc) 241 if (alloc)
207 delete [] alloc; 242 delete [] alloc;
208#endif 243# endif
209} 244}
210#endif 245#endif
211 246
212void 247void
213rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
230 mb[0] = ch[0]; 265 mb[0] = ch[0];
231 len = 1; 266 len = 1;
232 } 267 }
233 268
234 if (len > 0) 269 if (len > 0)
235 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
236 else 271 else
237 scr_bell (); 272 scr_bell ();
238 } 273 }
239 274
240 iso14755buf = 0; 275 iso14755buf = 0;
… …
268 KeySym keysym; 303 KeySym keysym;
269#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
270 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
271#endif 306#endif
272 int valid_keysym; 307 int valid_keysym;
273 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
274 309
275 /* 310 /*
276 * 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
277 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
278 * 313 *
279 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
280 */ 315 */
281 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
282 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
283 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
284 319
285 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
286 { 321 {
287 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
288 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
296 Status status_return; 331 Status status_return;
297 332
298#if 0 333#if 0
299#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
300 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
301 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
302 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
303 else 338 else
304#endif 339#endif
305#endif 340#endif
306 { 341 {
… …
308 343
309 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
310 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
311 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
312 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
313 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
314 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
315 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
316 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
317 SET_LOCALE (locale); 354 SET_LOCALE (locale);
318 355
319 if (status_return == XLookupChars 356 if (status_return == XLookupChars
320 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
341 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
342 } 379 }
343 else 380 else
344#endif 381#endif
345 { 382 {
346 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
347 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
348 } 385 }
349 386
350 if (valid_keysym) 387 if (valid_keysym)
351 { 388 {
352#ifdef KEYSYM_RESOURCE 389#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state)) 390 if (keyboard->dispatch (this, keysym, ev.state))
354 return; 391 return;
355#endif 392#endif
356 393
357 if (TermWin.saveLines) 394 if (saveLines)
358 { 395 {
359#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
360 if (!ctrl && !meta) 397 if (!ctrl && !meta)
361#else 398#else
362 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
363#endif 400#endif
364 { 401 {
365 int lnsppg; 402 int lnsppg;
366 403
367#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
369#else 406#else
370 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
371#endif 408#endif
372 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
373 { 410 {
374 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
375 return; 412 return;
… …
403 scr_move_to (0, 1); 440 scr_move_to (0, 1);
404 return; 441 return;
405 } 442 }
406 else if (keysym == XK_End) 443 else if (keysym == XK_End)
407 { 444 {
408 scr_move_to (1, 0); 445 scr_move_to (1, 1);
409 return; 446 return;
410 } 447 }
411 } 448 }
412#endif 449#endif
413 } 450 }
… …
424 { 461 {
425 switch (keysym) 462 switch (keysym)
426 { 463 {
427 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
428 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
429 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
430 return; 467 return;
431#if TODO 468#if TODO
432 /* rxvt extras */ 469 /* rxvt extras */
433 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
434 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
512 else 549 else
513 strcpy (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
514 break; 551 break;
515#endif 552#endif
516#ifndef NO_DELETE_KEY 553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
517 case XK_Delete: 564 case XK_Delete:
518 strcpy (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
519 break; 566 break;
520#endif 567#endif
521 case XK_Tab: 568 case XK_Tab:
… …
624#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
625 case XK_KP_Begin: 672 case XK_KP_Begin:
626 strcpy (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
627 break; 674 break;
628 675
629 case XK_KP_Insert:
630 strcpy (kbuf, "\033Op");
631 break;
632
633 case XK_KP_Delete:
634 strcpy (kbuf, "\033On");
635 break;
636#endif 676#endif
637 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
638 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
639 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
640 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
… …
672 break; 712 break;
673 713
674 case XK_Find: 714 case XK_Find:
675 strcpy (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
676 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
677 case XK_Insert: 728 case XK_Insert:
678 strcpy (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
679 break; 730 break;
680#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
681 case DXK_Remove: 732 case DXK_Remove:
… …
801 { 852 {
802#ifdef META8_OPTION 853#ifdef META8_OPTION
803 /* set 8-bit on */ 854 /* set 8-bit on */
804 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
805 { 856 {
806 unsigned char *ch; 857 char *ch;
807 858
808 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
809 *ch |= 0x80; 860 *ch |= 0x80;
810 861
811 meta = 0; 862 meta = 0;
… …
813#endif 864#endif
814 /* nil */ ; 865 /* nil */ ;
815 } 866 }
816 } 867 }
817 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
818 if (len <= 0) 872 if (len <= 0)
819 return; /* not mapped */ 873 return; /* not mapped */
820 874
821 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
822 if (TermWin.view_start) 876 if (view_start)
823 { 877 {
824 TermWin.view_start = 0; 878 view_start = 0;
825 want_refresh = 1; 879 want_refresh = 1;
826 } 880 }
827 881
828 /* 882 /*
829 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
844#ifdef META8_OPTION 898#ifdef META8_OPTION
845 && meta_char == C0_ESC 899 && meta_char == C0_ESC
846#endif 900#endif
847 ) 901 )
848 { 902 {
849 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
850 tt_write (&ch, 1); 904 tt_write (&ch, 1);
851 } 905 }
852 906
853#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
854 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
862#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
863 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
864} 918}
865/*}}} */ 919/*}}} */
866 920
867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
869/* attempt to `write' count to the input buffer */
870unsigned int 922unsigned int
871rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
872{ 924{
873 unsigned int n, s; 925 unsigned int n, s;
874 926
875 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
913 } 965 }
914#endif 966#endif
915 967
916 if (want_refresh) 968 if (want_refresh)
917 { 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
918 scr_refresh (refresh_type); 1008 scr_refresh ();
919 scrollbar_show (1); 1009 scrollbar_show (1);
920#ifdef USE_XIM 1010#ifdef USE_XIM
921 IMSendSpot (); 1011 IMSendSpot ();
922#endif 1012#endif
923 } 1013 }
… …
926} 1016}
927 1017
928void 1018void
929rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
930{ 1020{
931 SET_R (this); 1021 make_current ();
932 SET_LOCALE (locale);
933 1022
934 display->flush (); 1023 display->flush ();
935 1024
936 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
938} 1027}
939 1028
940void 1029void
941rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
942{ 1031{
943 SET_R (this); 1032 make_current ();
944 SET_LOCALE (locale);
945 1033
946 refresh_limit = 1; 1034 refresh_limit = 1;
947 refresh_count = 0; 1035 refresh_count = 0;
948 flush (); 1036 flush ();
949} 1037}
… …
953rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
954{ 1042{
955 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
956 want_refresh = 1; 1044 want_refresh = 1;
957 1045
958 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
959} 1047}
960#endif 1048#endif
961 1049
962#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
963void 1051void
… …
977rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
978{ 1066{
979 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
980 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
981 { 1069 {
982 refresh_type |= SMOOTH_REFRESH;
983 want_refresh = 1; 1070 want_refresh = 1;
984 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
985 } 1072 }
986} 1073}
987#endif 1074#endif
… …
991rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
992{ 1079{
993 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
994 { 1081 {
995 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
996 refresh_type |= SMOOTH_REFRESH;
997 want_refresh = 1; 1083 want_refresh = 1;
998 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
999 } 1085 }
1000} 1086}
1001#endif 1087#endif
… …
1006{ 1092{
1007 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1008 || 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)
1009 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1096 {
1011 if (TermWin.view_start == TermWin.nscrolled || 1097 if (view_start == top_row || view_start == 0)
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1014 1099
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1100 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 } 1102 }
1019} 1103}
1020#endif 1104#endif
1021 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
1022bool 1124bool
1023rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1024{ 1126{
1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026 1128
1027 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1028 { 1130 {
1029 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");
1030 n = 0; 1132 n = 0;
1031 } 1133 }
1032 1134
1033 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1034 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1035 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1036 1138
1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1038 1140
1039 if (n > 0) 1141 if (r > 0)
1040 { 1142 {
1041 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1042 return true; 1144 return true;
1043 } 1145 }
1044 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))
1045 destroy (); 1158 destroy ();
1159 }
1046 1160
1047 return false; 1161 return false;
1048} 1162}
1049 1163
1050void 1164void
1051rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1052{ 1166{
1053 SET_R (this); 1167 make_current ();
1054 SET_LOCALE (locale);
1055 1168
1056 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1057 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1058 while (pty_fill ()) 1171 while (pty_fill ())
1059 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1064} 1177}
1065 1178
1066void 1179void
1067rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1068{ 1181{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1070 recolour_cursor (); 1183 recolour_cursor ();
1071 1184
1072#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1186 hidden_pointer = 0;
1074 1187
1075 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1076 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif 1190#endif
1078} 1191}
1079 1192
1080#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1081void 1194void
1082rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1083{ 1196{
1084 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1085 return; 1198 return;
1086 1199
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1088 XFlush (display->display); 1201 XFlush (display->display);
1089 1202
1090 hidden_pointer = 1; 1203 hidden_pointer = 1;
1091} 1204}
1092 1205
1093void 1206void
1094rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1095{ 1208{
1096 SET_R (this); 1209 make_current ();
1097 SET_LOCALE (locale);
1098 1210
1099 pointer_blank (); 1211 pointer_blank ();
1100} 1212}
1101#endif 1213#endif
1102 1214
… …
1181 1293
1182/*{{{ process an X event */ 1294/*{{{ process an X event */
1183void 1295void
1184rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1185{ 1297{
1298 make_current ();
1299
1186 dDisp; 1300 dDisp;
1187 1301
1188 SET_R (this); 1302 if (ev.xany.window == vt
1189 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1190 1306
1191#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1193 {
1194 if (hidden_cursor)
1195 {
1196 hidden_cursor = 0;
1197 want_refresh = 1;
1198 }
1199
1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1201 }
1202#endif
1203
1204#if defined(POINTER_BLANK)
1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1206 {
1207 if (ev.type == MotionNotify
1208 || ev.type == ButtonPress
1209 || ev.type == ButtonRelease)
1210 if (hidden_pointer)
1211 pointer_unblank ();
1212
1213 if (ev.type == KeyPress && hidden_pointer == 0)
1214 pointer_blank ();
1215 }
1216#endif
1217
1218 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1219 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1220 unsigned int unused_mask; 1310 unsigned int unused_mask;
1221 1311
1222 switch (ev.type) 1312 switch (ev.type)
… …
1229 1319
1230 break; 1320 break;
1231 1321
1232 case KeyRelease: 1322 case KeyRelease:
1233 { 1323 {
1234#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1235 KeySym ks; 1325 KeySym keysym;
1236 1326
1237 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 :/
1238#endif 1328#endif
1239 1329
1240#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1241 // ISO 14755 support 1331 // ISO 14755 support
1242 if (iso14755buf) 1332 if (iso14755buf)
… …
1247# endif 1337# endif
1248# if ISO_14755 1338# if ISO_14755
1249 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1250 // first: controls 1340 // first: controls
1251 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1252 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1253 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1254 { 1344 {
1255 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1256 commit_iso14755 (); 1346 commit_iso14755 ();
1257 return; // case-break; 1347 goto skip_switch;
1258 } 1348 }
1259 1349
1260 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1261 if (i[0] == ks) 1351 if (i[0] == keysym)
1262 { 1352 {
1263 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1264 commit_iso14755 (); 1354 commit_iso14755 ();
1265 return; // case-break; 1355 goto skip_switch;
1266 } 1356 }
1267 1357
1268 scr_bell (); 1358 scr_bell ();
1269# endif 1359# endif
1270 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1289 else 1379 else
1290 iso14755buf = 0; 1380 iso14755buf = 0;
1291 } 1381 }
1292#endif 1382#endif
1293 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
1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1295 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1298 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1299#endif 1393#endif
1300 break; 1394 break;
1301 } 1395 }
1302 1396
… …
1308 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1309 break; 1403 break;
1310 1404
1311 case ClientMessage: 1405 case ClientMessage:
1312 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1314 destroy ();
1315#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink))
1321 { 1408 {
1322 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1323 Atom ActualType; 1410 {
1324 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1325 unsigned char *data; 1412 {
1326 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1327 1414 {
1328 XGetWindowProperty (disp, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1329 xa[XA_DNDSELECTION], 1416 destroy ();
1330 0L, 1000000L, 1417 }
1331 False, AnyPropertyType, 1418#if ENABLE_EWMH
1332 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1333 &Size, &RemainingBytes, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1334 &data); 1422 &ev);
1335 set_string_property (XA_CUT_BUFFER0, data); 1423#endif
1336 XFree (data); 1424 }
1337 selection_paste (display->root, XA_CUT_BUFFER0, true); 1425 }
1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); 1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1339 } 1435 }
1340#endif /* OFFIX_DND */
1341 break; 1436 break;
1342 1437
1343 case MappingNotify: 1438 case MappingNotify:
1344 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1345 break; 1440 break;
… …
1368 break; 1463 break;
1369 } 1464 }
1370 break; 1465 break;
1371 1466
1372 case FocusIn: 1467 case FocusIn:
1373 if (!TermWin.focus) 1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 focus_out ();
1473 break;
1474
1475 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0])
1374 { 1477 {
1375 TermWin.focus = 1;
1376 want_refresh = 1;
1377#ifdef USE_XIM
1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1381 XSetICFocus (Input_Context);
1382 }
1383#endif
1384#ifdef CURSOR_BLINK
1385 if (options & Opt_cursorBlink)
1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1394#endif
1395
1396 }
1397 break;
1398
1399 case FocusOut:
1400 if (TermWin.focus)
1401 {
1402 TermWin.focus = 0;
1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1411#ifdef USE_XIM
1412 if (Input_Context != NULL)
1413 XUnsetICFocus (Input_Context);
1414#endif
1415#ifdef CURSOR_BLINK
1416 if (options & Opt_cursorBlink)
1417 cursor_blink_ev.stop ();
1418 hidden_cursor = 0;
1419#endif
1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1427 }
1428 break;
1429
1430 case ConfigureNotify:
1431 if (ev.xconfigure.window == TermWin.parent[0])
1432 {
1433 int height, width;
1434
1435 do
1436 { /* Wrap lots of configures into one */
1437 width = ev.xconfigure.width;
1438 height = ev.xconfigure.height;
1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1440 }
1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ;
1442 1480
1443 if (szHint.width != width || szHint.height != height) 1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1482 {
1445 seen_resize = 1; 1483 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1485 }
1448 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450 if (options & Opt_transparent) 1490 if (OPTION (Opt_transparent))
1451 check_our_parents (); 1491 check_our_parents ();
1452#endif 1492#endif
1453 } 1493 }
1454 break; 1494 break;
1455 1495
1456 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1501
1461 break; 1502 break;
1462 1503
1463 case SelectionClear: 1504 case SelectionClear:
1464 selection_clear (); 1505 selection_clear ();
… …
1471 1512
1472 case SelectionRequest: 1513 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1474 break; 1515 break;
1475 1516
1517 case MapNotify:
1518 mapped = 1;
1519#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1521#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break;
1524
1476 case UnmapNotify: 1525 case UnmapNotify:
1477 TermWin.mapped = 0; 1526 mapped = 0;
1478#ifdef TEXT_BLINK 1527#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1528 text_blink_ev.stop ();
1480#endif 1529#endif
1481 break; 1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1482
1483 case MapNotify:
1484 TermWin.mapped = 1;
1485#ifdef TEXT_BLINK
1486 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487#endif
1488 break; 1531 break;
1489 1532
1490#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1491 case ReparentNotify: 1534 case ReparentNotify:
1492 rootwin_cb (ev); 1535 rootwin_cb (ev);
1493 break; 1536 break;
1494#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1495 1538
1496 case GraphicsExpose: 1539 case GraphicsExpose:
1497 case Expose: 1540 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1499 { 1542 {
1500 do 1543 do
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504 1547
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1549
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1510 1553
1511 scr_refresh (refresh_type); 1554 want_refresh = 1;
1512 } 1555 }
1513 else 1556 else
1514 { 1557 {
1515 XEvent unused_event; 1558 XEvent unused_event;
1516 1559
… …
1522 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1523 { 1566 {
1524 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1525 scrollbar_show (0); 1568 scrollbar_show (0);
1526 } 1569 }
1527#ifdef MENUBAR
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose ();
1530#endif
1531 1570
1532#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1535#endif 1574#endif
1536 } 1575 }
1537 break; 1576 break;
1538 1577
1539 case MotionNotify: 1578 case MotionNotify:
1540#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1580 if (hidden_pointer)
1542 pointer_unblank (); 1581 pointer_unblank ();
1543#endif 1582#endif
1544#if MENUBAR
1545 if (isMenuBarWindow (ev.xany.window))
1546 {
1547 menubar_control (ev.xbutton);
1548 break;
1549 }
1550#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1584 break;
1553 1585
1554 if (ev.xany.window == TermWin.vt) 1586 if (ev.xany.window == vt)
1555 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1592 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559 ; 1594 ;
1560 1595
1561 XQueryPointer (disp, TermWin.vt, 1596 XQueryPointer (disp, vt,
1562 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1600 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1578#endif 1613#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1614 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1615 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1616
1582#ifdef SELECTION_SCROLLING 1617#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1618 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1619 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1620 {
1586 int dist; 1621 int dist;
1587 1622
1588 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1633 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1634 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1635
1601 /* calc number of lines to scroll */ 1636 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1637 if (ev.xbutton.y < int_bwidth)
1603 { 1638 {
1604 scroll_selection_dir = UP; 1639 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1640 dist = int_bwidth - ev.xbutton.y;
1606 } 1641 }
1607 else 1642 else
1608 { 1643 {
1609 scroll_selection_dir = DN; 1644 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1645 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1646 }
1612 1647
1613 scroll_selection_lines = Pixel2Height (dist) 1648 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1649 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1650 + 1;
1616 MIN_IT (scroll_selection_lines, 1651 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1652 SELECTION_SCROLL_MAX_LINES);
1618 } 1653 }
1619 else 1654 else
1620 { 1655 {
1621 /* we are within the text window, so we 1656 /* we are within the text window, so we
… …
1641 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1643 &unused_mask); 1678 &unused_mask);
1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1645 scrollbar_size ()); 1680 scrollbar_size ());
1646 scr_refresh (refresh_type); 1681 want_refresh = 1;
1647 refresh_limit = 0; 1682 refresh_limit = 0;
1648 scrollbar_show (1); 1683 scrollbar_show (1);
1649 } 1684 }
1650 break; 1685 break;
1651 } 1686 }
1687
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1716}
1717
1718void
1719rxvt_term::focus_in ()
1720{
1721 if (!focus)
1722 {
1723 focus = 1;
1724 want_refresh = 1;
1725
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM
1729 if (Input_Context != NULL)
1730 {
1731 IMSetStatusPosition ();
1732 XSetICFocus (Input_Context);
1733 }
1734#endif
1735#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_focused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::focus_out ()
1751{
1752 if (focus)
1753 {
1754 focus = 0;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf)
1761 {
1762 iso14755buf = 0;
1763# if ENABLE_OVERLAY
1764 scr_overlay_off ();
1765# endif
1766 }
1767#endif
1768#if USE_XIM
1769 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context);
1771#endif
1772#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.stop ();
1775 hidden_cursor = 0;
1776#endif
1777#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade])
1779 {
1780 pix_colors = pix_colors_unfocused;
1781 scr_recolour ();
1782 }
1783#endif
1784 }
1652} 1785}
1653 1786
1654#if TRANSPARENT 1787#if TRANSPARENT
1655void 1788void
1656rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1790{
1658 SET_R (this); 1791 make_current ();
1659 SET_LOCALE (locale);
1660 1792
1661 switch (ev.type) 1793 switch (ev.type)
1662 { 1794 {
1663 case PropertyNotify: 1795 case PropertyNotify:
1664 /* 1796 /*
… …
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1802 return;
1671 1803
1672 /* FALLTHROUGH */ 1804 /* FALLTHROUGH */
1673 case ReparentNotify: 1805 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1807 want_refresh = want_full_refresh = 1;
1676 break; 1808 break;
1677 } 1809 }
1678} 1810}
1679#endif 1811#endif
… …
1682rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1683{ 1815{
1684 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1685 1817
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1687 if (!bypass_keystate) 1820 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1822
1690 /* 1823 /*
1691 * VT window processing of button press 1824 * VT window processing of button press
1692 */ 1825 */
1693 if (ev.window == TermWin.vt) 1826 if (ev.window == vt)
1694 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1695#if ISO_14755 1831#if ISO_14755
1696 // 5.4 1832 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1834 {
1699 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1711#ifdef MOUSE_REPORT_DOUBLECLICK 1847#ifdef MOUSE_REPORT_DOUBLECLICK
1712 if (ev.button == MEvent.button && clickintime) 1848 if (ev.button == MEvent.button && clickintime)
1713 { 1849 {
1714 /* same button, within alloted time */ 1850 /* same button, within alloted time */
1715 MEvent.clicks++; 1851 MEvent.clicks++;
1852
1716 if (MEvent.clicks > 1) 1853 if (MEvent.clicks > 1)
1717 { 1854 {
1718 /* only report double clicks */ 1855 /* only report double clicks */
1719 MEvent.clicks = 2; 1856 MEvent.clicks = 2;
1720 mouse_report (ev); 1857 mouse_report (ev);
… …
1752#else 1889#else
1753 selection.rect = false; 1890 selection.rect = false;
1754#endif 1891#endif
1755 1892
1756 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1758 { 1895 {
1759 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1760 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1761 else 1898 else
1762 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
… …
1903 case Button3: 2040 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
1905 { 2042 {
1906 if (scrollbar_above_slider (ev.y)) 2043 if (scrollbar_above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 2045 scr_page (UP, nrow - 1);
1909# else 2046# else
1910 scr_page (UP, TermWin.nrow / 4); 2047 scr_page (UP, nrow / 4);
1911# endif 2048# endif
1912 else if (scrollbar_below_slider (ev.y)) 2049 else if (scrollbar_below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 2050# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 2051 scr_page (DN, nrow - 1);
1915# else 2052# else
1916 scr_page (DN, TermWin.nrow / 4); 2053 scr_page (DN, nrow / 4);
1917# endif 2054# endif
1918 else 2055 else
1919 scrollBar.setMotion (); 2056 scrollBar.setMotion ();
1920 } 2057 }
1921 else 2058 else
1922 { 2059 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 2061 (nrow
1925 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
1926 / scrollbar_size ())); 2063 / scrollbar_size ()));
1927 } 2064 }
1928 2065
1929 break; 2066 break;
1930 } 2067 }
1931 } 2068 }
2069
1932 return; 2070 return;
1933 } 2071 }
1934#if MENUBAR
1935 /*
1936 * Menubar window processing of button press
1937 */
1938 if (isMenuBarWindow (ev.window))
1939 menubar_control (ev);
1940#endif
1941} 2072}
1942 2073
1943void 2074void
1944rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
1945{ 2076{
… …
1951 2082
1952 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
1953 { 2084 {
1954 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
1955 scrollbar_show (0); 2086 scrollbar_show (0);
1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1957 refresh_type &= ~SMOOTH_REFRESH;
1958#endif
1959 } 2087 }
1960 2088
1961#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
1964#endif 2092#endif
1965 2093
1966 if (ev.window == TermWin.vt) 2094 if (ev.window == vt)
1967 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
1968#if ISO_14755 2099#if ISO_14755
1969 // 5.4 2100 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2102 return;
1972#endif 2103#endif
2104
1973 if (reportmode) 2105 if (reportmode)
1974 { 2106 {
1975 /* mouse report from vt window */ 2107 /* mouse report from vt window */
1976 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
1977 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2007 { 2139 {
2008 case Button1: 2140 case Button1:
2009 case Button3: 2141 case Button3:
2010 selection_make (ev.time); 2142 selection_make (ev.time);
2011 break; 2143 break;
2144
2012 case Button2: 2145 case Button2:
2013 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2014 break; 2148 break;
2149
2015#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2016 case Button4: 2151 case Button4:
2017 case Button5: 2152 case Button5:
2018 { 2153 {
2019 int i; 2154 int i;
… …
2021 2156
2022 v = ev.button == Button4 ? UP : DN; 2157 v = ev.button == Button4 ? UP : DN;
2023 2158
2024 if (ev.state & ShiftMask) 2159 if (ev.state & ShiftMask)
2025 i = 1; 2160 i = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2161 else if (OPTION (Opt_mouseWheelScrollPage))
2027 i = TermWin.nrow - 1; 2162 i = nrow - 1;
2028 else 2163 else
2029 i = 5; 2164 i = 5;
2030 2165
2031# ifdef MOUSE_SLIP_WHEELING 2166# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2167 if (ev.state & ControlMask)
2033 { 2168 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2169 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037 2172
2038 if (slip_wheel_ev.at < NOW) 2173 if (slip_wheel_ev.at < NOW)
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040 2175
2041 slip_wheel_ev.start (); 2176 slip_wheel_ev.start ();
2042 } 2177 }
2043 else 2178 else
2044 { 2179 {
2045# endif 2180# endif
2046# ifdef JUMP_MOUSE_WHEEL
2047 scr_page (v, i); 2181 scr_page (v, i);
2048 scr_refresh (SMOOTH_REFRESH);
2049 scrollbar_show (1); 2182 scrollbar_show (1);
2050# else
2051 while (i--)
2052 {
2053 scr_page (v, 1);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1);
2056 }
2057# endif
2058# ifdef MOUSE_SLIP_WHEELING 2183# ifdef MOUSE_SLIP_WHEELING
2059 } 2184 }
2060#endif 2185# endif
2061 } 2186 }
2062 break; 2187 break;
2063#endif 2188#endif
2064 } 2189 }
2065 } 2190 }
2066#ifdef MENUBAR
2067 else if (isMenuBarWindow (ev.window))
2068 menubar_control (ev);
2069#endif
2070} 2191}
2071 2192
2072#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2073#if TINTING 2194#if TINTING
2074/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2317 XWindowAttributes wattr, wrootattr; 2438 XWindowAttributes wattr, wrootattr;
2318 dDisp; 2439 dDisp;
2319 2440
2320 pchanged = 0; 2441 pchanged = 0;
2321 2442
2322 if (!(options & Opt_transparent)) 2443 if (!OPTION (Opt_transparent))
2323 return pchanged; /* Don't try any more */ 2444 return pchanged; /* Don't try any more */
2324 2445
2325 XGetWindowAttributes (disp, display->root, &wrootattr); 2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth; 2447 rootdepth = wrootattr.depth;
2327 2448
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2449 XGetWindowAttributes (disp, parent[0], &wattr);
2329 2450
2330 if (rootdepth != wattr.depth) 2451 if (rootdepth != wattr.depth)
2331 { 2452 {
2332 if (am_transparent) 2453 if (am_transparent)
2333 { 2454 {
2334 pchanged = 1; 2455 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0; 2457 am_transparent = am_pixmap_trans = 0;
2337 } 2458 }
2338 2459
2339 return pchanged; /* Don't try any more */ 2460 return pchanged; /* Don't try any more */
2340 } 2461 }
… …
2381 Window cr; 2502 Window cr;
2382 XImage *image; 2503 XImage *image;
2383 GC gc; 2504 GC gc;
2384 XGCValues gcvalue; 2505 XGCValues gcvalue;
2385 2506
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2507 XTranslateCoordinates (disp, parent[0], display->root,
2387 0, 0, &sx, &sy, &cr); 2508 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width; 2509 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height; 2510 nh = (unsigned int)szHint.height;
2390 nx = ny = 0; 2511 nx = ny = 0;
2391 2512
… …
2401 nh += sy; 2522 nh += sy;
2402 ny = -sy; 2523 ny = -sy;
2403 sy = 0; 2524 sy = 0;
2404 } 2525 }
2405 2526
2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2408 2529
2409 XSync (disp, False); 2530 XSync (disp, False);
2410 allowedxerror = -1; 2531 allowedxerror = -1;
2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412 2533
… …
2417 if (image == NULL) 2538 if (image == NULL)
2418 { 2539 {
2419 if (am_transparent && am_pixmap_trans) 2540 if (am_transparent && am_pixmap_trans)
2420 { 2541 {
2421 pchanged = 1; 2542 pchanged = 1;
2422 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2423 { 2544 {
2424 XFreePixmap (disp, TermWin.pixmap); 2545 XFreePixmap (disp, pixmap);
2425 TermWin.pixmap = None; 2546 pixmap = None;
2426 } 2547 }
2427 } 2548 }
2428 2549
2429 am_pixmap_trans = 0; 2550 am_pixmap_trans = 0;
2430 } 2551 }
2431 else 2552 else
2432 { 2553 {
2433 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap); 2555 XFreePixmap (disp, pixmap);
2435 2556
2436#if TINTING 2557#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint)) 2558 if (ISSET_PIXCOLOR (Color_tint))
2438 { 2559 {
2439 unsigned short rm, gm, bm; 2560 unsigned short rm, gm, bm;
… …
2443 2564
2444 ShadeXImage (display, image, shade, rm, gm, bm); 2565 ShadeXImage (display, image, shade, rm, gm, bm);
2445 } 2566 }
2446#endif 2567#endif
2447 2568
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2569 pixmap = XCreatePixmap (disp, vt,
2449 szHint.width, szHint.height, image->depth); 2570 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height); 2573 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc); 2574 XFreeGC (disp, gc);
2454 XDestroyImage (image); 2575 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456 XClearWindow (disp, TermWin.parent[0]); 2577 XClearWindow (disp, parent[0]);
2457 2578
2458 if (!am_transparent || !am_pixmap_trans) 2579 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1; 2580 pchanged = 1;
2460 2581
2461 am_transparent = am_pixmap_trans = 1; 2582 am_transparent = am_pixmap_trans = 1;
2462 } 2583 }
2463 } 2584 }
2464 2585
2465 if (am_pixmap_trans) 2586 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467 else 2588 else
2468 { 2589 {
2469 unsigned int n; 2590 unsigned int n;
2470 /* 2591 /*
2471 * InheritPixmap transparency 2592 * InheritPixmap transparency
2472 */ 2593 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2595 {
2475 oldp = TermWin.parent[i]; 2596 oldp = parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root, 2597 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2598 &parent[i], &list, &n);
2478 XFree (list); 2599 XFree (list);
2479 2600
2480 if (TermWin.parent[i] == display->root) 2601 if (parent[i] == display->root)
2481 { 2602 {
2482 if (oldp != None) 2603 if (oldp != None)
2483 pchanged = 1; 2604 pchanged = 1;
2484 2605
2485 break; 2606 break;
2486 } 2607 }
2487 2608
2488 if (oldp != TermWin.parent[i]) 2609 if (oldp != parent[i])
2489 pchanged = 1; 2610 pchanged = 1;
2490 } 2611 }
2491 2612
2492 n = 0; 2613 n = 0;
2493 2614
2494 if (pchanged) 2615 if (pchanged)
2495 { 2616 {
2496 for (; n < (unsigned int)i; n++) 2617 for (; n < (unsigned int)i; n++)
2497 { 2618 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2619 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2621 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2623 break;
2503 } 2624 }
2504 } 2625 }
2505 } 2626 }
2506 2627
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2629 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2632 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2513 } 2634 }
2514 else 2635 else
2515 { 2636 {
2516#if WAIT_FOR_WM
2517 /* wait (an arbitrary period) for the WM to do its thing
2518 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1);
2520#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2522 { 2638 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2525 } 2641 }
2526 2642
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2644 am_transparent = 1;
2529 } 2645 }
2530 2646
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2648 parent[i] = None;
2533 } 2649 }
2534 2650
2535 if (scrollBar.win) 2651 if (scrollBar.win)
2536 { 2652 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2554 2670
2555bool 2671bool
2556rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2557{ 2673{
2558 bool flag = false; 2674 bool flag = false;
2559 unicode_t ch = NOCHAR; 2675 wchar_t ch = NOCHAR;
2560 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2561 2677
2562 for (;;) 2678 for (;;)
2563 { 2679 {
2564 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2565 { 2681 {
2566 seq_begin = cmdbuf_ptr; 2682 seq_begin = cmdbuf_ptr;
2567 ch = next_char (); 2683 ch = next_char ();
2568 }
2569 2684
2570 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR)
2571 break; 2686 break;
2687 }
2572 2688
2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2574 { 2690 {
2575 if (!seen_input) 2691 if (!seen_input)
2576 { 2692 {
… …
2580 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2698 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2699 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2700 // resized.
2585 if (seen_resize) 2701 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2587 } 2703 }
2588 2704
2589 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2706 wchar_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2707 bool refreshnow = false;
2592 int nlines = 0; 2708 int nlines = 0;
2593 unicode_t *str = buf; 2709 wchar_t *str = buf;
2710 wchar_t *eol = str + min (ncol, UBUFSIZ);
2594 2711
2595 for (;;) 2712 for (;;)
2596 { 2713 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break; 2715 break;
2599 2716
2600 *str++ = ch; 2717 *str++ = ch;
2601 2718
2602 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2603 { 2720 {
2721 if (ch == C0_LF)
2604 nlines++; 2722 nlines++;
2723
2605 refresh_count++; 2724 refresh_count++;
2606 2725
2607 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2609 { 2728 {
2610 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2611 ch = NOCHAR; 2731 ch = NOCHAR;
2612 break; 2732 break;
2613 } 2733 }
2614 2734
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2617 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2618 scr_add_lines (buf, nlines, str - buf); 2740 scr_add_lines (buf, str - buf, nlines);
2741
2619 nlines = 0; 2742 nlines = 0;
2620 str = buf; 2743 str = buf;
2744 eol = str + min (ncol, UBUFSIZ);
2621 } 2745 }
2622 }
2623 2746
2624 if (str >= buf + UBUFSIZ) 2747 if (str >= eol)
2625 { 2748 {
2749 if (eol >= buf + UBUFSIZ)
2750 {
2626 ch = NOCHAR; 2751 ch = NOCHAR;
2627 break; 2752 break;
2753 }
2754 else
2755 eol = min (eol + ncol, buf + UBUFSIZ);
2756 }
2757
2628 } 2758 }
2629 2759
2630 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2761 ch = next_char ();
2632 } 2762 }
2633 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2634 scr_add_lines (buf, nlines, str - buf); 2766 scr_add_lines (buf, str - buf, nlines);
2635 2767
2636 /* 2768 /*
2637 * If there have been a lot of new lines, then update the screen 2769 * If there have been a lot of new lines, then update the screen
2638 * What the heck I'll cheat and only refresh less than every page-full. 2770 * What the heck I'll cheat and only refresh less than every page-full.
2639 * the number of pages between refreshes is refresh_limit, which 2771 * the number of pages between refreshes is refresh_limit, which
2640 * is incremented here because we must be doing flat-out scrolling. 2772 * is incremented here because we must be doing flat-out scrolling.
2641 */ 2773 */
2642 if (refreshnow) 2774 if (refreshnow)
2643 { 2775 {
2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645 refresh_limit++; 2777 refresh_limit++;
2646 else 2778 else
2647 { 2779 {
2648 flag = true; 2780 flag = true;
2649 scr_refresh (refresh_type); 2781 scr_refresh ();
2782 want_refresh = 1;
2650 } 2783 }
2651 } 2784 }
2652 2785
2653 } 2786 }
2654 else 2787 else
… …
2669 } 2802 }
2670 2803
2671 return flag; 2804 return flag;
2672} 2805}
2673 2806
2674// read the next octet
2675unicode_t
2676rxvt_term::next_octet ()
2677{
2678 return cmdbuf_ptr < cmdbuf_endp
2679 ? *cmdbuf_ptr++
2680 : NOCHAR;
2681}
2682
2683// read the next character 2807// read the next character
2684unicode_t 2808wchar_t
2685rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2686{ 2810{
2687 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2688 { 2812 {
2689 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2690 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2691 return *cmdbuf_ptr++; 2815 return *cmdbuf_ptr++;
2692 2816
2693 wchar_t wc; 2817 wchar_t wc;
2694 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2818 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2695 2819
2696 if (len == (size_t)-2) 2820 if (len == (size_t)-2)
2697 { 2821 {
2698 // the mbstate stores incomplete sequences. didn't know this :/ 2822 // the mbstate stores incomplete sequences. didn't know this :/
2699 cmdbuf_ptr = cmdbuf_endp; 2823 cmdbuf_ptr = cmdbuf_endp;
2700 break; 2824 break;
2701 } 2825 }
2702 2826
2703 if (len == (size_t)-1) 2827 if (len == (size_t)-1)
2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2828 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2705 2829
2706 // assume wchar == unicode 2830 // assume wchar == unicode
2707 cmdbuf_ptr += len; 2831 cmdbuf_ptr += len;
2708 return wc & UNICODE_MASK; 2832 return wc & UNICODE_MASK;
2709 } 2833 }
2710 2834
2711 return NOCHAR; 2835 return NOCHAR;
2712} 2836}
2837
2838// read the next octet
2839uint32_t
2840rxvt_term::next_octet () NOTHROW
2841{
2842 return cmdbuf_ptr < cmdbuf_endp
2843 ? (unsigned char)*cmdbuf_ptr++
2844 : NOCHAR;
2845}
2846
2847static class out_of_input out_of_input;
2713 2848
2714/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2715/* 2850/*
2716 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2717 * to the command. 2852 * to the command.
2718 */ 2853 */
2719unicode_t 2854wchar_t
2720rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2721{ 2856{
2722 unicode_t c = next_char (); 2857 wchar_t c = next_char ();
2723 2858
2724 if (c == NOCHAR) 2859 if (c == NOCHAR)
2725 throw out_of_input; 2860 throw out_of_input;
2726 2861
2727 return c; 2862 return c;
2728} 2863}
2729 2864
2730unicode_t 2865uint32_t
2731rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2732{ 2867{
2733 unicode_t c = next_octet (); 2868 uint32_t c = next_octet ();
2734 2869
2735 if (c == NOCHAR) 2870 if (c == NOCHAR)
2736 throw out_of_input; 2871 throw out_of_input;
2737 2872
2738 return c; 2873 return c;
… …
2838 case C0_ESC: 2973 case C0_ESC:
2839 process_escape_seq (); 2974 process_escape_seq ();
2840 break; 2975 break;
2841 case C0_ENQ: /* terminal Status */ 2976 case C0_ENQ: /* terminal Status */
2842 if (rs[Rs_answerbackstring]) 2977 if (rs[Rs_answerbackstring])
2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2978 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2845 else 2979 else
2846 tt_write ((unsigned char *)VT100_ANS, 2980 tt_write (VT100_ANS, strlen (VT100_ANS));
2847 (unsigned int)strlen (VT100_ANS));
2848 break; 2981 break;
2849 case C0_BEL: /* bell */ 2982 case C0_BEL: /* bell */
2850 scr_bell (); 2983 scr_bell ();
2851 break; 2984 break;
2852 case C0_BS: /* backspace */ 2985 case C0_BS: /* backspace */
… …
3007 break; 3140 break;
3008 3141
3009 /* 8.3.87: NEXT LINE */ 3142 /* 8.3.87: NEXT LINE */
3010 case C1_NEL: /* ESC E */ 3143 case C1_NEL: /* ESC E */
3011 { 3144 {
3012 unicode_t nlcr[] = { C0_LF, C0_CR }; 3145 wchar_t nlcr[] = { C0_LF, C0_CR };
3013 scr_add_lines (nlcr, 1, 2); 3146 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3014 } 3147 }
3015 break; 3148 break;
3016 3149
3017 /* kidnapped escape sequence: Should be 8.3.48 */ 3150 /* kidnapped escape sequence: Should be 8.3.48 */
3018 case C1_ESA: /* ESC G */ 3151 case C1_ESA: /* ESC G */
… …
3040 process_dcs_seq (); 3173 process_dcs_seq ();
3041 break; 3174 break;
3042 3175
3043 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3176 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3044 case C1_SCI: /* ESC Z */ 3177 case C1_SCI: /* ESC Z */
3045 tt_write ((const unsigned char *)ESCZ_ANSWER, 3178 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3046 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3047 break; /* steal obsolete ESC [ c */ 3179 break; /* steal obsolete ESC [ c */
3048 3180
3049 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3181 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3050 case C1_CSI: /* ESC [ */ 3182 case C1_CSI: /* ESC [ */
3051 process_csi_seq (); 3183 process_csi_seq ();
… …
3176 { 3308 {
3177 switch (priv) 3309 switch (priv)
3178 { 3310 {
3179 case '>': 3311 case '>':
3180 if (ch == CSI_DA) /* secondary device attributes */ 3312 if (ch == CSI_DA) /* secondary device attributes */
3181 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3182 break; 3314 break;
3183 case '?': 3315 case '?':
3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3185 process_terminal_mode (ch, priv, nargs, arg); 3317 process_terminal_mode (ch, priv, nargs, arg);
3186 break; 3318 break;
… …
3291 3423
3292 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3424 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293 arg[0] = -arg[0]; 3425 arg[0] = -arg[0];
3294 /* FALLTHROUGH */ 3426 /* FALLTHROUGH */
3295 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3427 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3428 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297 break; 3429 break;
3298 3430
3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3431 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300 tt_write ((const unsigned char *)VT100_ANS, 3432 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3301 (unsigned int) (sizeof (VT100_ANS) - 1));
3302 break; 3433 break;
3303 3434
3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3435 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3305 process_sgr_mode (nargs, arg); 3436 process_sgr_mode (nargs, arg);
3306 break; 3437 break;
… …
3313 break; 3444 break;
3314 case 6: /* CPR requested */ 3445 case 6: /* CPR requested */
3315 scr_report_position (); 3446 scr_report_position ();
3316 break; 3447 break;
3317 case 7: /* unofficial extension */ 3448 case 7: /* unofficial extension */
3318 if (options & Opt_insecure) 3449 if (OPTION (Opt_insecure))
3319 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3450 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3320 break; 3451 break;
3321 case 8: /* unofficial extension */ 3452 case 8: /* unofficial extension */
3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3323 break; 3454 break;
… …
3426 { 3557 {
3427 /* 3558 /*
3428 * commands 3559 * commands
3429 */ 3560 */
3430 case 1: /* deiconify window */ 3561 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3562 XMapWindow (disp, parent[0]);
3432 break; 3563 break;
3433 case 2: /* iconify window */ 3564 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3565 XIconifyWindow (disp, parent[0], display->screen);
3435 break; 3566 break;
3436 case 3: /* set position (pixels) */ 3567 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3568 XMoveWindow (disp, parent[0], args[1], args[2]);
3438 break; 3569 break;
3439 case 4: /* set size (pixels) */ 3570 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3572 break;
3442 case 5: /* raise window */ 3573 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3574 XRaiseWindow (disp, parent[0]);
3444 break; 3575 break;
3445 case 6: /* lower window */ 3576 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3577 XLowerWindow (disp, parent[0]);
3447 break; 3578 break;
3448 case 7: /* refresh window */ 3579 case 7: /* refresh window */
3449 scr_touch (true); 3580 scr_touch (true);
3450 break; 3581 break;
3451 case 8: /* set size (chars) */ 3582 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3583 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3454 break; 3585 break;
3455 3586
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3587 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3588 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3589 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3590 set_widthheight ((unsigned int)width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3591 (unsigned int) (args[1] * fheight));
3461 break; 3592 break;
3462 3593
3463 3594
3464 /* 3595 /*
3465 * reports - some output format copied from XTerm 3596 * reports - some output format copied from XTerm
3466 */ 3597 */
3467 case 11: /* report window state */ 3598 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3601 break;
3471 case 13: /* report window position */ 3602 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3604 XTranslateCoordinates (disp, parent[0], wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3605 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3606 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3607 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3608 break;
3478 case 14: /* report window size (pixels) */ 3609 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3610 XGetWindowAttributes (disp, parent[0], &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3612 break;
3482 case 18: /* report text area size (chars) */ 3613 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3615 break;
3485 case 19: /* report window size (chars) */ 3616 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3617 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3618 break;
3488 case 20: /* report icon label */ 3619 case 20: /* report icon label */
3489 { 3620 {
3490 char *s; 3621 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3622 XGetIconName (disp, parent[0], &s);
3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s); 3624 XFree (s);
3494 } 3625 }
3495 break; 3626 break;
3496 case 21: /* report window title */ 3627 case 21: /* report window title */
3497 { 3628 {
3498 char *s; 3629 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3630 XFetchName (disp, parent[0], &s);
3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s); 3632 XFree (s);
3502 } 3633 }
3503 break; 3634 break;
3504 } 3635 }
3505} 3636}
… …
3508/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
3509/* 3640/*
3510 * get input up until STRING TERMINATOR (or BEL) 3641 * get input up until STRING TERMINATOR (or BEL)
3511 * ends_how is terminator used. returned input must be free()'d 3642 * ends_how is terminator used. returned input must be free()'d
3512 */ 3643 */
3513unsigned char * 3644char *
3514rxvt_term::get_to_st (unicode_t &ends_how) 3645rxvt_term::get_to_st (unicode_t &ends_how)
3515{ 3646{
3516 unicode_t ch; 3647 unicode_t ch;
3517 bool seen_esc = false; 3648 bool seen_esc = false;
3518 unsigned int n = 0; 3649 unsigned int n = 0;
… …
3537 else if (ch < 0x20) 3668 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3669 return NULL; /* other control character - exit */
3539 3670
3540 seen_esc = false; 3671 seen_esc = false;
3541 3672
3542 if (n >= sizeof (string) - 1) 3673 if (n >= STRING_MAX - 1)
3543 // stop at some sane length 3674 // stop at some sane length
3544 return NULL; 3675 return NULL;
3545 3676
3546 if (ch == C0_SYN) 3677 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 (); 3678 string[n++] = cmd_get8 ();
… …
3551 3682
3552 string[n++] = '\0'; 3683 string[n++] = '\0';
3553 3684
3554 ends_how = (ch == 0x5c ? C0_ESC : ch); 3685 ends_how = (ch == 0x5c ? C0_ESC : ch);
3555 3686
3556 return (unsigned char *)rxvt_wcstombs (string); 3687 return rxvt_wcstombs (string);
3557} 3688}
3558 3689
3559/*----------------------------------------------------------------------*/ 3690/*----------------------------------------------------------------------*/
3560/* 3691/*
3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3692 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3562 */ 3693 */
3563void 3694void
3564rxvt_term::process_dcs_seq () 3695rxvt_term::process_dcs_seq ()
3565{ 3696{
3566 unsigned char *s; 3697 char *s;
3567 unicode_t eh; 3698 unicode_t eh;
3568 3699
3569 /* 3700 /*
3570 * Not handled yet 3701 * Not handled yet
3571 */ 3702 */
… …
3590 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3721 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3591 arg = arg * 10 + (ch - '0'); 3722 arg = arg * 10 + (ch - '0');
3592 3723
3593 if (ch == ';') 3724 if (ch == ';')
3594 { 3725 {
3595 unsigned char *s = get_to_st (eh); 3726 char *s = get_to_st (eh);
3596 3727
3597 if (s) 3728 if (s)
3598 { 3729 {
3599 process_xterm_seq (arg, (char *)s, eh); 3730 process_xterm_seq (arg, s, eh);
3600 free (s); 3731 free (s);
3601 } 3732 }
3602 } 3733 }
3603} 3734}
3604 3735
3605void 3736void
3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3607{ 3738{
3608 if (str[0] == '?' && !str[1]) 3739 if (str[0] == '?' && !str[1])
3609 { 3740 {
3610 unsigned short r, g, b; 3741 unsigned short r, g, b;
3611 pix_colors_focused[color].get (display, r, g, b); 3742 pix_colors_focused[color].get (display, r, g, b);
… …
3615 set_window_color (color, str); 3746 set_window_color (color, str);
3616} 3747}
3617 3748
3618/* 3749/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3620 * 0 = change iconName/title
3621 * 1 = change iconName
3622 * 2 = change title
3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
3626 * 12 = change text color
3627 * 13 = change mouse foreground color
3628 * 17 = change highlight character colour
3629 * 18 = change bold character color
3630 * 19 = change underlined character color
3631 * 46 = change logfile (not implemented)
3632 * 50 = change font
3633 *
3634 * rxvt extensions:
3635 * 20 = bg pixmap
3636 * 39 = change default fg color
3637 * 49 = change default bg color
3638 * 55 = dump scrollback buffer and all of screen
3639 * 701 = change locale
3640 * 702 = find font
3641 * 703 = menu
3642 */ 3751 */
3643void 3752void
3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3645{ 3754{
3646 int changed = 0;
3647 int color; 3755 int color;
3648 char *buf, *name; 3756 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1]; 3757 bool query = str[0] == '?' && !str[1];
3650 int saveop = op; 3758 int saveop = op;
3651 dDisp; 3759 dDisp;
… …
3672 unsigned long bytes_after; 3780 unsigned long bytes_after;
3673 unsigned char *value = 0; 3781 unsigned char *value = 0;
3674 const char *str = ""; 3782 const char *str = "";
3675 3783
3676 if (prop 3784 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3785 && XGetWindowProperty (disp, parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3786 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3787 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3788 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3789 && actual_type != None
3682 && actual_format == 8) 3790 && actual_format == 8)
… …
3694 { 3802 {
3695 *eq = 0; 3803 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3804 set_utf8_property (display->atom (str), eq + 1);
3697 } 3805 }
3698 else 3806 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3807 XDeleteProperty (disp, parent[0],
3700 display->atom (str)); 3808 display->atom (str));
3701 } 3809 }
3702 break; 3810 break;
3703 3811
3704 case XTerm_Color: 3812 case XTerm_Color:
… …
3706 { 3814 {
3707 if ((name = strchr (buf, ';')) == NULL) 3815 if ((name = strchr (buf, ';')) == NULL)
3708 break; 3816 break;
3709 3817
3710 *name++ = '\0'; 3818 *name++ = '\0';
3711 color = atoi (buf); 3819 color = atoi (buf) + minCOLOR;
3712 3820
3713 if (color < 0 || color >= TOTAL_COLORS) 3821 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3714 break; 3822 break;
3715 3823
3716 if ((buf = strchr (name, ';')) != NULL) 3824 if ((buf = strchr (name, ';')) != NULL)
3717 *buf++ = '\0'; 3825 *buf++ = '\0';
3718 3826
3719 if (name[0] == '?' && !name[1]) 3827 if (name[0] == '?' && !name[1])
3720 { 3828 {
3721 unsigned short r, g, b; 3829 unsigned short r, g, b;
3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3830 pix_colors_focused[color].get (display, r, g, b);
3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3724 } 3832 }
3725 else 3833 else
3726 set_window_color (color + minCOLOR, name); 3834 set_window_color (color, name);
3727 } 3835 }
3728 break; 3836 break;
3729 case XTerm_Color00: 3837 case XTerm_Color00:
3730 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3838 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3731 break; 3839 break;
3732 case XTerm_Color01: 3840 case XTerm_Color01:
3733 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3841 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3734 break; 3842 break;
3735#ifndef NO_CURSORCOLOR 3843#ifndef NO_CURSORCOLOR
3736 case XTerm_Color_cursor: 3844 case XTerm_Color_cursor:
3737 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3738 break; 3846 break;
… …
3742 break; 3850 break;
3743 case XTerm_Color_pointer_bg: 3851 case XTerm_Color_pointer_bg:
3744 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3745 break; 3853 break;
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3854#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755 break;
3756 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break; 3857 break;
3858 case Rxvt_Color_BD:
3859 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp);
3861 break;
3862 case Rxvt_Color_UL:
3863 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp);
3865 break;
3866 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3868 break;
3759#endif 3869#endif
3760#if TRANSPARENT && TINTING 3870#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint: 3871 case URxvt_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763 check_our_parents (); 3873 check_our_parents ();
3764 if (am_transparent) 3874 if (am_transparent)
3765 want_full_refresh = want_refresh = 1; 3875 want_full_refresh = want_refresh = 1;
3766 break; 3876 break;
3767#endif 3877#endif
3768 3878
3769 case XTerm_Pixmap: 3879 case Rxvt_Pixmap:
3880 {
3770 if (*str != ';') 3881 if (*str != ';')
3771 { 3882 {
3772#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3773 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3774 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3775#endif
3776 scr_touch (true); 3886 scr_touch (true);
3887#endif
3777 } 3888 }
3889
3890 int changed = 0;
3891
3778 while ((str = strchr (str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3779 { 3893 {
3780 str++; 3894 str++;
3781#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3782 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3783#endif 3897#endif
3784 } 3898 }
3785 3899
3786 if (changed) 3900 if (changed)
3787 { 3901 {
3788#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3789 resize_pixmap (); 3903 resize_pixmap ();
3790#endif
3791 scr_touch (true); 3904 scr_touch (true);
3905#endif
3792 } 3906 }
3907 }
3793 break; 3908 break;
3794 3909
3795 case XTerm_restoreFG: 3910 case Rxvt_restoreFG:
3796 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3797 break; 3912 break;
3798 case XTerm_restoreBG: 3913 case Rxvt_restoreBG:
3799 set_window_color (Color_bg, str); 3914 set_window_color (Color_bg, str);
3800 break; 3915 break;
3801 3916
3802 case XTerm_logfile: 3917 case XTerm_logfile:
3803 // TODO, when secure mode? 3918 // TODO, when secure mode?
3804 break; 3919 break;
3805 3920
3921#if 0
3922 case Rxvt_dumpscreen: /* no error notices */
3923 {
3924 int fd;
3925 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3926 {
3927 scr_dump (fd);
3928 close (fd);
3929 }
3930 }
3931 break;
3932#endif
3806 case XTerm_font: 3933 case XTerm_font:
3807 op = URxvt_font; 3934 op = URxvt_font;
3808 case URxvt_font: 3935 case URxvt_font:
3809#if ENABLE_STYLES 3936#if ENABLE_STYLES
3810 case URxvt_boldFont: 3937 case URxvt_boldFont:
3811 case URxvt_italicFont: 3938 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3939 case URxvt_boldItalicFont:
3813#endif 3940#endif
3814 if (query) 3941 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3942 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3944 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3945 resp);
3819 else 3946 else
3820 { 3947 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3948 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 3949
… …
3825 set_fonts (); 3952 set_fonts ();
3826 } 3953 }
3827 break; 3954 break;
3828 3955
3829#if ENABLE_FRILLS 3956#if ENABLE_FRILLS
3830 case XTerm_locale: 3957 case URxvt_locale:
3831 if (query) 3958 if (query)
3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3833 else 3960 else
3834 { 3961 {
3835 set_locale (str); 3962 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 3963 pty->set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 3964 init_xlocale ();
3839# endif
3840 } 3965 }
3841 break; 3966 break;
3842#endif
3843 3967
3844#ifdef MENUBAR 3968 case URxvt_view_up:
3845 case XTerm_Menu: 3969 case URxvt_view_down:
3846 if (options & Opt_insecure) 3970 {
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3971 int lines = atoi (str);
3972
3973 if (lines)
3974 scr_page (op == URxvt_view_up ? UP : DN, lines);
3975 else
3976 scr_erase_savelines ();
3977 }
3978
3848 break; 3979 break;
3849#endif 3980#endif
3850#if 0 3981
3851 case XTerm_dumpscreen: /* no error notices */ 3982#if ENABLE_PERL
3852 { 3983 case URxvt_perl:
3853 int fd; 3984 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3985 ; // no responses yet
3855 {
3856 scr_dump (fd);
3857 close (fd);
3858 }
3859 }
3860 break; 3986 break;
3861#endif 3987#endif
3862 } 3988 }
3863} 3989}
3864/*----------------------------------------------------------------------*/ 3990/*----------------------------------------------------------------------*/
… …
3895 return state; 4021 return state;
3896} 4022}
3897 4023
3898/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
3899void 4025void
3900rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4026rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3901{ 4027{
3902 unsigned int i, j; 4028 unsigned int i, j;
3903 int state; 4029 int state;
3904 4030
3905 static const struct 4031 static const struct
… …
3916 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
3917 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
3918 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode 4045 // 8, bi-directional support mode
3920 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
3921#ifdef menuBar_esc
3922 { menuBar_esc, PrivMode_menuBar },
3923#endif
3924 // 18, 19 printing-related 4047 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor }, 4048 { 25, PrivMode_VisibleCursor },
3926#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
3927 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
3928#endif 4051#endif
… …
3973 } 4096 }
3974 4097
3975 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
3976 switch (arg[i]) 4099 switch (arg[i])
3977 { 4100 {
4101#if ENABLE_STYLES
4102 case 1021:
4103 set_option (Opt_intensityStyles, mode);
4104
4105 scr_touch (true);
4106 break;
4107#endif
3978 case 1048: /* alternative cursor save */ 4108 case 1048: /* alternative cursor save */
3979 case 1049: 4109 case 1049:
3980 if (options & Opt_secondaryScreen) 4110 if (OPTION (Opt_secondaryScreen))
3981 if (mode == 0) 4111 if (mode == 0)
3982 scr_cursor (RESTORE); 4112 scr_cursor (RESTORE);
3983 else if (mode == 1) 4113 else if (mode == 1)
3984 scr_cursor (SAVE); 4114 scr_cursor (SAVE);
3985 break; 4115 break;
… …
3997 */ 4127 */
3998 PrivMode (1, PrivMode_vt52); 4128 PrivMode (1, PrivMode_vt52);
3999 break; 4129 break;
4000 case 3: /* 80/132 */ 4130 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 4131 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4132 set_widthheight (((state ? 132 : 80) * fwidth), height);
4003 break; 4133 break;
4004 case 4: /* smooth scrolling */ 4134 case 4: /* smooth scrolling */
4005 if (state)
4006 options &= ~Opt_jumpScroll;
4007 else
4008 options |= Opt_jumpScroll; 4135 set_option (Opt_jumpScroll, !state);
4009 break; 4136 break;
4010 case 5: /* reverse video */ 4137 case 5: /* reverse video */
4011 scr_rvideo_mode (state); 4138 scr_rvideo_mode (state);
4012 break; 4139 break;
4013 case 6: /* relative/absolute origins */ 4140 case 6: /* relative/absolute origins */
… …
4019 /* case 8: - auto repeat, can't do on a per window basis */ 4146 /* case 8: - auto repeat, can't do on a per window basis */
4020 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
4021 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
4022 priv_modes &= ~PrivMode_MouseX11; 4149 priv_modes &= ~PrivMode_MouseX11;
4023 break; 4150 break;
4024#ifdef menuBar_esc
4025 case menuBar_esc:
4026#ifdef MENUBAR
4027 map_menuBar (state);
4028#endif
4029 break;
4030#endif
4031#ifdef scrollBar_esc 4151#ifdef scrollBar_esc
4032 case scrollBar_esc: 4152 case scrollBar_esc:
4033 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
4034 { 4154 {
4035 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
… …
4054#if 0 4174#if 0
4055 case 1001: 4175 case 1001:
4056 break; /* X11 mouse highlighting */ 4176 break; /* X11 mouse highlighting */
4057#endif 4177#endif
4058 case 1010: /* scroll to bottom on TTY output inhibit */ 4178 case 1010: /* scroll to bottom on TTY output inhibit */
4059 if (state)
4060 options &= ~Opt_scrollTtyOutput;
4061 else
4062 options |= Opt_scrollTtyOutput; 4179 set_option (Opt_scrollTtyOutput, !state);
4063 break; 4180 break;
4064 case 1011: /* scroll to bottom on key press */ 4181 case 1011: /* scroll to bottom on key press */
4065 if (state)
4066 options |= Opt_scrollTtyKeypress; 4182 set_option (Opt_scrollTtyKeypress, state);
4067 else
4068 options &= ~Opt_scrollTtyKeypress;
4069 break; 4183 break;
4070 case 1047: /* secondary screen w/ clearing last */ 4184 case 1047: /* secondary screen w/ clearing last */
4071 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4072 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4073 scr_erase_screen (2); 4187 scr_erase_screen (2);
4074 scr_change_screen (state); 4188 scr_change_screen (state);
4075 break; 4189 break;
4076 case 1049: /* secondary screen w/ clearing first */ 4190 case 1049: /* secondary screen w/ clearing first */
4077 scr_change_screen (state); 4191 scr_change_screen (state);
4078 if (options & Opt_secondaryScreen) 4192 if (OPTION (Opt_secondaryScreen))
4079 if (current_screen != PRIMARY) 4193 if (current_screen != PRIMARY)
4080 scr_erase_screen (2); 4194 scr_erase_screen (2);
4081 break; 4195 break;
4082 default: 4196 default:
4083 break; 4197 break;
… …
4211 scr_color (Color_bg, Color_bg); 4325 scr_color (Color_bg, Color_bg);
4212 break; 4326 break;
4213 4327
4214 //case 50: // not variable spacing 4328 //case 50: // not variable spacing
4215 4329
4216#ifndef NO_BRIGHTCOLOR 4330#if ENABLE_FRILLS
4217 case 90: 4331 case 90:
4218 case 91: /* set bright fg color */ 4332 case 91: /* set bright fg color */
4219 case 92: 4333 case 92:
4220 case 93: 4334 case 93:
4221 case 94: 4335 case 94:
… …
4233 case 106: 4347 case 106:
4234 case 107: 4348 case 107:
4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4349 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4236 break; 4350 break;
4237#endif 4351#endif
4238
4239 } 4352 }
4240 } 4353 }
4241} 4354}
4242/*}}} */ 4355/*}}} */
4243 4356
… …
4267 */ 4380 */
4268void 4381void
4269rxvt_term::tt_printf (const char *fmt,...) 4382rxvt_term::tt_printf (const char *fmt,...)
4270{ 4383{
4271 va_list arg_ptr; 4384 va_list arg_ptr;
4272 unsigned char buf[256]; 4385 char buf[256];
4273 4386
4274 va_start (arg_ptr, fmt); 4387 va_start (arg_ptr, fmt);
4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4388 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4276 va_end (arg_ptr); 4389 va_end (arg_ptr);
4277 tt_write (buf, strlen (buf)); 4390 tt_write (buf, strlen (buf));
… …
4282 * or generated by us in response to a query ESC sequence. 4395 * or generated by us in response to a query ESC sequence.
4283 */ 4396 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4397const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285 4398
4286void 4399void
4287rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
4288{ 4401{
4402 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4403 return;
4404
4405 if (pty->pty < 0)
4406 return;
4407
4289 if (v_buflen == 0) 4408 if (v_buflen == 0)
4290 { 4409 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4410 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4292 4411
4293 if ((unsigned int)written == len) 4412 if ((unsigned int)written == len)
4294 return; 4413 return;
4295 4414
4296 data += written; 4415 data += written;
4297 len -= written; 4416 len -= written;
4298 } 4417 }
4299 4418
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4301 4420
4302 memcpy (v_buffer + v_buflen, data, len); 4421 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len; 4422 v_buflen += len;
4304 4423
4305 pty_ev.set (EVENT_READ | EVENT_WRITE); 4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4306} 4425}
4307 4426
4308void rxvt_term::pty_write () 4427void rxvt_term::pty_write ()
4309{ 4428{
4310 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4311 4430
4312 if (written > 0) 4431 if (written > 0)
4313 { 4432 {
4314 v_buflen -= written; 4433 v_buflen -= written;
4315 4434
… …
4324 } 4443 }
4325 4444
4326 memmove (v_buffer, v_buffer + written, v_buflen); 4445 memmove (v_buffer, v_buffer + written, v_buflen);
4327 } 4446 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this... 4448 pty_ev.set (EVENT_READ);
4330 destroy ();
4331} 4449}
4332 4450
4333/*----------------------- end-of-file (C source) -----------------------*/ 4451/*----------------------- end-of-file (C source) -----------------------*/
4334 4452

Diff Legend

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