ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.250 by root, Sun Jan 8 06:35:23 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <cwchar>
58#include <csignal> 63#include <csignal>
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 125 XK_Print, 0x2399,
121 126
122 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
124 0, 137 0,
125}; 138};
126 139
127void 140void
128rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
129{ 142{
130 x = Pixel2Col (x); 143 x = Pixel2Col (x);
131 y = Pixel2Row (y); 144 y = Pixel2Row (y);
132 145
133 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 148 return;
136 149
137 for (;;) 150 for (;;)
138 { 151 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
140 155
141 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
142 { 157 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
146 break; 160 break;
147 } 161 }
148 162
149 x--; 163 x--;
150 } 164 }
151
152} 165}
153#endif
154 166
155#if ENABLE_OVERLAY
156void 167void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 169{
159 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 173 int len;
163 174
175 fname = rxvt_utf8towcs (f->name);
176
164#if ENABLE_COMBINING 177# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
166 { 179 {
167 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
170 } 183 }
171 else 184 else
172#endif 185# endif
173 { 186 {
174 ch2 = ch; 187 ch2 = ch;
175 188
176 alloc = 0; 189 alloc = 0;
177 chr = &ch2; 190 chr = &ch2;
178 len = 1; 191 len = 1;
179 } 192 }
180 193
181 int width = strlen (f->name); 194 char attr[80]; // plenty
182 195
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
184 218
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 220
187 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
188 { 222 {
… …
191 ch = *chr++; 225 ch = *chr++;
192 226
193 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
196#if !UNICODE3 230# if !UNICODE3
197 if (ch >= 0x10000) 231 if (ch >= 0x10000)
198 ch = 0xfffd; 232 ch = 0xfffd;
199#endif 233# endif
200 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
202 } 236 }
203 237
238 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
205 240
241 free (fname);
242
206#if ENABLE_COMBINING 243# if ENABLE_COMBINING
207 if (alloc) 244 if (alloc)
208 delete [] alloc; 245 delete [] alloc;
209#endif 246# endif
210} 247}
211#endif 248#endif
212 249
213void 250void
214rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 268 mb[0] = ch[0];
232 len = 1; 269 len = 1;
233 } 270 }
234 271
235 if (len > 0) 272 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
237 else 274 else
238 scr_bell (); 275 scr_bell ();
239 } 276 }
240 277
241 iso14755buf = 0; 278 iso14755buf = 0;
… …
269 KeySym keysym; 306 KeySym keysym;
270#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
272#endif 309#endif
273 int valid_keysym; 310 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
275 312
276 /* 313 /*
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
279 * 316 *
280 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
281 */ 318 */
282 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
285 322
286 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
287 { 324 {
288 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 334 Status status_return;
298 335
299#if 0 336#if 0
300#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
301 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
304 else 341 else
305#endif 342#endif
306#endif 343#endif
307 { 344 {
… …
309 346
310 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
314 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
317 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 357 SET_LOCALE (locale);
319 358
320 if (status_return == XLookupChars 359 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
343 } 382 }
344 else 383 else
345#endif 384#endif
346 { 385 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
349 } 388 }
350 389
351 if (valid_keysym) 390 if (valid_keysym)
352 { 391 {
353#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 394 return;
356#endif 395#endif
357 396
358 if (TermWin.saveLines) 397 if (saveLines)
359 { 398 {
360#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 400 if (!ctrl && !meta)
362#else 401#else
363 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
364#endif 403#endif
365 { 404 {
366 int lnsppg; 405 int lnsppg;
367 406
368#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 409#else
371 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
372#endif 411#endif
373 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
374 { 413 {
375 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
376 return; 415 return;
… …
513 else 552 else
514 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
515 break; 554 break;
516#endif 555#endif
517#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
518 case XK_Delete: 567 case XK_Delete:
519 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
520 break; 569 break;
521#endif 570#endif
522 case XK_Tab: 571 case XK_Tab:
… …
625#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
626 case XK_KP_Begin: 675 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
628 break; 677 break;
629 678
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 679#endif
638 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
673 break; 715 break;
674 716
675 case XK_Find: 717 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
677 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
678 case XK_Insert: 731 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
680 break; 733 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 735 case DXK_Remove:
… …
802 { 855 {
803#ifdef META8_OPTION 856#ifdef META8_OPTION
804 /* set 8-bit on */ 857 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
806 { 859 {
807 unsigned char *ch; 860 char *ch;
808 861
809 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 863 *ch |= 0x80;
811 864
812 meta = 0; 865 meta = 0;
… …
814#endif 867#endif
815 /* nil */ ; 868 /* nil */ ;
816 } 869 }
817 } 870 }
818 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
819 if (len <= 0) 875 if (len <= 0)
820 return; /* not mapped */ 876 return; /* not mapped */
821 877
822 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 879 if (view_start)
824 { 880 {
825 TermWin.view_start = 0; 881 view_start = 0;
826 want_refresh = 1; 882 want_refresh = 1;
827 } 883 }
828 884
829 /* 885 /*
830 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 901#ifdef META8_OPTION
846 && meta_char == C0_ESC 902 && meta_char == C0_ESC
847#endif 903#endif
848 ) 904 )
849 { 905 {
850 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
851 tt_write (&ch, 1); 907 tt_write (&ch, 1);
852 } 908 }
853 909
854#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
867 923
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
871unsigned int 927unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 929{
874 unsigned int n, s; 930 unsigned int n, s;
875 931
876 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 970 }
915#endif 971#endif
916 972
917 if (want_refresh) 973 if (want_refresh)
918 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (++row < end_row);
1011 }
1012
919 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
920 scrollbar_show (1); 1014 scrollbar_show (1);
921#ifdef USE_XIM 1015#ifdef USE_XIM
922 IMSendSpot (); 1016 IMSendSpot ();
923#endif 1017#endif
… …
933 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
934 1028
935 display->flush (); 1029 display->flush ();
936 1030
937 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1033}
940 1034
941void 1035void
942rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
943{ 1037{
… …
1007{ 1101{
1008 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1105 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1106 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1107 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1108 mouse_slip_wheel_speed = 0;
1015 1109
1016 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1111 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1113 }
1020} 1114}
1021#endif 1115#endif
1022 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1023bool 1135bool
1024rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1025{ 1137{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1139
1028 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1029 { 1141 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1143 n = 0;
1032 } 1144 }
1033 1145
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1037 1149
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039 1151
1040 if (n > 0) 1152 if (r > 0)
1041 { 1153 {
1042 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1043 return true; 1155 return true;
1044 } 1156 }
1045 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
1046 destroy (); 1169 destroy ();
1170 }
1047 1171
1048 return false; 1172 return false;
1049} 1173}
1050 1174
1051void 1175void
… …
1065} 1189}
1066 1190
1067void 1191void
1068rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
1069{ 1193{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1195 recolour_cursor ();
1072 1196
1073#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1198 hidden_pointer = 0;
1075 1199
1076 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1202#endif
1079} 1203}
1080 1204
1081#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1082void 1206void
1083rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1084{ 1208{
1085 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1086 return; 1210 return;
1087 1211
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1213 XFlush (display->display);
1090 1214
1091 hidden_pointer = 1; 1215 hidden_pointer = 1;
1092} 1216}
1093 1217
… …
1186{ 1310{
1187 dDisp; 1311 dDisp;
1188 1312
1189 SET_R (this); 1313 SET_R (this);
1190 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1191
1192#if defined(CURSOR_BLINK)
1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1194 {
1195 if (hidden_cursor)
1196 {
1197 hidden_cursor = 0;
1198 want_refresh = 1;
1199 }
1200
1201 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1202 }
1203#endif
1204
1205#if defined(POINTER_BLANK)
1206 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1207 {
1208 if (ev.type == MotionNotify
1209 || ev.type == ButtonPress
1210 || ev.type == ButtonRelease)
1211 if (hidden_pointer)
1212 pointer_unblank ();
1213
1214 if (ev.type == KeyPress && hidden_pointer == 0)
1215 pointer_blank ();
1216 }
1217#endif
1218 1315
1219 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1220 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1221 unsigned int unused_mask; 1318 unsigned int unused_mask;
1222 1319
… …
1253 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((ks >= 0x40 && ks <= 0x5f)
1254 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (ks >= 0x61 && ks <= 0x7f)))
1255 { 1352 {
1256 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1257 commit_iso14755 (); 1354 commit_iso14755 ();
1258 return; // case-break; 1355 goto skip_switch;
1259 } 1356 }
1260 1357
1261 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1262 if (i[0] == ks) 1359 if (i[0] == ks)
1263 { 1360 {
1264 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1265 commit_iso14755 (); 1362 commit_iso14755 ();
1266 return; // case-break; 1363 goto skip_switch;
1267 } 1364 }
1268 1365
1269 scr_bell (); 1366 scr_bell ();
1270# endif 1367# endif
1271 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1290 else 1387 else
1291 iso14755buf = 0; 1388 iso14755buf = 0;
1292 } 1389 }
1293#endif 1390#endif
1294 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1394 break;
1395
1295#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1296 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1297 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1298 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (ks == XK_Control_L || ks == XK_Control_R)
1299 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
… …
1309 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1310 break; 1411 break;
1311 1412
1312 case ClientMessage: 1413 case ClientMessage:
1313 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1314 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1315 destroy (); 1418 destroy ();
1419#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev);
1424#endif
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1316#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1317 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1318 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1320 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1321 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1322 { 1441 {
1323 /* Get Dnd data */ 1442 /* Get Dnd data */
1324 Atom ActualType; 1443 Atom ActualType;
1325 int ActualFormat; 1444 int ActualFormat;
1326 unsigned char *data; 1445 unsigned char *data;
… …
1369 break; 1488 break;
1370 } 1489 }
1371 break; 1490 break;
1372 1491
1373 case FocusIn: 1492 case FocusIn:
1374 if (!TermWin.focus) 1493 focus_in ();
1494 break;
1495
1496 case FocusOut:
1497 focus_out ();
1498 break;
1499
1500 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0])
1375 { 1502 {
1376 TermWin.focus = 1;
1377 want_refresh = 1;
1378#ifdef USE_XIM
1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1382 XSetICFocus (Input_Context);
1383 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1395#endif
1396
1397 }
1398 break;
1399
1400 case FocusOut:
1401 if (TermWin.focus)
1402 {
1403 TermWin.focus = 0;
1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1412#ifdef USE_XIM
1413 if (Input_Context != NULL)
1414 XUnsetICFocus (Input_Context);
1415#endif
1416#ifdef CURSOR_BLINK
1417 if (options & Opt_cursorBlink)
1418 cursor_blink_ev.stop ();
1419 hidden_cursor = 0;
1420#endif
1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1428 }
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == TermWin.parent[0])
1433 {
1434 int height, width;
1435
1436 do
1437 { /* Wrap lots of configures into one */
1438 width = ev.xconfigure.width;
1439 height = ev.xconfigure.height;
1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1441 }
1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ;
1443 1505
1444 if (szHint.width != width || szHint.height != height) 1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1507 {
1446 seen_resize = 1; 1508 seen_resize = 1;
1447 resize_all_windows (width, height, 1); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1510 }
1449 1511
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (options & Opt_transparent) 1513 if (OPTION (Opt_transparent))
1452 check_our_parents (); 1514 check_our_parents ();
1453#endif 1515#endif
1454 } 1516 }
1455 break; 1517 break;
1456 1518
… …
1472 1534
1473 case SelectionRequest: 1535 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1475 break; 1537 break;
1476 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1477 case UnmapNotify: 1547 case UnmapNotify:
1478 TermWin.mapped = 0; 1548 mapped = 0;
1479#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1481#endif 1551#endif
1482 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484 case MapNotify:
1485 TermWin.mapped = 1;
1486#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif
1489 break; 1553 break;
1490 1554
1491#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1492 case ReparentNotify: 1556 case ReparentNotify:
1493 rootwin_cb (ev); 1557 rootwin_cb (ev);
1494 break; 1558 break;
1495#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1496 1560
1497 case GraphicsExpose: 1561 case GraphicsExpose:
1498 case Expose: 1562 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1500 { 1564 {
1501 do 1565 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1569
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1571
1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1511 1575
1512 scr_refresh (refresh_type); 1576 scr_refresh (refresh_type);
1513 } 1577 }
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1594 menubar_expose ();
1531#endif 1595#endif
1532 1596
1533#ifdef TRANSPARENT 1597#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1598 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (disp, ev.xany.window); 1599 XClearWindow (disp, ev.xany.window);
1536#endif 1600#endif
1537 } 1601 }
1538 break; 1602 break;
1539 1603
… …
1550 } 1614 }
1551#endif 1615#endif
1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1617 break;
1554 1618
1555 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1556 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1624 {
1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1626 ;
1561 1627
1562 XQueryPointer (disp, TermWin.vt, 1628 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1565 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1566 &ev.xbutton.state); 1632 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
… …
1579#endif 1645#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1646 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 ev.xbutton.state & Button3Mask ? 2 : 0); 1647 ev.xbutton.state & Button3Mask ? 2 : 0);
1582 1648
1583#ifdef SELECTION_SCROLLING 1649#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < TermWin.int_bwidth 1650 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1651 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1652 {
1587 int dist; 1653 int dist;
1588 1654
1589 /* don't clobber the current delay if we are 1655 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1656 * already in the middle of scrolling.
… …
1598 selection_save_x = ev.xbutton.x; 1664 selection_save_x = ev.xbutton.x;
1599 selection_save_y = ev.xbutton.y; 1665 selection_save_y = ev.xbutton.y;
1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1666 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1601 1667
1602 /* calc number of lines to scroll */ 1668 /* calc number of lines to scroll */
1603 if (ev.xbutton.y < TermWin.int_bwidth) 1669 if (ev.xbutton.y < int_bwidth)
1604 { 1670 {
1605 scroll_selection_dir = UP; 1671 scroll_selection_dir = UP;
1606 dist = TermWin.int_bwidth - ev.xbutton.y; 1672 dist = int_bwidth - ev.xbutton.y;
1607 } 1673 }
1608 else 1674 else
1609 { 1675 {
1610 scroll_selection_dir = DN; 1676 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1677 dist = ev.xbutton.y - (int_bwidth + height);
1612 } 1678 }
1613 1679
1614 scroll_selection_lines = Pixel2Height (dist) 1680 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1681 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1682 + 1;
1617 MIN_IT (scroll_selection_lines, 1683 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1684 SELECTION_SCROLL_MAX_LINES);
1619 } 1685 }
1620 else 1686 else
1621 { 1687 {
1622 /* we are within the text window, so we 1688 /* we are within the text window, so we
… …
1648 refresh_limit = 0; 1714 refresh_limit = 0;
1649 scrollbar_show (1); 1715 scrollbar_show (1);
1650 } 1716 }
1651 break; 1717 break;
1652 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1748}
1749
1750void
1751rxvt_term::focus_in ()
1752{
1753 if (!focus)
1754 {
1755 focus = 1;
1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1760#if USE_XIM
1761 if (Input_Context != NULL)
1762 {
1763 IMSetStatusPosition ();
1764 XSetICFocus (Input_Context);
1765 }
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1770#endif
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 pix_colors = pix_colors_focused;
1775 scr_recolour ();
1776 }
1777#endif
1778 }
1779}
1780
1781void
1782rxvt_term::focus_out ()
1783{
1784 if (focus)
1785 {
1786 focus = 0;
1787 want_refresh = 1;
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1794 iso14755buf = 0;
1795# if ENABLE_OVERLAY
1796 scr_overlay_off ();
1797# endif
1798 }
1799#endif
1800#if USE_XIM
1801 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context);
1803#endif
1804#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink))
1806 cursor_blink_ev.stop ();
1807 hidden_cursor = 0;
1808#endif
1809#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade])
1811 {
1812 pix_colors = pix_colors_unfocused;
1813 scr_recolour ();
1814 }
1815#endif
1816 }
1653} 1817}
1654 1818
1655#if TRANSPARENT 1819#if TRANSPARENT
1656void 1820void
1657rxvt_term::rootwin_cb (XEvent &ev) 1821rxvt_term::rootwin_cb (XEvent &ev)
… …
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1671 return; 1835 return;
1672 1836
1673 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1674 case ReparentNotify: 1838 case ReparentNotify:
1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1676 want_refresh = want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1677 break; 1841 break;
1678 } 1842 }
1679} 1843}
1680#endif 1844#endif
… …
1683rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1684{ 1848{
1685 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1686 1850
1687 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1688 if (!bypass_keystate) 1853 if (!bypass_keystate)
1689 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690 1855
1691 /* 1856 /*
1692 * VT window processing of button press 1857 * VT window processing of button press
1693 */ 1858 */
1694 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1695 { 1860 {
1696#if ISO_14755 1861#if ISO_14755
1697 // 5.4 1862 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 { 1864 {
… …
1712#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1713 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1714 { 1879 {
1715 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1716 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1717 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1718 { 1884 {
1719 /* only report double clicks */ 1885 /* only report double clicks */
1720 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1721 mouse_report (ev); 1887 mouse_report (ev);
… …
1741 else 1907 else
1742 { 1908 {
1743 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1744 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1745 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1746 switch (ev.button) 1913 switch (ev.button)
1747 { 1914 {
1748 case Button1: 1915 case Button1:
1749 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1750 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1751#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1752 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1753#else 1920#else
1754 selection.rect = false; 1921 selection.rect = false;
1755#endif 1922#endif
1756 1923
1757 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1758 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1759 { 1926 {
1760 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1761 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1762 else 1929 else
1763 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1764 } 1931 }
1765 else 1932 else
1766 { 1933 {
1767 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1768 MEvent.clicks++; 1935 MEvent.clicks++;
1769 else 1936 else
1770 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1771 1938
1772 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1773 } 1940 }
1774 1941
1775 MEvent.button = Button1; 1942 MEvent.button = Button1;
1776 break; 1943 break;
1777 1944
1778 case Button3: 1945 case Button3:
1779 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1780 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1781 else 1948 else
1782 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1783 1950
1784 MEvent.button = Button3; 1951 MEvent.button = Button3;
1785 break; 1952 break;
1786 } 1953 }
1787 } 1954 }
1788 1955
1789 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1790 return; 1957 return;
1791 } 1958 }
1792 1959
… …
1904 case Button3: 2071 case Button3:
1905 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1906 { 2073 {
1907 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1908# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1909 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1910# else 2077# else
1911 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1912# endif 2079# endif
1913 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1915 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1916# else 2083# else
1917 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1918# endif 2085# endif
1919 else 2086 else
1920 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1921 } 2088 }
1922 else 2089 else
1923 { 2090 {
1924 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1925 (TermWin.nrow 2092 (nrow
1926 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1927 / scrollbar_size ())); 2094 / scrollbar_size ()));
1928 } 2095 }
1929 2096
1930 break; 2097 break;
1931 } 2098 }
1932 } 2099 }
2100
1933 return; 2101 return;
1934 } 2102 }
2103
1935#if MENUBAR 2104#if MENUBAR
1936 /* 2105 /*
1937 * Menubar window processing of button press 2106 * Menubar window processing of button press
1938 */ 2107 */
1939 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
1962#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1963 if (sel_scroll_ev.active) 2132 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop(); 2133 sel_scroll_ev.stop();
1965#endif 2134#endif
1966 2135
1967 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1968 { 2137 {
1969#if ISO_14755 2138#if ISO_14755
1970 // 5.4 2139 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return; 2141 return;
… …
2002 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2003 && bypass_keystate 2172 && bypass_keystate
2004 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2005 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2006 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2007 switch (ev.button) 2179 switch (ev.button)
2008 { 2180 {
2009 case Button1: 2181 case Button1:
2010 case Button3: 2182 case Button3:
2011 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2022 2194
2023 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2024 2196
2025 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
2026 i = 1; 2198 i = 1;
2027 else if (options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
2028 i = TermWin.nrow - 1; 2200 i = nrow - 1;
2029 else 2201 else
2030 i = 5; 2202 i = 5;
2031 2203
2032# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
2033 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
2034 { 2206 {
2035 mouse_slip_wheel_speed += v ? -1 : 1; 2207 mouse_slip_wheel_speed += v ? -1 : 1;
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 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2038 2210
2039 if (slip_wheel_ev.at < NOW) 2211 if (slip_wheel_ev.at < NOW)
2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041 2213
2042 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
… …
2318 XWindowAttributes wattr, wrootattr; 2490 XWindowAttributes wattr, wrootattr;
2319 dDisp; 2491 dDisp;
2320 2492
2321 pchanged = 0; 2493 pchanged = 0;
2322 2494
2323 if (!(options & Opt_transparent)) 2495 if (!OPTION (Opt_transparent))
2324 return pchanged; /* Don't try any more */ 2496 return pchanged; /* Don't try any more */
2325 2497
2326 XGetWindowAttributes (disp, display->root, &wrootattr); 2498 XGetWindowAttributes (disp, display->root, &wrootattr);
2327 rootdepth = wrootattr.depth; 2499 rootdepth = wrootattr.depth;
2328 2500
2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2501 XGetWindowAttributes (disp, parent[0], &wattr);
2330 2502
2331 if (rootdepth != wattr.depth) 2503 if (rootdepth != wattr.depth)
2332 { 2504 {
2333 if (am_transparent) 2505 if (am_transparent)
2334 { 2506 {
2335 pchanged = 1; 2507 pchanged = 1;
2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2508 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2337 am_transparent = am_pixmap_trans = 0; 2509 am_transparent = am_pixmap_trans = 0;
2338 } 2510 }
2339 2511
2340 return pchanged; /* Don't try any more */ 2512 return pchanged; /* Don't try any more */
2341 } 2513 }
… …
2382 Window cr; 2554 Window cr;
2383 XImage *image; 2555 XImage *image;
2384 GC gc; 2556 GC gc;
2385 XGCValues gcvalue; 2557 XGCValues gcvalue;
2386 2558
2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2559 XTranslateCoordinates (disp, parent[0], display->root,
2388 0, 0, &sx, &sy, &cr); 2560 0, 0, &sx, &sy, &cr);
2389 nw = (unsigned int)szHint.width; 2561 nw = (unsigned int)szHint.width;
2390 nh = (unsigned int)szHint.height; 2562 nh = (unsigned int)szHint.height;
2391 nx = ny = 0; 2563 nx = ny = 0;
2392 2564
… …
2402 nh += sy; 2574 nh += sy;
2403 ny = -sy; 2575 ny = -sy;
2404 sy = 0; 2576 sy = 0;
2405 } 2577 }
2406 2578
2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2579 min_it (nw, (unsigned int) (wrootattr.width - sx));
2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2580 min_it (nh, (unsigned int) (wrootattr.height - sy));
2409 2581
2410 XSync (disp, False); 2582 XSync (disp, False);
2411 allowedxerror = -1; 2583 allowedxerror = -1;
2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2584 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2413 2585
… …
2418 if (image == NULL) 2590 if (image == NULL)
2419 { 2591 {
2420 if (am_transparent && am_pixmap_trans) 2592 if (am_transparent && am_pixmap_trans)
2421 { 2593 {
2422 pchanged = 1; 2594 pchanged = 1;
2423 if (TermWin.pixmap != None) 2595 if (pixmap != None)
2424 { 2596 {
2425 XFreePixmap (disp, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2426 TermWin.pixmap = None; 2598 pixmap = None;
2427 } 2599 }
2428 } 2600 }
2429 2601
2430 am_pixmap_trans = 0; 2602 am_pixmap_trans = 0;
2431 } 2603 }
2432 else 2604 else
2433 { 2605 {
2434 if (TermWin.pixmap != None) 2606 if (pixmap != None)
2435 XFreePixmap (disp, TermWin.pixmap); 2607 XFreePixmap (disp, pixmap);
2436 2608
2437#if TINTING 2609#if TINTING
2438 if (ISSET_PIXCOLOR (Color_tint)) 2610 if (ISSET_PIXCOLOR (Color_tint))
2439 { 2611 {
2440 unsigned short rm, gm, bm; 2612 unsigned short rm, gm, bm;
… …
2444 2616
2445 ShadeXImage (display, image, shade, rm, gm, bm); 2617 ShadeXImage (display, image, shade, rm, gm, bm);
2446 } 2618 }
2447#endif 2619#endif
2448 2620
2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2621 pixmap = XCreatePixmap (disp, vt,
2450 szHint.width, szHint.height, image->depth); 2622 szHint.width, szHint.height, image->depth);
2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2623 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2624 XPutImage (disp, pixmap, gc, image, 0, 0,
2453 nx, ny, image->width, image->height); 2625 nx, ny, image->width, image->height);
2454 XFreeGC (disp, gc); 2626 XFreeGC (disp, gc);
2455 XDestroyImage (image); 2627 XDestroyImage (image);
2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2628 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2457 XClearWindow (disp, TermWin.parent[0]); 2629 XClearWindow (disp, parent[0]);
2458 2630
2459 if (!am_transparent || !am_pixmap_trans) 2631 if (!am_transparent || !am_pixmap_trans)
2460 pchanged = 1; 2632 pchanged = 1;
2461 2633
2462 am_transparent = am_pixmap_trans = 1; 2634 am_transparent = am_pixmap_trans = 1;
2463 } 2635 }
2464 } 2636 }
2465 2637
2466 if (am_pixmap_trans) 2638 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2468 else 2640 else
2469 { 2641 {
2470 unsigned int n; 2642 unsigned int n;
2471 /* 2643 /*
2472 * InheritPixmap transparency 2644 * InheritPixmap transparency
2473 */ 2645 */
2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2475 { 2647 {
2476 oldp = TermWin.parent[i]; 2648 oldp = parent[i];
2477 XQueryTree (disp, TermWin.parent[i - 1], &root, 2649 XQueryTree (disp, parent[i - 1], &root,
2478 &TermWin.parent[i], &list, &n); 2650 &parent[i], &list, &n);
2479 XFree (list); 2651 XFree (list);
2480 2652
2481 if (TermWin.parent[i] == display->root) 2653 if (parent[i] == display->root)
2482 { 2654 {
2483 if (oldp != None) 2655 if (oldp != None)
2484 pchanged = 1; 2656 pchanged = 1;
2485 2657
2486 break; 2658 break;
2487 } 2659 }
2488 2660
2489 if (oldp != TermWin.parent[i]) 2661 if (oldp != parent[i])
2490 pchanged = 1; 2662 pchanged = 1;
2491 } 2663 }
2492 2664
2493 n = 0; 2665 n = 0;
2494 2666
2495 if (pchanged) 2667 if (pchanged)
2496 { 2668 {
2497 for (; n < (unsigned int)i; n++) 2669 for (; n < (unsigned int)i; n++)
2498 { 2670 {
2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2671 XGetWindowAttributes (disp, parent[n], &wattr);
2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2672 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2501 { 2673 {
2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2674 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2503 break; 2675 break;
2504 } 2676 }
2505 } 2677 }
2506 } 2678 }
2507 2679
2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2680 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2509 { 2681 {
2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2682 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2683 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = 0; 2684 am_transparent = 0;
2513 /* XXX: also turn off Opt_transparent? */ 2685 /* XXX: also turn off Opt_transparent? */
2514 } 2686 }
2515 else 2687 else
2516 { 2688 {
… …
2519 * needed for fvwm2.2.2 (and before?) */ 2691 * needed for fvwm2.2.2 (and before?) */
2520 sleep (1); 2692 sleep (1);
2521#endif 2693#endif
2522 for (n = 0; n < (unsigned int)i; n++) 2694 for (n = 0; n < (unsigned int)i; n++)
2523 { 2695 {
2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2696 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2525 XClearWindow (disp, TermWin.parent[n]); 2697 XClearWindow (disp, parent[n]);
2526 } 2698 }
2527 2699
2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2700 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2529 am_transparent = 1; 2701 am_transparent = 1;
2530 } 2702 }
2531 2703
2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2704 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2533 TermWin.parent[i] = None; 2705 parent[i] = None;
2534 } 2706 }
2535 2707
2536 if (scrollBar.win) 2708 if (scrollBar.win)
2537 { 2709 {
2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2710 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2555 2727
2556bool 2728bool
2557rxvt_term::cmd_parse () 2729rxvt_term::cmd_parse ()
2558{ 2730{
2559 bool flag = false; 2731 bool flag = false;
2560 unicode_t ch = NOCHAR; 2732 wchar_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2733 char *seq_begin; // remember start of esc-sequence here
2562 2734
2563 for (;;) 2735 for (;;)
2564 { 2736 {
2565 if (ch == NOCHAR) 2737 if (ch == NOCHAR)
2566 { 2738 {
2567 seq_begin = cmdbuf_ptr; 2739 seq_begin = cmdbuf_ptr;
2568 ch = next_char (); 2740 ch = next_char ();
2569 }
2570 2741
2571 if (ch == NOCHAR) // TODO: improve 2742 if (ch == NOCHAR)
2572 break; 2743 break;
2744 }
2573 2745
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2746 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 { 2747 {
2576 if (!seen_input) 2748 if (!seen_input)
2577 { 2749 {
… …
2581 // some window managers resize the window early, and these programs 2753 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2754 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2755 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2756 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2757 // resized.
2586 if (seen_resize) 2758 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2759 kill (-cmd_pid, SIGWINCH);
2588 } 2760 }
2589 2761
2590 /* Read a text string from the input buffer */ 2762 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2763 wchar_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2764 bool refreshnow = false;
2593 int nlines = 0; 2765 int nlines = 0;
2594 unicode_t *str = buf; 2766 wchar_t *str = buf;
2767 wchar_t *eol = str + min (ncol, UBUFSIZ);
2595 2768
2596 for (;;) 2769 for (;;)
2597 { 2770 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2771 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2772 break;
2600 2773
2601 *str++ = ch; 2774 *str++ = ch;
2602 2775
2603 if (ch == C0_LF) 2776 if (ch == C0_LF || str >= eol)
2604 { 2777 {
2778 if (ch == C0_LF)
2605 nlines++; 2779 nlines++;
2780
2606 refresh_count++; 2781 refresh_count++;
2607 2782
2608 if (!(options & Opt_jumpScroll) 2783 if (!OPTION (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2784 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2785 {
2611 refreshnow = true; 2786 refreshnow = true;
2787 refresh_count = 0;
2612 ch = NOCHAR; 2788 ch = NOCHAR;
2613 break; 2789 break;
2614 } 2790 }
2615 2791
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2792 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2793 if (nlines >= nrow - 1)
2618 { 2794 {
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2619 scr_add_lines (buf, nlines, str - buf); 2796 scr_add_lines (buf, str - buf, nlines);
2797
2620 nlines = 0; 2798 nlines = 0;
2621 str = buf; 2799 str = buf;
2800 eol = str + min (ncol, UBUFSIZ);
2622 } 2801 }
2623 }
2624 2802
2625 if (str >= buf + UBUFSIZ) 2803 if (str >= eol)
2626 { 2804 {
2805 if (eol >= buf + UBUFSIZ)
2806 {
2627 ch = NOCHAR; 2807 ch = NOCHAR;
2628 break; 2808 break;
2809 }
2810 else
2811 eol = min (eol + ncol, buf + UBUFSIZ);
2812 }
2813
2629 } 2814 }
2630 2815
2631 seq_begin = cmdbuf_ptr; 2816 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2817 ch = next_char ();
2633 } 2818 }
2634 2819
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2635 scr_add_lines (buf, nlines, str - buf); 2821 scr_add_lines (buf, str - buf, nlines);
2636 2822
2637 /* 2823 /*
2638 * If there have been a lot of new lines, then update the screen 2824 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full. 2825 * What the heck I'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which 2826 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2827 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2828 */
2643 if (refreshnow) 2829 if (refreshnow)
2644 { 2830 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2832 refresh_limit++;
2647 else 2833 else
2648 { 2834 {
2649 flag = true; 2835 flag = true;
2650 scr_refresh (refresh_type); 2836 scr_refresh (refresh_type);
2837 flush_ev.stop ();
2651 } 2838 }
2652 } 2839 }
2653 2840
2654 } 2841 }
2655 else 2842 else
… …
2670 } 2857 }
2671 2858
2672 return flag; 2859 return flag;
2673} 2860}
2674 2861
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2684// read the next character 2862// read the next character
2685unicode_t 2863wchar_t
2686rxvt_term::next_char () 2864rxvt_term::next_char ()
2687{ 2865{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2866 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2867 {
2690 // assume 7-bit to be ascii ALWAYS 2868 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2869 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++; 2870 return *cmdbuf_ptr++;
2693 2871
2694 wchar_t wc; 2872 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2873 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2874
2697 if (len == (size_t)-2) 2875 if (len == (size_t)-2)
2698 { 2876 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2877 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2878 cmdbuf_ptr = cmdbuf_endp;
2701 break; 2879 break;
2702 } 2880 }
2703 2881
2704 if (len == (size_t)-1) 2882 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2883 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2884
2707 // assume wchar == unicode 2885 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2886 cmdbuf_ptr += len;
2709 return wc & UNICODE_MASK; 2887 return wc & UNICODE_MASK;
2710 } 2888 }
2711 2889
2712 return NOCHAR; 2890 return NOCHAR;
2891}
2892
2893// read the next octet
2894uint32_t
2895rxvt_term::next_octet ()
2896{
2897 return cmdbuf_ptr < cmdbuf_endp
2898 ? (unsigned char)*cmdbuf_ptr++
2899 : NOCHAR;
2713} 2900}
2714 2901
2715/* rxvt_cmd_getc () - Return next input character */ 2902/* rxvt_cmd_getc () - Return next input character */
2716/* 2903/*
2717 * Return the next input character after first passing any keyboard input 2904 * Return the next input character after first passing any keyboard input
2718 * to the command. 2905 * to the command.
2719 */ 2906 */
2720unicode_t 2907wchar_t
2721rxvt_term::cmd_getc () 2908rxvt_term::cmd_getc ()
2722{ 2909{
2723 unicode_t c = next_char (); 2910 wchar_t c = next_char ();
2724 2911
2725 if (c == NOCHAR) 2912 if (c == NOCHAR)
2726 throw out_of_input; 2913 throw out_of_input;
2727 2914
2728 return c; 2915 return c;
2729} 2916}
2730 2917
2731unicode_t 2918uint32_t
2732rxvt_term::cmd_get8 () 2919rxvt_term::cmd_get8 ()
2733{ 2920{
2734 unicode_t c = next_octet (); 2921 uint32_t c = next_octet ();
2735 2922
2736 if (c == NOCHAR) 2923 if (c == NOCHAR)
2737 throw out_of_input; 2924 throw out_of_input;
2738 2925
2739 return c; 2926 return c;
… …
2839 case C0_ESC: 3026 case C0_ESC:
2840 process_escape_seq (); 3027 process_escape_seq ();
2841 break; 3028 break;
2842 case C0_ENQ: /* terminal Status */ 3029 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 3030 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3031 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 3032 else
2847 tt_write ((unsigned char *)VT100_ANS, 3033 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 3034 break;
2850 case C0_BEL: /* bell */ 3035 case C0_BEL: /* bell */
2851 scr_bell (); 3036 scr_bell ();
2852 break; 3037 break;
2853 case C0_BS: /* backspace */ 3038 case C0_BS: /* backspace */
… …
3008 break; 3193 break;
3009 3194
3010 /* 8.3.87: NEXT LINE */ 3195 /* 8.3.87: NEXT LINE */
3011 case C1_NEL: /* ESC E */ 3196 case C1_NEL: /* ESC E */
3012 { 3197 {
3013 unicode_t nlcr[] = { C0_LF, C0_CR }; 3198 wchar_t nlcr[] = { C0_LF, C0_CR };
3014 scr_add_lines (nlcr, 1, 2); 3199 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3015 } 3200 }
3016 break; 3201 break;
3017 3202
3018 /* kidnapped escape sequence: Should be 8.3.48 */ 3203 /* kidnapped escape sequence: Should be 8.3.48 */
3019 case C1_ESA: /* ESC G */ 3204 case C1_ESA: /* ESC G */
… …
3041 process_dcs_seq (); 3226 process_dcs_seq ();
3042 break; 3227 break;
3043 3228
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3229 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 3230 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 3231 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 3232 break; /* steal obsolete ESC [ c */
3049 3233
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3234 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3051 case C1_CSI: /* ESC [ */ 3235 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 3236 process_csi_seq ();
… …
3177 { 3361 {
3178 switch (priv) 3362 switch (priv)
3179 { 3363 {
3180 case '>': 3364 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3365 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3366 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3367 break;
3184 case '?': 3368 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3369 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3370 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3371 break;
… …
3292 3476
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3477 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3478 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3479 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3480 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3481 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3482 break;
3299 3483
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3484 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3485 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 3486 break;
3304 3487
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3488 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 3489 process_sgr_mode (nargs, arg);
3307 break; 3490 break;
… …
3314 break; 3497 break;
3315 case 6: /* CPR requested */ 3498 case 6: /* CPR requested */
3316 scr_report_position (); 3499 scr_report_position ();
3317 break; 3500 break;
3318 case 7: /* unofficial extension */ 3501 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3502 if (OPTION (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3503 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3504 break;
3322 case 8: /* unofficial extension */ 3505 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3506 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3507 break;
… …
3427 { 3610 {
3428 /* 3611 /*
3429 * commands 3612 * commands
3430 */ 3613 */
3431 case 1: /* deiconify window */ 3614 case 1: /* deiconify window */
3432 XMapWindow (disp, TermWin.parent[0]); 3615 XMapWindow (disp, parent[0]);
3433 break; 3616 break;
3434 case 2: /* iconify window */ 3617 case 2: /* iconify window */
3435 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3618 XIconifyWindow (disp, parent[0], display->screen);
3436 break; 3619 break;
3437 case 3: /* set position (pixels) */ 3620 case 3: /* set position (pixels) */
3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3621 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3622 break;
3440 case 4: /* set size (pixels) */ 3623 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3624 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3625 break;
3443 case 5: /* raise window */ 3626 case 5: /* raise window */
3444 XRaiseWindow (disp, TermWin.parent[0]); 3627 XRaiseWindow (disp, parent[0]);
3445 break; 3628 break;
3446 case 6: /* lower window */ 3629 case 6: /* lower window */
3447 XLowerWindow (disp, TermWin.parent[0]); 3630 XLowerWindow (disp, parent[0]);
3448 break; 3631 break;
3449 case 7: /* refresh window */ 3632 case 7: /* refresh window */
3450 scr_touch (true); 3633 scr_touch (true);
3451 break; 3634 break;
3452 case 8: /* set size (chars) */ 3635 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3636 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3637 (unsigned int) (args[1] * fheight));
3455 break; 3638 break;
3456 3639
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3640 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3641 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3642 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3643 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3644 (unsigned int) (args[1] * fheight));
3462 break; 3645 break;
3463 3646
3464 3647
3465 /* 3648 /*
3466 * reports - some output format copied from XTerm 3649 * reports - some output format copied from XTerm
3467 */ 3650 */
3468 case 11: /* report window state */ 3651 case 11: /* report window state */
3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3652 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3653 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3654 break;
3472 case 13: /* report window position */ 3655 case 13: /* report window position */
3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3656 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3657 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3658 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3659 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3660 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3661 break;
3479 case 14: /* report window size (pixels) */ 3662 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3663 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3664 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3665 break;
3483 case 18: /* report text area size (chars) */ 3666 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3667 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3668 break;
3486 case 19: /* report window size (chars) */ 3669 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3670 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3671 break;
3489 case 20: /* report icon label */ 3672 case 20: /* report icon label */
3490 { 3673 {
3491 char *s; 3674 char *s;
3492 XGetIconName (disp, TermWin.parent[0], &s); 3675 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3676 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3677 XFree (s);
3495 } 3678 }
3496 break; 3679 break;
3497 case 21: /* report window title */ 3680 case 21: /* report window title */
3498 { 3681 {
3499 char *s; 3682 char *s;
3500 XFetchName (disp, TermWin.parent[0], &s); 3683 XFetchName (disp, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3684 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3685 XFree (s);
3503 } 3686 }
3504 break; 3687 break;
3505 } 3688 }
3506} 3689}
… …
3509/*----------------------------------------------------------------------*/ 3692/*----------------------------------------------------------------------*/
3510/* 3693/*
3511 * get input up until STRING TERMINATOR (or BEL) 3694 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3695 * ends_how is terminator used. returned input must be free()'d
3513 */ 3696 */
3514unsigned char * 3697char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3698rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3699{
3517 unicode_t ch; 3700 unicode_t ch;
3518 bool seen_esc = false; 3701 bool seen_esc = false;
3519 unsigned int n = 0; 3702 unsigned int n = 0;
… …
3538 else if (ch < 0x20) 3721 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3722 return NULL; /* other control character - exit */
3540 3723
3541 seen_esc = false; 3724 seen_esc = false;
3542 3725
3543 if (n >= sizeof (string) - 1) 3726 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3727 // stop at some sane length
3545 return NULL; 3728 return NULL;
3546 3729
3547 if (ch == C0_SYN) 3730 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3731 string[n++] = cmd_get8 ();
… …
3552 3735
3553 string[n++] = '\0'; 3736 string[n++] = '\0';
3554 3737
3555 ends_how = (ch == 0x5c ? C0_ESC : ch); 3738 ends_how = (ch == 0x5c ? C0_ESC : ch);
3556 3739
3557 return (unsigned char *)rxvt_wcstombs (string); 3740 return rxvt_wcstombs (string);
3558} 3741}
3559 3742
3560/*----------------------------------------------------------------------*/ 3743/*----------------------------------------------------------------------*/
3561/* 3744/*
3562 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3745 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3563 */ 3746 */
3564void 3747void
3565rxvt_term::process_dcs_seq () 3748rxvt_term::process_dcs_seq ()
3566{ 3749{
3567 unsigned char *s; 3750 char *s;
3568 unicode_t eh; 3751 unicode_t eh;
3569 3752
3570 /* 3753 /*
3571 * Not handled yet 3754 * Not handled yet
3572 */ 3755 */
… …
3591 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3774 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3592 arg = arg * 10 + (ch - '0'); 3775 arg = arg * 10 + (ch - '0');
3593 3776
3594 if (ch == ';') 3777 if (ch == ';')
3595 { 3778 {
3596 unsigned char *s = get_to_st (eh); 3779 char *s = get_to_st (eh);
3597 3780
3598 if (s) 3781 if (s)
3599 { 3782 {
3600 process_xterm_seq (arg, (char *)s, eh); 3783 process_xterm_seq (arg, s, eh);
3601 free (s); 3784 free (s);
3602 } 3785 }
3603 } 3786 }
3604} 3787}
3605 3788
3606void 3789void
3607rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3790rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3608{ 3791{
3609 if (str[0] == '?' && !str[1]) 3792 if (str[0] == '?' && !str[1])
3610 { 3793 {
3611 unsigned short r, g, b; 3794 unsigned short r, g, b;
3612 pix_colors_focused[color].get (display, r, g, b); 3795 pix_colors_focused[color].get (display, r, g, b);
… …
3616 set_window_color (color, str); 3799 set_window_color (color, str);
3617} 3800}
3618 3801
3619/* 3802/*
3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3803 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3621 * 0 = change iconName/title
3622 * 1 = change iconName
3623 * 2 = change title
3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
3627 * 12 = change text color
3628 * 13 = change mouse foreground color
3629 * 17 = change highlight character colour
3630 * 18 = change bold character color
3631 * 19 = change underlined character color
3632 * 46 = change logfile (not implemented)
3633 * 50 = change font
3634 *
3635 * rxvt extensions:
3636 * 20 = bg pixmap
3637 * 39 = change default fg color
3638 * 49 = change default bg color
3639 * 55 = dump scrollback buffer and all of screen
3640 * 701 = change locale
3641 * 702 = find font
3642 * 703 = menu
3643 */ 3804 */
3644void 3805void
3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3806rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3646{ 3807{
3647 int changed = 0; 3808 int changed = 0;
3648 int color; 3809 int color;
3649 char *buf, *name; 3810 char *buf, *name;
3650 bool query = str[0] == '?' && !str[1]; 3811 bool query = str[0] == '?' && !str[1];
… …
3673 unsigned long bytes_after; 3834 unsigned long bytes_after;
3674 unsigned char *value = 0; 3835 unsigned char *value = 0;
3675 const char *str = ""; 3836 const char *str = "";
3676 3837
3677 if (prop 3838 if (prop
3678 && XGetWindowProperty (disp, TermWin.parent[0], 3839 && XGetWindowProperty (disp, parent[0],
3679 prop, 0, 1<<16, 0, AnyPropertyType, 3840 prop, 0, 1<<16, 0, AnyPropertyType,
3680 &actual_type, &actual_format, 3841 &actual_type, &actual_format,
3681 &nitems, &bytes_after, &value) == Success 3842 &nitems, &bytes_after, &value) == Success
3682 && actual_type != None 3843 && actual_type != None
3683 && actual_format == 8) 3844 && actual_format == 8)
… …
3695 { 3856 {
3696 *eq = 0; 3857 *eq = 0;
3697 set_utf8_property (display->atom (str), eq + 1); 3858 set_utf8_property (display->atom (str), eq + 1);
3698 } 3859 }
3699 else 3860 else
3700 XDeleteProperty (disp, TermWin.parent[0], 3861 XDeleteProperty (disp, parent[0],
3701 display->atom (str)); 3862 display->atom (str));
3702 } 3863 }
3703 break; 3864 break;
3704 3865
3705 case XTerm_Color: 3866 case XTerm_Color:
… …
3746 break; 3907 break;
3747#ifndef NO_BOLD_UNDERLINE_REVERSE 3908#ifndef NO_BOLD_UNDERLINE_REVERSE
3748 case XTerm_Color_BD: 3909 case XTerm_Color_BD:
3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break; 3911 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3754 case XTerm_Color_UL: 3912 case XTerm_Color_UL:
3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756 break; 3914 break;
3757 case XTerm_Color_RV: 3915 case XTerm_Color_RV:
3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break; 3917 break;
3918 case URxvt_Color_IT:
3919 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3920 break;
3760#endif 3921#endif
3761#if TRANSPARENT && TINTING 3922#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint: 3923 case URxvt_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3924 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764 check_our_parents (); 3925 check_our_parents ();
3765 if (am_transparent) 3926 if (am_transparent)
3766 want_full_refresh = want_refresh = 1; 3927 want_full_refresh = want_refresh = 1;
3767 break; 3928 break;
3768#endif 3929#endif
… …
3802 3963
3803 case XTerm_logfile: 3964 case XTerm_logfile:
3804 // TODO, when secure mode? 3965 // TODO, when secure mode?
3805 break; 3966 break;
3806 3967
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972 break;
3973#endif
3974#if 0
3975 case XTerm_dumpscreen: /* no error notices */
3976 {
3977 int fd;
3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979 {
3980 scr_dump (fd);
3981 close (fd);
3982 }
3983 }
3984 break;
3985#endif
3807 case XTerm_font: 3986 case XTerm_font:
3808 op = URxvt_font; 3987 op = URxvt_font;
3809 case URxvt_font: 3988 case URxvt_font:
3810#if ENABLE_STYLES 3989#if ENABLE_STYLES
3811 case URxvt_boldFont: 3990 case URxvt_boldFont:
3812 case URxvt_italicFont: 3991 case URxvt_italicFont:
3813 case URxvt_boldItalicFont: 3992 case URxvt_boldItalicFont:
3814#endif 3993#endif
3815 if (query) 3994 if (query)
3816 tt_printf ("\33]%d;%-.250s%c", saveop, 3995 tt_printf ("\33]%d;%-.250s%c", saveop,
3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3996 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3997 ? fontset[op - URxvt_font]->fontdesc : "",
3819 resp); 3998 resp);
3820 else 3999 else
3821 { 4000 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4001 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823 4002
… …
3826 set_fonts (); 4005 set_fonts ();
3827 } 4006 }
3828 break; 4007 break;
3829 4008
3830#if ENABLE_FRILLS 4009#if ENABLE_FRILLS
3831 case XTerm_locale: 4010 case URxvt_locale:
3832 if (query) 4011 if (query)
3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4012 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3834 else 4013 else
3835 { 4014 {
3836 set_locale (str); 4015 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8); 4016 pty.set_utf8_mode (enc_utf8);
3838# ifdef USE_XIM
3839 im_cb (); 4017 init_xlocale ();
3840# endif
3841 } 4018 }
3842 break; 4019 break;
3843#endif
3844 4020
3845#ifdef MENUBAR 4021 case URxvt_view_up:
3846 case XTerm_Menu: 4022 case URxvt_view_down:
3847 if (options & Opt_insecure) 4023 {
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4024 int lines = atoi (str);
4025
4026 if (lines)
4027 scr_page (op == URxvt_view_up ? UP : DN, lines);
4028 else
4029 scr_erase_savelines ();
4030 }
4031
3849 break; 4032 break;
3850#endif 4033#endif
3851#if 0 4034
3852 case XTerm_dumpscreen: /* no error notices */ 4035#if ENABLE_PERL
3853 { 4036 case URxvt_perl:
3854 int fd; 4037 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4038 ; // no responses yet
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break; 4039 break;
3862#endif 4040#endif
3863 } 4041 }
3864} 4042}
3865/*----------------------------------------------------------------------*/ 4043/*----------------------------------------------------------------------*/
… …
3974 } 4152 }
3975 4153
3976 /* extra handling for values with state unkept */ 4154 /* extra handling for values with state unkept */
3977 switch (arg[i]) 4155 switch (arg[i])
3978 { 4156 {
4157#if ENABLE_STYLES
4158 case 1021:
4159 set_option (Opt_intensityStyles, mode);
4160
4161 scr_touch (true);
4162 break;
4163#endif
3979 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
3980 case 1049: 4165 case 1049:
3981 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
3982 if (mode == 0) 4167 if (mode == 0)
3983 scr_cursor (RESTORE); 4168 scr_cursor (RESTORE);
3984 else if (mode == 1) 4169 else if (mode == 1)
3985 scr_cursor (SAVE); 4170 scr_cursor (SAVE);
3986 break; 4171 break;
… …
3998 */ 4183 */
3999 PrivMode (1, PrivMode_vt52); 4184 PrivMode (1, PrivMode_vt52);
4000 break; 4185 break;
4001 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
4002 if (priv_modes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
4004 break; 4189 break;
4005 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
4006 if (state)
4007 options &= ~Opt_jumpScroll;
4008 else
4009 options |= Opt_jumpScroll; 4191 set_option (Opt_jumpScroll, !state);
4010 break; 4192 break;
4011 case 5: /* reverse video */ 4193 case 5: /* reverse video */
4012 scr_rvideo_mode (state); 4194 scr_rvideo_mode (state);
4013 break; 4195 break;
4014 case 6: /* relative/absolute origins */ 4196 case 6: /* relative/absolute origins */
… …
4055#if 0 4237#if 0
4056 case 1001: 4238 case 1001:
4057 break; /* X11 mouse highlighting */ 4239 break; /* X11 mouse highlighting */
4058#endif 4240#endif
4059 case 1010: /* scroll to bottom on TTY output inhibit */ 4241 case 1010: /* scroll to bottom on TTY output inhibit */
4060 if (state)
4061 options &= ~Opt_scrollTtyOutput;
4062 else
4063 options |= Opt_scrollTtyOutput; 4242 set_option (Opt_scrollTtyOutput, !state);
4064 break; 4243 break;
4065 case 1011: /* scroll to bottom on key press */ 4244 case 1011: /* scroll to bottom on key press */
4066 if (state)
4067 options |= Opt_scrollTtyKeypress; 4245 set_option (Opt_scrollTtyKeypress, state);
4068 else
4069 options &= ~Opt_scrollTtyKeypress;
4070 break; 4246 break;
4071 case 1047: /* secondary screen w/ clearing last */ 4247 case 1047: /* secondary screen w/ clearing last */
4072 if (options & Opt_secondaryScreen) 4248 if (OPTION (Opt_secondaryScreen))
4073 if (current_screen != PRIMARY) 4249 if (current_screen != PRIMARY)
4074 scr_erase_screen (2); 4250 scr_erase_screen (2);
4075 scr_change_screen (state); 4251 scr_change_screen (state);
4076 break; 4252 break;
4077 case 1049: /* secondary screen w/ clearing first */ 4253 case 1049: /* secondary screen w/ clearing first */
4078 scr_change_screen (state); 4254 scr_change_screen (state);
4079 if (options & Opt_secondaryScreen) 4255 if (OPTION (Opt_secondaryScreen))
4080 if (current_screen != PRIMARY) 4256 if (current_screen != PRIMARY)
4081 scr_erase_screen (2); 4257 scr_erase_screen (2);
4082 break; 4258 break;
4083 default: 4259 default:
4084 break; 4260 break;
… …
4212 scr_color (Color_bg, Color_bg); 4388 scr_color (Color_bg, Color_bg);
4213 break; 4389 break;
4214 4390
4215 //case 50: // not variable spacing 4391 //case 50: // not variable spacing
4216 4392
4217#ifndef NO_BRIGHTCOLOR 4393#if ENABLE_FRILLS
4218 case 90: 4394 case 90:
4219 case 91: /* set bright fg color */ 4395 case 91: /* set bright fg color */
4220 case 92: 4396 case 92:
4221 case 93: 4397 case 93:
4222 case 94: 4398 case 94:
… …
4234 case 106: 4410 case 106:
4235 case 107: 4411 case 107:
4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4412 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4237 break; 4413 break;
4238#endif 4414#endif
4239
4240 } 4415 }
4241 } 4416 }
4242} 4417}
4243/*}}} */ 4418/*}}} */
4244 4419
… …
4268 */ 4443 */
4269void 4444void
4270rxvt_term::tt_printf (const char *fmt,...) 4445rxvt_term::tt_printf (const char *fmt,...)
4271{ 4446{
4272 va_list arg_ptr; 4447 va_list arg_ptr;
4273 unsigned char buf[256]; 4448 char buf[256];
4274 4449
4275 va_start (arg_ptr, fmt); 4450 va_start (arg_ptr, fmt);
4276 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4451 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4277 va_end (arg_ptr); 4452 va_end (arg_ptr);
4278 tt_write (buf, strlen (buf)); 4453 tt_write (buf, strlen (buf));
… …
4283 * or generated by us in response to a query ESC sequence. 4458 * or generated by us in response to a query ESC sequence.
4284 */ 4459 */
4285const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4286 4461
4287void 4462void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4463rxvt_term::tt_write (const char *data, unsigned int len)
4289{ 4464{
4465 if (pty.pty < 0)
4466 return;
4467
4290 if (v_buflen == 0) 4468 if (v_buflen == 0)
4291 { 4469 {
4292 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4293 4471
4294 if ((unsigned int)written == len) 4472 if ((unsigned int)written == len)
… …
4296 4474
4297 data += written; 4475 data += written;
4298 len -= written; 4476 len -= written;
4299 } 4477 }
4300 4478
4301 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4302 4480
4303 memcpy (v_buffer + v_buflen, data, len); 4481 memcpy (v_buffer + v_buflen, data, len);
4304 v_buflen += len; 4482 v_buflen += len;
4305 4483
4306 pty_ev.set (EVENT_READ | EVENT_WRITE); 4484 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4325 } 4503 }
4326 4504
4327 memmove (v_buffer, v_buffer + written, v_buflen); 4505 memmove (v_buffer, v_buffer + written, v_buflen);
4328 } 4506 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this... 4508 pty_ev.set (EVENT_READ);
4331 destroy ();
4332} 4509}
4333 4510
4334/*----------------------- end-of-file (C source) -----------------------*/ 4511/*----------------------- end-of-file (C source) -----------------------*/
4335 4512

Diff Legend

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