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

Diff Legend

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