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.247 by root, Sat Jan 7 20:23:52 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;
… …
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_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 */
… …
866 923
867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
869/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
870unsigned int 927unsigned int
871rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
872{ 929{
873 unsigned int n, s; 930 unsigned int n, s;
874 931
875 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
913 } 970 }
914#endif 971#endif
915 972
916 if (want_refresh) 973 if (want_refresh)
917 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
918 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
919 scrollbar_show (1); 1015 scrollbar_show (1);
920#ifdef USE_XIM 1016#ifdef USE_XIM
921 IMSendSpot (); 1017 IMSendSpot ();
922#endif 1018#endif
… …
932 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
933 1029
934 display->flush (); 1030 display->flush ();
935 1031
936 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
938} 1034}
939 1035
940void 1036void
941rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
942{ 1038{
… …
1006{ 1102{
1007 if (mouse_slip_wheel_speed == 0 1103 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed)) 1105 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1106 {
1011 if (TermWin.view_start == TermWin.nscrolled || 1107 if (view_start == nsaved ||
1012 TermWin.view_start == 0) 1108 view_start == 0)
1013 mouse_slip_wheel_speed = 0; 1109 mouse_slip_wheel_speed = 0;
1014 1110
1015 refresh_type |= SMOOTH_REFRESH; 1111 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1112 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 } 1114 }
1019} 1115}
1020#endif 1116#endif
1021 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1022bool 1136bool
1023rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1024{ 1138{
1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026 1140
1027 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1028 { 1142 {
1029 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1030 n = 0; 1144 n = 0;
1031 } 1145 }
1032 1146
1033 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1034 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1035 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1036 1150
1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1038 1152
1039 if (n > 0) 1153 if (r > 0)
1040 { 1154 {
1041 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1042 return true; 1156 return true;
1043 } 1157 }
1044 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
1045 destroy (); 1170 destroy ();
1171 }
1046 1172
1047 return false; 1173 return false;
1048} 1174}
1049 1175
1050void 1176void
… …
1064} 1190}
1065 1191
1066void 1192void
1067rxvt_term::pointer_unblank () 1193rxvt_term::pointer_unblank ()
1068{ 1194{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1195 XDefineCursor (display->display, vt, TermWin_cursor);
1070 recolour_cursor (); 1196 recolour_cursor ();
1071 1197
1072#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1199 hidden_pointer = 0;
1074 1200
1075 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1076 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif 1203#endif
1078} 1204}
1079 1205
1080#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1081void 1207void
1082rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1083{ 1209{
1084 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1085 return; 1211 return;
1086 1212
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1088 XFlush (display->display); 1214 XFlush (display->display);
1089 1215
1090 hidden_pointer = 1; 1216 hidden_pointer = 1;
1091} 1217}
1092 1218
… …
1187 1313
1188 SET_R (this); 1314 SET_R (this);
1189 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1190 1316
1191#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1193 { 1319 {
1194 if (hidden_cursor) 1320 if (hidden_cursor)
1195 { 1321 {
1196 hidden_cursor = 0; 1322 hidden_cursor = 0;
1197 want_refresh = 1; 1323 want_refresh = 1;
… …
1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1201 } 1327 }
1202#endif 1328#endif
1203 1329
1204#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1206 { 1332 {
1207 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1208 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1209 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1210 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1289 else 1415 else
1290 iso14755buf = 0; 1416 iso14755buf = 0;
1291 } 1417 }
1292#endif 1418#endif
1293 1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1295 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1298 mouse_slip_wheel_speed = 0; 1428 mouse_slip_wheel_speed = 0;
… …
1308 button_release (ev.xbutton); 1438 button_release (ev.xbutton);
1309 break; 1439 break;
1310 1440
1311 case ClientMessage: 1441 case ClientMessage:
1312 if (ev.xclient.format == 32 1442 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1314 destroy (); 1446 destroy ();
1447#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev);
1452#endif
1453 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1315#ifdef OFFIX_DND 1463#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */ 1464 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile 1466 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir 1467 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink)) 1468 || ev.xclient.data.l[0] == DndLink))
1321 { 1469 {
1322 /* Get Dnd data */ 1470 /* Get Dnd data */
1323 Atom ActualType; 1471 Atom ActualType;
1324 int ActualFormat; 1472 int ActualFormat;
1325 unsigned char *data; 1473 unsigned char *data;
… …
1368 break; 1516 break;
1369 } 1517 }
1370 break; 1518 break;
1371 1519
1372 case FocusIn: 1520 case FocusIn:
1373 if (!TermWin.focus) 1521 focus_in ();
1522 break;
1523
1524 case FocusOut:
1525 focus_out ();
1526 break;
1527
1528 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0])
1374 { 1530 {
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)); 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ;
1442 1533
1443 if (szHint.width != width || szHint.height != height) 1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1535 {
1445 seen_resize = 1; 1536 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1538 }
1448 1539
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450 if (options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1451 check_our_parents (); 1542 check_our_parents ();
1452#endif 1543#endif
1453 } 1544 }
1454 break; 1545 break;
1455 1546
… …
1471 1562
1472 case SelectionRequest: 1563 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1474 break; 1565 break;
1475 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1476 case UnmapNotify: 1575 case UnmapNotify:
1477 TermWin.mapped = 0; 1576 mapped = 0;
1478#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1480#endif 1579#endif
1481 break; 1580 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; 1581 break;
1489 1582
1490#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1491 case ReparentNotify: 1584 case ReparentNotify:
1492 rootwin_cb (ev); 1585 rootwin_cb (ev);
1493 break; 1586 break;
1494#endif /* TRANSPARENT */ 1587#endif /* TRANSPARENT */
1495 1588
1496 case GraphicsExpose: 1589 case GraphicsExpose:
1497 case Expose: 1590 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1591 if (ev.xany.window == vt)
1499 { 1592 {
1500 do 1593 do
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1594 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1595 ev.xexpose.width, ev.xexpose.height, False);
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504 1597
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1599
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1601 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1602 ev.xexpose.width, ev.xexpose.height, False);
1510 1603
1511 scr_refresh (refresh_type); 1604 scr_refresh (refresh_type);
1512 } 1605 }
… …
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose (); 1622 menubar_expose ();
1530#endif 1623#endif
1531 1624
1532#ifdef TRANSPARENT 1625#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1626 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (disp, ev.xany.window); 1627 XClearWindow (disp, ev.xany.window);
1535#endif 1628#endif
1536 } 1629 }
1537 break; 1630 break;
1538 1631
… …
1549 } 1642 }
1550#endif 1643#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1645 break;
1553 1646
1554 if (ev.xany.window == TermWin.vt) 1647 if (ev.xany.window == vt)
1555 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1652 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559 ; 1654 ;
1560 1655
1561 XQueryPointer (disp, TermWin.vt, 1656 XQueryPointer (disp, vt,
1562 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1659 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1660 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1661#ifdef MOUSE_THRESHOLD
… …
1578#endif 1673#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1674 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1675 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1676
1582#ifdef SELECTION_SCROLLING 1677#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1678 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1679 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1680 {
1586 int dist; 1681 int dist;
1587 1682
1588 /* don't clobber the current delay if we are 1683 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1684 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1692 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1693 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1694 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1695
1601 /* calc number of lines to scroll */ 1696 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1697 if (ev.xbutton.y < int_bwidth)
1603 { 1698 {
1604 scroll_selection_dir = UP; 1699 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1700 dist = int_bwidth - ev.xbutton.y;
1606 } 1701 }
1607 else 1702 else
1608 { 1703 {
1609 scroll_selection_dir = DN; 1704 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1705 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1706 }
1612 1707
1613 scroll_selection_lines = Pixel2Height (dist) 1708 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1709 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1710 + 1;
1616 MIN_IT (scroll_selection_lines, 1711 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1712 SELECTION_SCROLL_MAX_LINES);
1618 } 1713 }
1619 else 1714 else
1620 { 1715 {
1621 /* we are within the text window, so we 1716 /* we are within the text window, so we
… …
1649 } 1744 }
1650 break; 1745 break;
1651 } 1746 }
1652} 1747}
1653 1748
1749void
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 {
1762 IMSetStatusPosition ();
1763 XSetICFocus (Input_Context);
1764 }
1765#endif
1766#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_focused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1778}
1779
1780void
1781rxvt_term::focus_out ()
1782{
1783 if (focus)
1784 {
1785 focus = 0;
1786 want_refresh = 1;
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1793 iso14755buf = 0;
1794# if ENABLE_OVERLAY
1795 scr_overlay_off ();
1796# endif
1797 }
1798#endif
1799#if USE_XIM
1800 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context);
1802#endif
1803#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink))
1805 cursor_blink_ev.stop ();
1806 hidden_cursor = 0;
1807#endif
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1810 {
1811 pix_colors = pix_colors_unfocused;
1812 scr_recolour ();
1813 }
1814#endif
1815 }
1816}
1817
1654#if TRANSPARENT 1818#if TRANSPARENT
1655void 1819void
1656rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1821{
1658 SET_R (this); 1822 SET_R (this);
… …
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1834 return;
1671 1835
1672 /* FALLTHROUGH */ 1836 /* FALLTHROUGH */
1673 case ReparentNotify: 1837 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1839 want_refresh = want_full_refresh = 1;
1676 break; 1840 break;
1677 } 1841 }
1678} 1842}
1679#endif 1843#endif
… …
1682rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1683{ 1847{
1684 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1685 1849
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1687 if (!bypass_keystate) 1852 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1854
1690 /* 1855 /*
1691 * VT window processing of button press 1856 * VT window processing of button press
1692 */ 1857 */
1693 if (ev.window == TermWin.vt) 1858 if (ev.window == vt)
1694 { 1859 {
1695#if ISO_14755 1860#if ISO_14755
1696 // 5.4 1861 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1863 {
… …
1711#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1712 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1713 { 1878 {
1714 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1715 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1716 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1717 { 1883 {
1718 /* only report double clicks */ 1884 /* only report double clicks */
1719 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1720 mouse_report (ev); 1886 mouse_report (ev);
… …
1740 else 1906 else
1741 { 1907 {
1742 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1743 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1744 1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1745 switch (ev.button) 1912 switch (ev.button)
1746 { 1913 {
1747 case Button1: 1914 case Button1:
1748 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1749 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1750#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1751 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1752#else 1919#else
1753 selection.rect = false; 1920 selection.rect = false;
1754#endif 1921#endif
1755 1922
1756 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1758 { 1925 {
1759 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1760 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1761 else 1928 else
1762 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1763 } 1930 }
1764 else 1931 else
1765 { 1932 {
1766 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1767 MEvent.clicks++; 1934 MEvent.clicks++;
1768 else 1935 else
1769 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1770 1937
1771 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1772 } 1939 }
1773 1940
1774 MEvent.button = Button1; 1941 MEvent.button = Button1;
1775 break; 1942 break;
1776 1943
1777 case Button3: 1944 case Button3:
1778 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1779 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1780 else 1947 else
1781 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1782 1949
1783 MEvent.button = Button3; 1950 MEvent.button = Button3;
1784 break; 1951 break;
1785 } 1952 }
1786 } 1953 }
1787 1954
1788 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1789 return; 1956 return;
1790 } 1957 }
1791 1958
… …
1903 case Button3: 2070 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != R_SB_XTERM)
1905 { 2072 {
1906 if (scrollbar_above_slider (ev.y)) 2073 if (scrollbar_above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 2075 scr_page (UP, nrow - 1);
1909# else 2076# else
1910 scr_page (UP, TermWin.nrow / 4); 2077 scr_page (UP, nrow / 4);
1911# endif 2078# endif
1912 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollbar_below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 2081 scr_page (DN, nrow - 1);
1915# else 2082# else
1916 scr_page (DN, TermWin.nrow / 4); 2083 scr_page (DN, nrow / 4);
1917# endif 2084# endif
1918 else 2085 else
1919 scrollBar.setMotion (); 2086 scrollBar.setMotion ();
1920 } 2087 }
1921 else 2088 else
1922 { 2089 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 2091 (nrow
1925 * scrollbar_position (ev.y) 2092 * scrollbar_position (ev.y)
1926 / scrollbar_size ())); 2093 / scrollbar_size ()));
1927 } 2094 }
1928 2095
1929 break; 2096 break;
1930 } 2097 }
1931 } 2098 }
2099
1932 return; 2100 return;
1933 } 2101 }
2102
1934#if MENUBAR 2103#if MENUBAR
1935 /* 2104 /*
1936 * Menubar window processing of button press 2105 * Menubar window processing of button press
1937 */ 2106 */
1938 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
1961#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
1964#endif 2133#endif
1965 2134
1966 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
1967 { 2136 {
1968#if ISO_14755 2137#if ISO_14755
1969 // 5.4 2138 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2140 return;
… …
2001 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2002 && bypass_keystate 2171 && bypass_keystate
2003 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2004 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2005 2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2006 switch (ev.button) 2178 switch (ev.button)
2007 { 2179 {
2008 case Button1: 2180 case Button1:
2009 case Button3: 2181 case Button3:
2010 selection_make (ev.time); 2182 selection_make (ev.time);
… …
2021 2193
2022 v = ev.button == Button4 ? UP : DN; 2194 v = ev.button == Button4 ? UP : DN;
2023 2195
2024 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2025 i = 1; 2197 i = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2198 else if (OPTION (Opt_mouseWheelScrollPage))
2027 i = TermWin.nrow - 1; 2199 i = nrow - 1;
2028 else 2200 else
2029 i = 5; 2201 i = 5;
2030 2202
2031# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2033 { 2205 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2207 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; 2208 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037 2209
2038 if (slip_wheel_ev.at < NOW) 2210 if (slip_wheel_ev.at < NOW)
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040 2212
2041 slip_wheel_ev.start (); 2213 slip_wheel_ev.start ();
… …
2317 XWindowAttributes wattr, wrootattr; 2489 XWindowAttributes wattr, wrootattr;
2318 dDisp; 2490 dDisp;
2319 2491
2320 pchanged = 0; 2492 pchanged = 0;
2321 2493
2322 if (!(options & Opt_transparent)) 2494 if (!OPTION (Opt_transparent))
2323 return pchanged; /* Don't try any more */ 2495 return pchanged; /* Don't try any more */
2324 2496
2325 XGetWindowAttributes (disp, display->root, &wrootattr); 2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth; 2498 rootdepth = wrootattr.depth;
2327 2499
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2500 XGetWindowAttributes (disp, parent[0], &wattr);
2329 2501
2330 if (rootdepth != wattr.depth) 2502 if (rootdepth != wattr.depth)
2331 { 2503 {
2332 if (am_transparent) 2504 if (am_transparent)
2333 { 2505 {
2334 pchanged = 1; 2506 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0; 2508 am_transparent = am_pixmap_trans = 0;
2337 } 2509 }
2338 2510
2339 return pchanged; /* Don't try any more */ 2511 return pchanged; /* Don't try any more */
2340 } 2512 }
… …
2381 Window cr; 2553 Window cr;
2382 XImage *image; 2554 XImage *image;
2383 GC gc; 2555 GC gc;
2384 XGCValues gcvalue; 2556 XGCValues gcvalue;
2385 2557
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2558 XTranslateCoordinates (disp, parent[0], display->root,
2387 0, 0, &sx, &sy, &cr); 2559 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width; 2560 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height; 2561 nh = (unsigned int)szHint.height;
2390 nx = ny = 0; 2562 nx = ny = 0;
2391 2563
… …
2401 nh += sy; 2573 nh += sy;
2402 ny = -sy; 2574 ny = -sy;
2403 sy = 0; 2575 sy = 0;
2404 } 2576 }
2405 2577
2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2408 2580
2409 XSync (disp, False); 2581 XSync (disp, False);
2410 allowedxerror = -1; 2582 allowedxerror = -1;
2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412 2584
… …
2417 if (image == NULL) 2589 if (image == NULL)
2418 { 2590 {
2419 if (am_transparent && am_pixmap_trans) 2591 if (am_transparent && am_pixmap_trans)
2420 { 2592 {
2421 pchanged = 1; 2593 pchanged = 1;
2422 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2423 { 2595 {
2424 XFreePixmap (disp, TermWin.pixmap); 2596 XFreePixmap (disp, pixmap);
2425 TermWin.pixmap = None; 2597 pixmap = None;
2426 } 2598 }
2427 } 2599 }
2428 2600
2429 am_pixmap_trans = 0; 2601 am_pixmap_trans = 0;
2430 } 2602 }
2431 else 2603 else
2432 { 2604 {
2433 if (TermWin.pixmap != None) 2605 if (pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap); 2606 XFreePixmap (disp, pixmap);
2435 2607
2436#if TINTING 2608#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint)) 2609 if (ISSET_PIXCOLOR (Color_tint))
2438 { 2610 {
2439 unsigned short rm, gm, bm; 2611 unsigned short rm, gm, bm;
… …
2443 2615
2444 ShadeXImage (display, image, shade, rm, gm, bm); 2616 ShadeXImage (display, image, shade, rm, gm, bm);
2445 } 2617 }
2446#endif 2618#endif
2447 2619
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2620 pixmap = XCreatePixmap (disp, vt,
2449 szHint.width, szHint.height, image->depth); 2621 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height); 2624 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc); 2625 XFreeGC (disp, gc);
2454 XDestroyImage (image); 2626 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456 XClearWindow (disp, TermWin.parent[0]); 2628 XClearWindow (disp, parent[0]);
2457 2629
2458 if (!am_transparent || !am_pixmap_trans) 2630 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1; 2631 pchanged = 1;
2460 2632
2461 am_transparent = am_pixmap_trans = 1; 2633 am_transparent = am_pixmap_trans = 1;
2462 } 2634 }
2463 } 2635 }
2464 2636
2465 if (am_pixmap_trans) 2637 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467 else 2639 else
2468 { 2640 {
2469 unsigned int n; 2641 unsigned int n;
2470 /* 2642 /*
2471 * InheritPixmap transparency 2643 * InheritPixmap transparency
2472 */ 2644 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2646 {
2475 oldp = TermWin.parent[i]; 2647 oldp = parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root, 2648 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2649 &parent[i], &list, &n);
2478 XFree (list); 2650 XFree (list);
2479 2651
2480 if (TermWin.parent[i] == display->root) 2652 if (parent[i] == display->root)
2481 { 2653 {
2482 if (oldp != None) 2654 if (oldp != None)
2483 pchanged = 1; 2655 pchanged = 1;
2484 2656
2485 break; 2657 break;
2486 } 2658 }
2487 2659
2488 if (oldp != TermWin.parent[i]) 2660 if (oldp != parent[i])
2489 pchanged = 1; 2661 pchanged = 1;
2490 } 2662 }
2491 2663
2492 n = 0; 2664 n = 0;
2493 2665
2494 if (pchanged) 2666 if (pchanged)
2495 { 2667 {
2496 for (; n < (unsigned int)i; n++) 2668 for (; n < (unsigned int)i; n++)
2497 { 2669 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2670 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2672 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2674 break;
2503 } 2675 }
2504 } 2676 }
2505 } 2677 }
2506 2678
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2680 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2683 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2684 /* XXX: also turn off Opt_transparent? */
2513 } 2685 }
2514 else 2686 else
2515 { 2687 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2690 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2691 sleep (1);
2520#endif 2692#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2693 for (n = 0; n < (unsigned int)i; n++)
2522 { 2694 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]); 2696 XClearWindow (disp, parent[n]);
2525 } 2697 }
2526 2698
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2700 am_transparent = 1;
2529 } 2701 }
2530 2702
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2704 parent[i] = None;
2533 } 2705 }
2534 2706
2535 if (scrollBar.win) 2707 if (scrollBar.win)
2536 { 2708 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2554 2726
2555bool 2727bool
2556rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2557{ 2729{
2558 bool flag = false; 2730 bool flag = false;
2559 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2560 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2561 2733
2562 for (;;) 2734 for (;;)
2563 { 2735 {
2564 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2565 { 2737 {
2566 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2567 ch = next_char (); 2739 ch = next_char ();
2568 }
2569 2740
2570 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2571 break; 2742 break;
2743 }
2572 2744
2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2574 { 2746 {
2575 if (!seen_input) 2747 if (!seen_input)
2576 { 2748 {
… …
2580 // some window managers resize the window early, and these programs 2752 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2753 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2754 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2755 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2756 // resized.
2585 if (seen_resize) 2757 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2587 } 2759 }
2588 2760
2589 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2763 bool refreshnow = false;
2592 int nlines = 0; 2764 int nlines = 0;
2593 unicode_t *str = buf; 2765 wchar_t *str = buf;
2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2594 2767
2595 for (;;) 2768 for (;;)
2596 { 2769 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break; 2771 break;
2599 2772
2600 *str++ = ch; 2773 *str++ = ch;
2601 2774
2602 if (ch == C0_LF) 2775 if (ch == C0_LF || str >= eol)
2603 { 2776 {
2777 if (ch == C0_LF)
2604 nlines++; 2778 nlines++;
2779
2605 refresh_count++; 2780 refresh_count++;
2606 2781
2607 if (!(options & Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2609 { 2784 {
2610 refreshnow = true; 2785 refreshnow = true;
2786 refresh_count = 0;
2611 ch = NOCHAR; 2787 ch = NOCHAR;
2612 break; 2788 break;
2613 } 2789 }
2614 2790
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2792 if (nlines >= nrow - 1)
2617 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2618 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2619 nlines = 0; 2797 nlines = 0;
2620 str = buf; 2798 str = buf;
2799 eol = str + min (ncol, UBUFSIZ);
2621 } 2800 }
2622 }
2623 2801
2624 if (str >= buf + UBUFSIZ) 2802 if (str >= eol)
2625 { 2803 {
2804 if (eol >= buf + UBUFSIZ)
2805 {
2626 ch = NOCHAR; 2806 ch = NOCHAR;
2627 break; 2807 break;
2808 }
2809 else
2810 eol = min (eol + ncol, buf + UBUFSIZ);
2811 }
2812
2628 } 2813 }
2629 2814
2630 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2816 ch = next_char ();
2632 } 2817 }
2633 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2634 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2635 2821
2636 /* 2822 /*
2637 * If there have been a lot of new lines, then update the screen 2823 * 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. 2824 * 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 2825 * the number of pages between refreshes is refresh_limit, which
2640 * is incremented here because we must be doing flat-out scrolling. 2826 * is incremented here because we must be doing flat-out scrolling.
2641 */ 2827 */
2642 if (refreshnow) 2828 if (refreshnow)
2643 { 2829 {
2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645 refresh_limit++; 2831 refresh_limit++;
2646 else 2832 else
2647 { 2833 {
2648 flag = true; 2834 flag = true;
2649 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2650 } 2837 }
2651 } 2838 }
2652 2839
2653 } 2840 }
2654 else 2841 else
… …
2669 } 2856 }
2670 2857
2671 return flag; 2858 return flag;
2672} 2859}
2673 2860
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 2861// read the next character
2684unicode_t 2862wchar_t
2685rxvt_term::next_char () 2863rxvt_term::next_char ()
2686{ 2864{
2687 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2688 { 2866 {
2689 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2690 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2691 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2692 2870
2693 wchar_t wc; 2871 wchar_t wc;
2694 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2695 2873
2696 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2697 { 2875 {
2698 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2699 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2700 break; 2878 break;
2701 } 2879 }
2702 2880
2703 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2705 2883
2706 // assume wchar == unicode 2884 // assume wchar == unicode
2707 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2708 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2709 } 2887 }
2710 2888
2711 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2712} 2899}
2713 2900
2714/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2715/* 2902/*
2716 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2717 * to the command. 2904 * to the command.
2718 */ 2905 */
2719unicode_t 2906wchar_t
2720rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2721{ 2908{
2722 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2723 2910
2724 if (c == NOCHAR) 2911 if (c == NOCHAR)
2725 throw out_of_input; 2912 throw out_of_input;
2726 2913
2727 return c; 2914 return c;
2728} 2915}
2729 2916
2730unicode_t 2917uint32_t
2731rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2732{ 2919{
2733 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2734 2921
2735 if (c == NOCHAR) 2922 if (c == NOCHAR)
2736 throw out_of_input; 2923 throw out_of_input;
2737 2924
2738 return c; 2925 return c;
… …
2838 case C0_ESC: 3025 case C0_ESC:
2839 process_escape_seq (); 3026 process_escape_seq ();
2840 break; 3027 break;
2841 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2842 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2845 else 3031 else
2846 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2847 (unsigned int)strlen (VT100_ANS));
2848 break; 3033 break;
2849 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2850 scr_bell (); 3035 scr_bell ();
2851 break; 3036 break;
2852 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
3007 break; 3192 break;
3008 3193
3009 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3010 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3011 { 3196 {
3012 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3013 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3014 } 3199 }
3015 break; 3200 break;
3016 3201
3017 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3018 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3040 process_dcs_seq (); 3225 process_dcs_seq ();
3041 break; 3226 break;
3042 3227
3043 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3044 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
3045 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3046 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3047 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
3048 3232
3049 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3050 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
3051 process_csi_seq (); 3235 process_csi_seq ();
… …
3291 3475
3292 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3476 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293 arg[0] = -arg[0]; 3477 arg[0] = -arg[0];
3294 /* FALLTHROUGH */ 3478 /* FALLTHROUGH */
3295 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297 break; 3481 break;
3298 3482
3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3301 (unsigned int) (sizeof (VT100_ANS) - 1));
3302 break; 3485 break;
3303 3486
3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3305 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3306 break; 3489 break;
… …
3313 break; 3496 break;
3314 case 6: /* CPR requested */ 3497 case 6: /* CPR requested */
3315 scr_report_position (); 3498 scr_report_position ();
3316 break; 3499 break;
3317 case 7: /* unofficial extension */ 3500 case 7: /* unofficial extension */
3318 if (options & Opt_insecure) 3501 if (OPTION (Opt_insecure))
3319 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3502 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3320 break; 3503 break;
3321 case 8: /* unofficial extension */ 3504 case 8: /* unofficial extension */
3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3323 break; 3506 break;
… …
3426 { 3609 {
3427 /* 3610 /*
3428 * commands 3611 * commands
3429 */ 3612 */
3430 case 1: /* deiconify window */ 3613 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3614 XMapWindow (disp, parent[0]);
3432 break; 3615 break;
3433 case 2: /* iconify window */ 3616 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3617 XIconifyWindow (disp, parent[0], display->screen);
3435 break; 3618 break;
3436 case 3: /* set position (pixels) */ 3619 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3620 XMoveWindow (disp, parent[0], args[1], args[2]);
3438 break; 3621 break;
3439 case 4: /* set size (pixels) */ 3622 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3624 break;
3442 case 5: /* raise window */ 3625 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3626 XRaiseWindow (disp, parent[0]);
3444 break; 3627 break;
3445 case 6: /* lower window */ 3628 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3629 XLowerWindow (disp, parent[0]);
3447 break; 3630 break;
3448 case 7: /* refresh window */ 3631 case 7: /* refresh window */
3449 scr_touch (true); 3632 scr_touch (true);
3450 break; 3633 break;
3451 case 8: /* set size (chars) */ 3634 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3635 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3454 break; 3637 break;
3455 3638
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3639 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3640 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3641 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3642 set_widthheight ((unsigned int)width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3643 (unsigned int) (args[1] * fheight));
3461 break; 3644 break;
3462 3645
3463 3646
3464 /* 3647 /*
3465 * reports - some output format copied from XTerm 3648 * reports - some output format copied from XTerm
3466 */ 3649 */
3467 case 11: /* report window state */ 3650 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3653 break;
3471 case 13: /* report window position */ 3654 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3656 XTranslateCoordinates (disp, parent[0], wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3657 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3658 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3659 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3660 break;
3478 case 14: /* report window size (pixels) */ 3661 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3662 XGetWindowAttributes (disp, parent[0], &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3664 break;
3482 case 18: /* report text area size (chars) */ 3665 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3666 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3667 break;
3485 case 19: /* report window size (chars) */ 3668 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3669 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3670 break;
3488 case 20: /* report icon label */ 3671 case 20: /* report icon label */
3489 { 3672 {
3490 char *s; 3673 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3674 XGetIconName (disp, parent[0], &s);
3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s); 3676 XFree (s);
3494 } 3677 }
3495 break; 3678 break;
3496 case 21: /* report window title */ 3679 case 21: /* report window title */
3497 { 3680 {
3498 char *s; 3681 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3682 XFetchName (disp, parent[0], &s);
3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s); 3684 XFree (s);
3502 } 3685 }
3503 break; 3686 break;
3504 } 3687 }
3505} 3688}
… …
3508/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3509/* 3692/*
3510 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3511 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3512 */ 3695 */
3513unsigned char * 3696char *
3514rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3515{ 3698{
3516 unicode_t ch; 3699 unicode_t ch;
3517 bool seen_esc = false; 3700 bool seen_esc = false;
3518 unsigned int n = 0; 3701 unsigned int n = 0;
… …
3537 else if (ch < 0x20) 3720 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3721 return NULL; /* other control character - exit */
3539 3722
3540 seen_esc = false; 3723 seen_esc = false;
3541 3724
3542 if (n >= sizeof (string) - 1) 3725 if (n >= STRING_MAX - 1)
3543 // stop at some sane length 3726 // stop at some sane length
3544 return NULL; 3727 return NULL;
3545 3728
3546 if (ch == C0_SYN) 3729 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 (); 3730 string[n++] = cmd_get8 ();
… …
3551 3734
3552 string[n++] = '\0'; 3735 string[n++] = '\0';
3553 3736
3554 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3555 3738
3556 return (unsigned char *)rxvt_wcstombs (string); 3739 return rxvt_wcstombs (string);
3557} 3740}
3558 3741
3559/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3560/* 3743/*
3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3562 */ 3745 */
3563void 3746void
3564rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3565{ 3748{
3566 unsigned char *s; 3749 char *s;
3567 unicode_t eh; 3750 unicode_t eh;
3568 3751
3569 /* 3752 /*
3570 * Not handled yet 3753 * Not handled yet
3571 */ 3754 */
… …
3590 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3591 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3592 3775
3593 if (ch == ';') 3776 if (ch == ';')
3594 { 3777 {
3595 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3596 3779
3597 if (s) 3780 if (s)
3598 { 3781 {
3599 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3600 free (s); 3783 free (s);
3601 } 3784 }
3602 } 3785 }
3603} 3786}
3604 3787
3605void 3788void
3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3607{ 3790{
3608 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3609 { 3792 {
3610 unsigned short r, g, b; 3793 unsigned short r, g, b;
3611 pix_colors_focused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
… …
3615 set_window_color (color, str); 3798 set_window_color (color, str);
3616} 3799}
3617 3800
3618/* 3801/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * 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 */ 3803 */
3643void 3804void
3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3645{ 3806{
3646 int changed = 0; 3807 int changed = 0;
3647 int color; 3808 int color;
3648 char *buf, *name; 3809 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
… …
3672 unsigned long bytes_after; 3833 unsigned long bytes_after;
3673 unsigned char *value = 0; 3834 unsigned char *value = 0;
3674 const char *str = ""; 3835 const char *str = "";
3675 3836
3676 if (prop 3837 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3838 && XGetWindowProperty (disp, parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3839 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3840 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3841 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3842 && actual_type != None
3682 && actual_format == 8) 3843 && actual_format == 8)
… …
3694 { 3855 {
3695 *eq = 0; 3856 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3857 set_utf8_property (display->atom (str), eq + 1);
3697 } 3858 }
3698 else 3859 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3860 XDeleteProperty (disp, parent[0],
3700 display->atom (str)); 3861 display->atom (str));
3701 } 3862 }
3702 break; 3863 break;
3703 3864
3704 case XTerm_Color: 3865 case XTerm_Color:
… …
3745 break; 3906 break;
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3907#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD: 3908 case XTerm_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3909 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break; 3910 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL: 3911 case XTerm_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755 break; 3913 break;
3756 case XTerm_Color_RV: 3914 case XTerm_Color_RV:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break; 3916 break;
3917 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919 break;
3759#endif 3920#endif
3760#if TRANSPARENT && TINTING 3921#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint: 3922 case URxvt_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763 check_our_parents (); 3924 check_our_parents ();
3764 if (am_transparent) 3925 if (am_transparent)
3765 want_full_refresh = want_refresh = 1; 3926 want_full_refresh = want_refresh = 1;
3766 break; 3927 break;
3767#endif 3928#endif
… …
3801 3962
3802 case XTerm_logfile: 3963 case XTerm_logfile:
3803 // TODO, when secure mode? 3964 // TODO, when secure mode?
3804 break; 3965 break;
3805 3966
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0
3974 case XTerm_dumpscreen: /* no error notices */
3975 {
3976 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3978 {
3979 scr_dump (fd);
3980 close (fd);
3981 }
3982 }
3983 break;
3984#endif
3806 case XTerm_font: 3985 case XTerm_font:
3807 op = URxvt_font; 3986 op = URxvt_font;
3808 case URxvt_font: 3987 case URxvt_font:
3809#if ENABLE_STYLES 3988#if ENABLE_STYLES
3810 case URxvt_boldFont: 3989 case URxvt_boldFont:
3811 case URxvt_italicFont: 3990 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3991 case URxvt_boldItalicFont:
3813#endif 3992#endif
3814 if (query) 3993 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3994 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3996 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3997 resp);
3819 else 3998 else
3820 { 3999 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4000 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 4001
… …
3825 set_fonts (); 4004 set_fonts ();
3826 } 4005 }
3827 break; 4006 break;
3828 4007
3829#if ENABLE_FRILLS 4008#if ENABLE_FRILLS
3830 case XTerm_locale: 4009 case URxvt_locale:
3831 if (query) 4010 if (query)
3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3833 else 4012 else
3834 { 4013 {
3835 set_locale (str); 4014 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 4015 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 4016 init_xlocale ();
3839# endif
3840 } 4017 }
3841 break; 4018 break;
3842#endif
3843 4019
3844#ifdef MENUBAR 4020 case URxvt_view_up:
3845 case XTerm_Menu: 4021 case URxvt_view_down:
3846 if (options & Opt_insecure) 4022 {
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4023 int lines = atoi (str);
4024
4025 if (lines)
4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
4027 else
4028 scr_erase_savelines ();
4029 }
4030
3848 break; 4031 break;
3849#endif 4032#endif
3850#if 0 4033
3851 case XTerm_dumpscreen: /* no error notices */ 4034#if ENABLE_PERL
3852 { 4035 case URxvt_perl:
3853 int fd; 4036 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) 4037 ; // no responses yet
3855 {
3856 scr_dump (fd);
3857 close (fd);
3858 }
3859 }
3860 break; 4038 break;
3861#endif 4039#endif
3862 } 4040 }
3863} 4041}
3864/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3973 } 4151 }
3974 4152
3975 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
3976 switch (arg[i]) 4154 switch (arg[i])
3977 { 4155 {
4156#if ENABLE_STYLES
4157 case 1021:
4158 if (mode)
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162
4163 scr_touch (true);
4164 break;
4165#endif
3978 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
3979 case 1049: 4167 case 1049:
3980 if (options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
3981 if (mode == 0) 4169 if (mode == 0)
3982 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
3983 else if (mode == 1) 4171 else if (mode == 1)
3984 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
3985 break; 4173 break;
… …
3997 */ 4185 */
3998 PrivMode (1, PrivMode_vt52); 4186 PrivMode (1, PrivMode_vt52);
3999 break; 4187 break;
4000 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4003 break; 4191 break;
4004 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4005 if (state) 4193 if (!state)
4006 options &= ~Opt_jumpScroll; 4194 SET_OPTION (Opt_jumpScroll);
4007 else 4195 else
4008 options |= Opt_jumpScroll; 4196 CLR_OPTION (Opt_jumpScroll);
4009 break; 4197 break;
4010 case 5: /* reverse video */ 4198 case 5: /* reverse video */
4011 scr_rvideo_mode (state); 4199 scr_rvideo_mode (state);
4012 break; 4200 break;
4013 case 6: /* relative/absolute origins */ 4201 case 6: /* relative/absolute origins */
… …
4054#if 0 4242#if 0
4055 case 1001: 4243 case 1001:
4056 break; /* X11 mouse highlighting */ 4244 break; /* X11 mouse highlighting */
4057#endif 4245#endif
4058 case 1010: /* scroll to bottom on TTY output inhibit */ 4246 case 1010: /* scroll to bottom on TTY output inhibit */
4059 if (state) 4247 if (!state)
4060 options &= ~Opt_scrollTtyOutput; 4248 SET_OPTION (Opt_scrollTtyOutput);
4061 else 4249 else
4062 options |= Opt_scrollTtyOutput; 4250 CLR_OPTION (Opt_scrollTtyOutput);
4063 break; 4251 break;
4064 case 1011: /* scroll to bottom on key press */ 4252 case 1011: /* scroll to bottom on key press */
4065 if (state) 4253 if (state)
4066 options |= Opt_scrollTtyKeypress; 4254 SET_OPTION (Opt_scrollTtyKeypress);
4067 else 4255 else
4068 options &= ~Opt_scrollTtyKeypress; 4256 CLR_OPTION (Opt_scrollTtyKeypress);
4069 break; 4257 break;
4070 case 1047: /* secondary screen w/ clearing last */ 4258 case 1047: /* secondary screen w/ clearing last */
4071 if (options & Opt_secondaryScreen) 4259 if (OPTION (Opt_secondaryScreen))
4072 if (current_screen != PRIMARY) 4260 if (current_screen != PRIMARY)
4073 scr_erase_screen (2); 4261 scr_erase_screen (2);
4074 scr_change_screen (state); 4262 scr_change_screen (state);
4075 break; 4263 break;
4076 case 1049: /* secondary screen w/ clearing first */ 4264 case 1049: /* secondary screen w/ clearing first */
4077 scr_change_screen (state); 4265 scr_change_screen (state);
4078 if (options & Opt_secondaryScreen) 4266 if (OPTION (Opt_secondaryScreen))
4079 if (current_screen != PRIMARY) 4267 if (current_screen != PRIMARY)
4080 scr_erase_screen (2); 4268 scr_erase_screen (2);
4081 break; 4269 break;
4082 default: 4270 default:
4083 break; 4271 break;
… …
4211 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4212 break; 4400 break;
4213 4401
4214 //case 50: // not variable spacing 4402 //case 50: // not variable spacing
4215 4403
4216#ifndef NO_BRIGHTCOLOR 4404#if ENABLE_FRILLS
4217 case 90: 4405 case 90:
4218 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4219 case 92: 4407 case 92:
4220 case 93: 4408 case 93:
4221 case 94: 4409 case 94:
… …
4233 case 106: 4421 case 106:
4234 case 107: 4422 case 107:
4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4423 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4236 break; 4424 break;
4237#endif 4425#endif
4238
4239 } 4426 }
4240 } 4427 }
4241} 4428}
4242/*}}} */ 4429/*}}} */
4243 4430
… …
4267 */ 4454 */
4268void 4455void
4269rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4270{ 4457{
4271 va_list arg_ptr; 4458 va_list arg_ptr;
4272 unsigned char buf[256]; 4459 char buf[256];
4273 4460
4274 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4276 va_end (arg_ptr); 4463 va_end (arg_ptr);
4277 tt_write (buf, strlen (buf)); 4464 tt_write (buf, strlen (buf));
… …
4282 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
4283 */ 4470 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285 4472
4286void 4473void
4287rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4288{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4289 if (v_buflen == 0) 4479 if (v_buflen == 0)
4290 { 4480 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4292 4482
4293 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)
… …
4295 4485
4296 data += written; 4486 data += written;
4297 len -= written; 4487 len -= written;
4298 } 4488 }
4299 4489
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4301 4491
4302 memcpy (v_buffer + v_buflen, data, len); 4492 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len; 4493 v_buflen += len;
4304 4494
4305 pty_ev.set (EVENT_READ | EVENT_WRITE); 4495 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4324 } 4514 }
4325 4515
4326 memmove (v_buffer, v_buffer + written, v_buflen); 4516 memmove (v_buffer, v_buffer + written, v_buflen);
4327 } 4517 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this... 4519 pty_ev.set (EVENT_READ);
4330 destroy ();
4331} 4520}
4332 4521
4333/*----------------------- end-of-file (C source) -----------------------*/ 4522/*----------------------- end-of-file (C source) -----------------------*/
4334 4523

Diff Legend

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