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

Diff Legend

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