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.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.235 by root, Wed Jan 4 20:43:37 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 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
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <signal.h> 63#include <csignal>
55 64
56/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
57 66
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 68
… …
114 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 125 XK_Print, 0x2399,
117 126
118 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,
119 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
120 0, 137 0,
121}; 138};
122 139
123void 140void
124rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
125{ 142{
126 x = Pixel2Col (x); 143 x = Pixel2Col (x);
127 y = Pixel2Row (y); 144 y = Pixel2Row (y);
128 145
129 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 148 return;
132 149
133 for (;;) 150 for (;;)
134 { 151 {
135 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];
136 155
137 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
138 { 157 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
142 break; 160 break;
143 } 161 }
144 162
145 x--; 163 x--;
146 } 164 }
147
148} 165}
149#endif
150 166
151#if ENABLE_OVERLAY
152void 167void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 169{
155 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 173 int len;
159 174
175 fname = rxvt_utf8towcs (f->name);
176
160#if ENABLE_COMBINING 177# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
162 { 179 {
163 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
166 } 183 }
167 else 184 else
168#endif 185# endif
169 { 186 {
170 ch2 = ch; 187 ch2 = ch;
171 188
172 alloc = 0; 189 alloc = 0;
173 chr = &ch2; 190 chr = &ch2;
174 len = 1; 191 len = 1;
175 } 192 }
176 193
177 int width = strlen (f->name); 194 char attr[80]; // plenty
178 195
179 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);
180 218
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 220
183 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
184 { 222 {
… …
187 ch = *chr++; 225 ch = *chr++;
188 226
189 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
192#if !UNICODE3 230# if !UNICODE3
193 if (ch >= 0x10000) 231 if (ch >= 0x10000)
194 ch = 0xfffd; 232 ch = 0xfffd;
195#endif 233# endif
196 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
198 } 236 }
199 237
238 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
201 240
241 free (fname);
242
202#if ENABLE_COMBINING 243# if ENABLE_COMBINING
203 if (alloc) 244 if (alloc)
204 delete [] alloc; 245 delete [] alloc;
205#endif 246# endif
206} 247}
207#endif 248#endif
208 249
209void 250void
210rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 268 mb[0] = ch[0];
228 len = 1; 269 len = 1;
229 } 270 }
230 271
231 if (len > 0) 272 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
233 else 274 else
234 scr_bell (); 275 scr_bell ();
235 } 276 }
236 277
237 iso14755buf = 0; 278 iso14755buf = 0;
… …
265 KeySym keysym; 306 KeySym keysym;
266#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
268#endif 309#endif
269 int valid_keysym; 310 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
271 312
272 /* 313 /*
273 * 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
274 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
275 * 316 *
276 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
277 */ 318 */
278 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
281 322
282 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
283 { 324 {
284 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 334 Status status_return;
294 335
295#if 0 336#if 0
296#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
297 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
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
300 else 341 else
301#endif 342#endif
302#endif 343#endif
303 { 344 {
… …
305 346
306 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
310 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
313 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 357 SET_LOCALE (locale);
315 358
316 if (status_return == XLookupChars 359 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
339 } 382 }
340 else 383 else
341#endif 384#endif
342 { 385 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
345 } 388 }
346 389
347 if (valid_keysym) 390 if (valid_keysym)
348 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
349 if (TermWin.saveLines) 397 if (saveLines)
350 { 398 {
351#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 400 if (!ctrl && !meta)
353#else 401#else
354 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
355#endif 403#endif
356 { 404 {
357 int lnsppg; 405 int lnsppg;
358 406
359#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 409#else
362 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
363#endif 411#endif
364 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
365 { 413 {
366 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
367 return; 415 return;
… …
487 } 535 }
488#endif 536#endif
489 537
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 539 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 540 {
518 newlen = 1; 541 newlen = 1;
519 switch (keysym) 542 switch (keysym)
520 { 543 {
521#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
529 else 552 else
530 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
531 break; 554 break;
532#endif 555#endif
533#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
534 case XK_Delete: 567 case XK_Delete:
535 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
536 break; 569 break;
537#endif 570#endif
538 case XK_Tab: 571 case XK_Tab:
… …
641#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
642 case XK_KP_Begin: 675 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
644 break; 677 break;
645 678
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 679#endif
654 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
689 break; 715 break;
690 716
691 case XK_Find: 717 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
693 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
694 case XK_Insert: 731 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
696 break; 733 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 735 case DXK_Remove:
… …
788#undef FKEY 825#undef FKEY
789 default: 826 default:
790 newlen = 0; 827 newlen = 0;
791 break; 828 break;
792 } 829 }
830
793 if (newlen) 831 if (newlen)
794 len = strlen (kbuf); 832 len = strlen (kbuf);
795 } 833 }
796 834
797 /* 835 /*
… …
806 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
807 { 845 {
808 len = 1; 846 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
811 else 854 else
812 { 855 {
813#ifdef META8_OPTION 856#ifdef META8_OPTION
814 /* set 8-bit on */ 857 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
816 { 859 {
817 unsigned char *ch; 860 char *ch;
818 861
819 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 863 *ch |= 0x80;
821 864
822 meta = 0; 865 meta = 0;
… …
827 } 870 }
828 871
829 if (len <= 0) 872 if (len <= 0)
830 return; /* not mapped */ 873 return; /* not mapped */
831 874
832 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 876 if (view_start)
834 { 877 {
835 TermWin.view_start = 0; 878 view_start = 0;
836 want_refresh = 1; 879 want_refresh = 1;
837 } 880 }
838 881
839 /* 882 /*
840 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 898#ifdef META8_OPTION
856 && meta_char == C0_ESC 899 && meta_char == C0_ESC
857#endif 900#endif
858 ) 901 )
859 { 902 {
860 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
861 tt_write (&ch, 1); 904 tt_write (&ch, 1);
862 } 905 }
863 906
864#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
873#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
875} 918}
876/*}}} */ 919/*}}} */
877 920
878#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
881unsigned int 924unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 926{
884 unsigned int n, s; 927 unsigned int n, s;
885 928
886 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 949
907 cmd_parse (); 950 cmd_parse ();
908 951
909 return 0; 952 return 0;
910} 953}
911#endif /* MENUBAR_MAX */ 954#endif
912 955
913void 956void
914rxvt_term::flush () 957rxvt_term::flush ()
915{ 958{
916 flush_ev.stop (); 959 flush_ev.stop ();
… …
943 SET_LOCALE (locale); 986 SET_LOCALE (locale);
944 987
945 display->flush (); 988 display->flush ();
946 989
947 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 992}
950 993
951void 994void
952rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
953{ 996{
… …
1017{ 1060{
1018 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1064 {
1065 if (view_start == nsaved ||
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0;
1068
1022 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1070 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1072 }
1026} 1073}
1027#endif 1074#endif
1028 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1029bool 1094bool
1030rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1031{ 1096{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1098
1034 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1035 { 1100 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1102 n = 0;
1038 } 1103 }
1039 1104
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1043 1108
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1045 1110
1046 if (n > 0) 1111 if (r > 0)
1047 { 1112 {
1048 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1049 return true; 1114 return true;
1050 } 1115 }
1051 else if (n < 0 && errno != EAGAIN) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 {
1118#if HAVE_SCHED_YIELD
1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1121#endif
1122 }
1123 else
1124 {
1125 pty_ev.stop ();
1126
1127 if (!OPTION (Opt_hold))
1052 destroy (); 1128 destroy ();
1129 }
1053 1130
1054 return false; 1131 return false;
1055} 1132}
1056 1133
1057void 1134void
… …
1071} 1148}
1072 1149
1073void 1150void
1074rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1075{ 1152{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
1077 recolour_cursor (); 1154 recolour_cursor ();
1078 1155
1079#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1157 hidden_pointer = 0;
1081 1158
1082 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif 1161#endif
1085} 1162}
1086 1163
1087#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1088void 1165void
1089rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1090{ 1167{
1091 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1092 return; 1169 return;
1093 1170
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1095 XFlush (display->display); 1172 XFlush (display->display);
1096 1173
1097 hidden_pointer = 1; 1174 hidden_pointer = 1;
1098} 1175}
1099 1176
… …
1188 1265
1189/*{{{ process an X event */ 1266/*{{{ process an X event */
1190void 1267void
1191rxvt_term::x_cb (XEvent &ev) 1268rxvt_term::x_cb (XEvent &ev)
1192{ 1269{
1270 dDisp;
1271
1193 SET_R (this); 1272 SET_R (this);
1194 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1195 1274
1196#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1198 { 1277 {
1199 if (hidden_cursor) 1278 if (hidden_cursor)
1200 { 1279 {
1201 hidden_cursor = 0; 1280 hidden_cursor = 0;
1202 want_refresh = 1; 1281 want_refresh = 1;
… …
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1206 } 1285 }
1207#endif 1286#endif
1208 1287
1209#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1211 { 1290 {
1212 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1213 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1214 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1215 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1313 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1314 break; 1393 break;
1315 1394
1316 case ClientMessage: 1395 case ClientMessage:
1317 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 {
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319 destroy (); 1400 destroy ();
1401#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev);
1406#endif
1407 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1320#ifdef OFFIX_DND 1417#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */ 1418 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile 1420 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir 1421 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink)) 1422 || ev.xclient.data.l[0] == DndLink))
1326 { 1423 {
1327 /* Get Dnd data */ 1424 /* Get Dnd data */
1328 Atom ActualType; 1425 Atom ActualType;
1329 int ActualFormat; 1426 int ActualFormat;
1330 unsigned char *data; 1427 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1428 unsigned long Size, RemainingBytes;
1332 1429
1333 XGetWindowProperty (display->display, display->root, 1430 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1431 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1432 0L, 1000000L,
1336 False, AnyPropertyType, 1433 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1434 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1435 &Size, &RemainingBytes,
1339 &data); 1436 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1437 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1438 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1441 }
1345#endif /* OFFIX_DND */ 1442#endif /* OFFIX_DND */
1346 break; 1443 break;
1347 1444
1348 case MappingNotify: 1445 case MappingNotify:
… …
1373 break; 1470 break;
1374 } 1471 }
1375 break; 1472 break;
1376 1473
1377 case FocusIn: 1474 case FocusIn:
1378 if (!TermWin.focus) 1475 focus_in ();
1476 break;
1477
1478 case FocusOut:
1479 focus_out ();
1480 break;
1481
1482 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0])
1379 { 1484 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ;
1447 1487
1448 if (szHint.width != width || szHint.height != height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1489 {
1450 seen_resize = 1; 1490 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1492 }
1453 1493
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1456 check_our_parents (); 1496 check_our_parents ();
1457#endif 1497#endif
1458 } 1498 }
1459 break; 1499 break;
1460 1500
… …
1477 case SelectionRequest: 1517 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1479 break; 1519 break;
1480 1520
1481 case UnmapNotify: 1521 case UnmapNotify:
1482 TermWin.mapped = 0; 1522 mapped = 0;
1483#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1485#endif 1525#endif
1486 break; 1526 break;
1487 1527
1488 case MapNotify: 1528 case MapNotify:
1489 TermWin.mapped = 1; 1529 mapped = 1;
1490#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif 1532#endif
1493 break; 1533 break;
1494 1534
… …
1498 break; 1538 break;
1499#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1500 1540
1501 case GraphicsExpose: 1541 case GraphicsExpose:
1502 case Expose: 1542 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1504 { 1544 {
1505 do 1545 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1549
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1551
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1515 1555
1516 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1517 } 1557 }
1518 else 1558 else
1519 { 1559 {
1520 XEvent unused_event; 1560 XEvent unused_event;
1521 1561
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1563 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1565 ;
1526 1566
1527 if (isScrollbarWindow (ev.xany.window)) 1567 if (isScrollbarWindow (ev.xany.window))
1528 { 1568 {
1529 scrollBar.setIdle (); 1569 scrollBar.setIdle ();
… …
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose (); 1574 menubar_expose ();
1535#endif 1575#endif
1536 1576
1537#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1540#endif 1580#endif
1541 } 1581 }
1542 break; 1582 break;
1543 1583
1544 case MotionNotify: 1584 case MotionNotify:
… …
1554 } 1594 }
1555#endif 1595#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1597 break;
1558 1598
1559 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1560 { 1600 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1602 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1604 ;
1565 1605
1566 XQueryPointer (display->display, TermWin.vt, 1606 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1609 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1610 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
… …
1583#endif 1623#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1626
1587#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1630 {
1591 int dist; 1631 int dist;
1592 1632
1593 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1645
1606 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1608 { 1648 {
1609 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1611 } 1651 }
1612 else 1652 else
1613 { 1653 {
1614 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1655 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1656 }
1617 1657
1618 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1660 + 1;
1621 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1623 } 1663 }
1624 else 1664 else
1625 { 1665 {
1626 /* we are within the text window, so we 1666 /* we are within the text window, so we
… …
1635#endif 1675#endif
1636 } 1676 }
1637 } 1677 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1679 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1680 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1681 MotionNotify, &ev))
1642 ; 1682 ;
1643 1683
1644 XQueryPointer (display->display, scrollBar.win, 1684 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1687 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1688 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1654 } 1694 }
1655 break; 1695 break;
1656 } 1696 }
1657} 1697}
1658 1698
1699void
1700rxvt_term::focus_in ()
1701{
1702 if (!focus)
1703 {
1704 focus = 1;
1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1709#if USE_XIM
1710 if (Input_Context != NULL)
1711 {
1712 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context);
1714 }
1715#endif
1716#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719#endif
1720#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade])
1722 {
1723 pix_colors = pix_colors_focused;
1724 scr_recolour ();
1725 }
1726#endif
1727 }
1728}
1729
1730void
1731rxvt_term::focus_out ()
1732{
1733 if (focus)
1734 {
1735 focus = 0;
1736 want_refresh = 1;
1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1743 iso14755buf = 0;
1744# if ENABLE_OVERLAY
1745 scr_overlay_off ();
1746# endif
1747 }
1748#endif
1749#if USE_XIM
1750 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context);
1752#endif
1753#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink))
1755 cursor_blink_ev.stop ();
1756 hidden_cursor = 0;
1757#endif
1758#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade])
1760 {
1761 pix_colors = pix_colors_unfocused;
1762 scr_recolour ();
1763 }
1764#endif
1765 }
1766}
1767
1659#if TRANSPARENT 1768#if TRANSPARENT
1660void 1769void
1661rxvt_term::rootwin_cb (XEvent &ev) 1770rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1771{
1663 SET_R (this); 1772 SET_R (this);
… …
1668 case PropertyNotify: 1777 case PropertyNotify:
1669 /* 1778 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1672 */ 1781 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1782 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1784 return;
1678 1785
1679 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1680 case ReparentNotify: 1787 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1682 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1683 break; 1790 break;
1684 } 1791 }
1685} 1792}
1686#endif 1793#endif
… …
1689rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1690{ 1797{
1691 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1692 1799
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1694 if (!bypass_keystate) 1802 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1804
1697 /* 1805 /*
1698 * VT window processing of button press 1806 * VT window processing of button press
1699 */ 1807 */
1700 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1701 { 1809 {
1702#if ISO_14755 1810#if ISO_14755
1703 // 5.4 1811 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1813 {
… …
1747 else 1855 else
1748 { 1856 {
1749 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1750 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1751 1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1752 switch (ev.button) 1861 switch (ev.button)
1753 { 1862 {
1754 case Button1: 1863 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1868#else
1760 selection.rect = false; 1869 selection.rect = false;
1761#endif 1870#endif
1762 1871
1763 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1765 { 1874 {
1766 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1768 else 1877 else
1769 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1770 } 1879 }
1771 else 1880 else
1772 { 1881 {
1773 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1774 MEvent.clicks++; 1883 MEvent.clicks++;
1775 else 1884 else
1776 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1777 1886
1778 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1779 } 1888 }
1780 1889
1781 MEvent.button = Button1; 1890 MEvent.button = Button1;
1782 break; 1891 break;
1783 1892
1784 case Button3: 1893 case Button3:
1785 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1786 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1787 else 1896 else
1788 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1789 1898
1790 MEvent.button = Button3; 1899 MEvent.button = Button3;
1791 break; 1900 break;
1792 } 1901 }
1793 } 1902 }
1794 1903
1795 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1796 return; 1905 return;
1797 } 1906 }
1798 1907
… …
1910 case Button3: 2019 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1912 { 2021 {
1913 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1916# else 2025# else
1917 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1918# endif 2027# endif
1919 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1922# else 2031# else
1923 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1924# endif 2033# endif
1925 else 2034 else
1926 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1927 } 2036 }
1928 else 2037 else
1929 { 2038 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2040 (nrow
1932 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2042 / scrollbar_size ()));
1934 } 2043 }
1935 2044
1936 break; 2045 break;
… …
1968#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
1971#endif 2080#endif
1972 2081
1973 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
1974 { 2083 {
1975#if ISO_14755 2084#if ISO_14755
1976 // 5.4 2085 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2087 return;
… …
2028 2137
2029 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2030 2139
2031 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2032 i = 1; 2141 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2035 else 2144 else
2036 i = 5; 2145 i = 5;
2037 2146
2038# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2040 { 2149 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2044 2153
2045 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2156
2048 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2201 int i;
2093 2202
2094 Visual* visual = display->visual; 2203 Visual *visual = display->visual;
2095 2204
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2206
2098 /* for convenience */ 2207 /* for convenience */
2099 mask_r = visual->red_mask; 2208 mask_r = visual->red_mask;
… …
2320 Atom atype; 2429 Atom atype;
2321 unsigned char *prop = NULL; 2430 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2431 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2432 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2325 2435
2326 pchanged = 0; 2436 pchanged = 0;
2327 2437
2328 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2330 2440
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2333 2443
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2335 2445
2336 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2337 { 2447 {
2338 if (am_transparent) 2448 if (am_transparent)
2339 { 2449 {
2340 pchanged = 1; 2450 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2343 } 2453 }
2344 2454
2345 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2346 } 2456 }
2347 2457
2348 /* Get all X ops out of the queue so that our information is up-to-date. */ 2458 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False); 2459 XSync (disp, False);
2350 2460
2351 /* 2461 /*
2352 * Make the frame window set by the window manager have 2462 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2463 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2464 * windows for each client, so we have to take care about that.
2355 */ 2465 */
2356 i = (xa[XA_XROOTPMAPID] 2466 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2360 2470
2361 if (!i || prop == NULL) 2471 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2472 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2475 &nitems, &bytes_after, &prop) == Success);
2366 2476
2367 if (!i || prop == NULL 2477 if (!i || prop == NULL
2368#if TINTING 2478#if TINTING
… …
2387 Window cr; 2497 Window cr;
2388 XImage *image; 2498 XImage *image;
2389 GC gc; 2499 GC gc;
2390 XGCValues gcvalue; 2500 XGCValues gcvalue;
2391 2501
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2506 nx = ny = 0;
2397 2507
… …
2407 nh += sy; 2517 nh += sy;
2408 ny = -sy; 2518 ny = -sy;
2409 sy = 0; 2519 sy = 0;
2410 } 2520 }
2411 2521
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2414 2524
2415 XSync (display->display, False); 2525 XSync (disp, False);
2416 allowedxerror = -1; 2526 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2528
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2530 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2531 allowedxerror = 0;
2422 2532
2423 if (image == NULL) 2533 if (image == NULL)
2424 { 2534 {
2425 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2426 { 2536 {
2427 pchanged = 1; 2537 pchanged = 1;
2428 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2429 { 2539 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2431 TermWin.pixmap = None; 2541 pixmap = None;
2432 } 2542 }
2433 } 2543 }
2434 2544
2435 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2436 } 2546 }
2437 else 2547 else
2438 { 2548 {
2439 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2441 2551
2442#if TINTING 2552#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2554 {
2445 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
… …
2449 2559
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2561 }
2452#endif 2562#endif
2453 2563
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2455 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2569 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2570 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2463 2573
2464 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2575 pchanged = 1;
2466 2576
2467 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2468 } 2578 }
2469 } 2579 }
2470 2580
2471 if (am_pixmap_trans) 2581 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2473 else 2583 else
2474 { 2584 {
2475 unsigned int n; 2585 unsigned int n;
2476 /* 2586 /*
2477 * InheritPixmap transparency 2587 * InheritPixmap transparency
2478 */ 2588 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2480 { 2590 {
2481 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2484 XFree (list); 2594 XFree (list);
2485 2595
2486 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2487 { 2597 {
2488 if (oldp != None) 2598 if (oldp != None)
2489 pchanged = 1; 2599 pchanged = 1;
2490 2600
2491 break; 2601 break;
2492 } 2602 }
2493 2603
2494 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2495 pchanged = 1; 2605 pchanged = 1;
2496 } 2606 }
2497 2607
2498 n = 0; 2608 n = 0;
2499 2609
2500 if (pchanged) 2610 if (pchanged)
2501 { 2611 {
2502 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2503 { 2613 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2616 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2508 break; 2618 break;
2509 } 2619 }
2510 } 2620 }
2511 } 2621 }
2512 2622
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2514 { 2624 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2627 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2519 } 2629 }
2520 else 2630 else
2521 { 2631 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2635 sleep (1);
2526#endif 2636#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2528 { 2638 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2531 } 2641 }
2532 2642
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2534 am_transparent = 1; 2644 am_transparent = 1;
2535 } 2645 }
2536 2646
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2648 parent[i] = None;
2539 } 2649 }
2540 2650
2541 if (scrollBar.win) 2651 if (scrollBar.win)
2542 { 2652 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2654 scrollBar.setIdle ();
2545 scrollbar_show (0); 2655 scrollbar_show (0);
2546 } 2656 }
2547 2657
2548 if (am_transparent) 2658 if (am_transparent)
… …
2561bool 2671bool
2562rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2563{ 2673{
2564 bool flag = false; 2674 bool flag = false;
2565 unicode_t ch = NOCHAR; 2675 unicode_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2567 2677
2568 for (;;) 2678 for (;;)
2569 { 2679 {
2570 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2571 { 2681 {
… …
2586 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2698 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2699 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2700 // resized.
2591 if (seen_resize) 2701 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2593 } 2703 }
2594 2704
2595 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2707 bool refreshnow = false;
2598 int nlines = 0; 2708 int nlines = 0;
2599 unicode_t *str = buf; 2709 unicode_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2600 2711
2601 for (;;) 2712 for (;;)
2602 { 2713 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break; 2715 break;
2605 2716
2606 *str++ = ch; 2717 *str++ = ch;
2607 2718
2608 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2609 { 2720 {
2721 if (ch == C0_LF)
2610 nlines++; 2722 nlines++;
2723
2611 refresh_count++; 2724 refresh_count++;
2612 2725
2613 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2615 { 2728 {
2616 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2617 ch = NOCHAR; 2731 ch = NOCHAR;
2618 break; 2732 break;
2619 } 2733 }
2620 2734
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2623 { 2737 {
2624 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2625 nlines = 0; 2739 nlines = 0;
2626 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2627 } 2742 }
2628 }
2629 2743
2630 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2631 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2632 ch = NOCHAR; 2748 ch = NOCHAR;
2633 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2634 } 2755 }
2635 2756
2636 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2758 ch = next_char ();
2638 } 2759 }
… …
2645 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2646 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2768 */
2648 if (refreshnow) 2769 if (refreshnow)
2649 { 2770 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++; 2772 refresh_limit++;
2652 else 2773 else
2653 { 2774 {
2654 flag = true; 2775 flag = true;
2655 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2656 } 2778 }
2657 } 2779 }
2658 2780
2659 } 2781 }
2660 else 2782 else
… …
2691rxvt_term::next_char () 2813rxvt_term::next_char ()
2692{ 2814{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2815 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2816 {
2695 // assume 7-bit to be ascii ALWAYS 2817 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++; 2819 return *cmdbuf_ptr++;
2698 2820
2699 wchar_t wc; 2821 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2822 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701 2823
2702 if (len == (size_t)-2) 2824 if (len == (size_t)-2)
2703 { 2825 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2826 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2827 cmdbuf_ptr = cmdbuf_endp;
… …
2709 if (len == (size_t)-1) 2831 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2833
2712 // assume wchar == unicode 2834 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2835 cmdbuf_ptr += len;
2714 return wc; 2836 return wc & UNICODE_MASK;
2715 } 2837 }
2716 2838
2717 return NOCHAR; 2839 return NOCHAR;
2718} 2840}
2719 2841
… …
2844 case C0_ESC: 2966 case C0_ESC:
2845 process_escape_seq (); 2967 process_escape_seq ();
2846 break; 2968 break;
2847 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 2972 else
2852 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 2974 break;
2855 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2856 scr_bell (); 2976 scr_bell ();
2857 break; 2977 break;
2858 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
3046 process_dcs_seq (); 3166 process_dcs_seq ();
3047 break; 3167 break;
3048 3168
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
3054 3173
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3056 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 3176 process_csi_seq ();
… …
3182 { 3301 {
3183 switch (priv) 3302 switch (priv)
3184 { 3303 {
3185 case '>': 3304 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3307 break;
3189 case '?': 3308 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3311 break;
… …
3297 3416
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 3422 break;
3304 3423
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 3426 break;
3309 3427
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
3312 break; 3430 break;
… …
3319 break; 3437 break;
3320 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3321 scr_report_position (); 3439 scr_report_position ();
3322 break; 3440 break;
3323 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 3444 break;
3327 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 3447 break;
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3539rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3540{
3423 int x, y; 3541 int x, y;
3424 XWindowAttributes wattr; 3542 XWindowAttributes wattr;
3425 Window wdummy; 3543 Window wdummy;
3544 dDisp;
3426 3545
3427 if (nargs == 0) 3546 if (nargs == 0)
3428 return; 3547 return;
3429 3548
3430 switch (args[0]) 3549 switch (args[0])
3431 { 3550 {
3432 /* 3551 /*
3433 * commands 3552 * commands
3434 */ 3553 */
3435 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3437 break; 3556 break;
3438 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (disp, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3559 break;
3442 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3444 break; 3562 break;
3445 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3565 break;
3448 case 5: /* raise window */ 3566 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3450 break; 3568 break;
3451 case 6: /* lower window */ 3569 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3453 break; 3571 break;
3454 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3455 scr_touch (true); 3573 scr_touch (true);
3456 break; 3574 break;
3457 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3460 break; 3578 break;
3461 3579
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3581 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3467 break; 3585 break;
3468 3586
3469 3587
3470 /* 3588 /*
3471 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3472 */ 3590 */
3473 case 11: /* report window state */ 3591 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3594 break;
3477 case 13: /* report window position */ 3595 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3601 break;
3484 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3605 break;
3488 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3608 break;
3491 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3611 break;
3494 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3495 { 3613 {
3496 char *s; 3614 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3617 XFree (s);
3500 } 3618 }
3501 break; 3619 break;
3502 case 21: /* report window title */ 3620 case 21: /* report window title */
3503 { 3621 {
3504 char *s; 3622 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3625 XFree (s);
3508 } 3626 }
3509 break; 3627 break;
3510 } 3628 }
3511} 3629}
… …
3514/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3515/* 3633/*
3516 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3635 * ends_how is terminator used. returned input must be free()'d
3518 */ 3636 */
3519unsigned char * 3637char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3639{
3522 unicode_t ch; 3640 unicode_t ch;
3523 bool seen_esc = false; 3641 bool seen_esc = false;
3524 unsigned int n = 0; 3642 unsigned int n = 0;
… …
3543 else if (ch < 0x20) 3661 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
3545 3663
3546 seen_esc = false; 3664 seen_esc = false;
3547 3665
3548 if (n >= sizeof (string) - 1) 3666 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3667 // stop at some sane length
3550 return NULL; 3668 return NULL;
3551 3669
3552 if (ch == C0_SYN) 3670 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 (); 3671 string[n++] = cmd_get8 ();
… …
3557 3675
3558 string[n++] = '\0'; 3676 string[n++] = '\0';
3559 3677
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3679
3562 return (unsigned char *)rxvt_wcstombs (string); 3680 return rxvt_wcstombs (string);
3563} 3681}
3564 3682
3565/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3566/* 3684/*
3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3568 */ 3686 */
3569void 3687void
3570rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
3571{ 3689{
3572 unsigned char *s; 3690 char *s;
3573 unicode_t eh; 3691 unicode_t eh;
3574 3692
3575 /* 3693 /*
3576 * Not handled yet 3694 * Not handled yet
3577 */ 3695 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
3598 3716
3599 if (ch == ';') 3717 if (ch == ';')
3600 { 3718 {
3601 unsigned char *s = get_to_st (eh); 3719 char *s = get_to_st (eh);
3602 3720
3603 if (s) 3721 if (s)
3604 { 3722 {
3605 process_xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
3606 free (s); 3724 free (s);
3607 } 3725 }
3608 } 3726 }
3609} 3727}
3610 3728
3611void 3729void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3613{ 3731{
3614 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3615 { 3733 {
3616 unsigned short r, g, b; 3734 unsigned short r, g, b;
3617 pix_colors_focused[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
… …
3621 set_window_color (color, str); 3739 set_window_color (color, str);
3622} 3740}
3623 3741
3624/* 3742/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3744 */
3649void 3745void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3651{ 3747{
3652 int changed = 0; 3748 int changed = 0;
3653 int color; 3749 int color;
3654 char *buf, *name; 3750 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3752 int saveop = op;
3753 dDisp;
3657 3754
3658 assert (str != NULL); 3755 assert (str != NULL);
3659 switch (op) 3756 switch (op)
3660 { 3757 {
3661 case XTerm_name: 3758 case XTerm_name:
… …
3677 unsigned long bytes_after; 3774 unsigned long bytes_after;
3678 unsigned char *value = 0; 3775 unsigned char *value = 0;
3679 const char *str = ""; 3776 const char *str = "";
3680 3777
3681 if (prop 3778 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3783 && actual_type != None
3687 && actual_format == 8) 3784 && actual_format == 8)
… …
3699 { 3796 {
3700 *eq = 0; 3797 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3702 } 3799 }
3703 else 3800 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3705 display->atom (str)); 3802 display->atom (str));
3706 } 3803 }
3707 break; 3804 break;
3708 3805
3709 case XTerm_Color: 3806 case XTerm_Color:
… …
3750 break; 3847 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3848#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD: 3849 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break; 3851 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break; 3854 break;
3761 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break; 3857 break;
3858 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break;
3764#endif 3861#endif
3765#if TRANSPARENT && TINTING 3862#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3863 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3768 check_our_parents (); 3865 check_our_parents ();
3769 if (am_transparent) 3866 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3867 want_full_refresh = want_refresh = 1;
3771 break; 3868 break;
3772#endif 3869#endif
… …
3784 { 3881 {
3785 str++; 3882 str++;
3786#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3788#endif 3885#endif
3789
3790 } 3886 }
3887
3791 if (changed) 3888 if (changed)
3792 { 3889 {
3793#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3891 resize_pixmap ();
3795#endif 3892#endif
… …
3806 3903
3807 case XTerm_logfile: 3904 case XTerm_logfile:
3808 // TODO, when secure mode? 3905 // TODO, when secure mode?
3809 break; 3906 break;
3810 3907
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0
3915 case XTerm_dumpscreen: /* no error notices */
3916 {
3917 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 {
3920 scr_dump (fd);
3921 close (fd);
3922 }
3923 }
3924 break;
3925#endif
3811 case XTerm_font: 3926 case XTerm_font:
3812 op = URxvt_font; 3927 op = URxvt_font;
3813 case URxvt_font: 3928 case URxvt_font:
3814#if ENABLE_STYLES 3929#if ENABLE_STYLES
3815 case URxvt_boldFont: 3930 case URxvt_boldFont:
3816 case URxvt_italicFont: 3931 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3818#endif 3933#endif
3819 if (query) 3934 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3938 resp);
3824 else 3939 else
3825 { 3940 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3942
… …
3830 set_fonts (); 3945 set_fonts ();
3831 } 3946 }
3832 break; 3947 break;
3833 3948
3834#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3835 case XTerm_locale: 3950 case URxvt_locale:
3836 if (query) 3951 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3838 else 3953 else
3839 { 3954 {
3840 set_locale (str); 3955 set_locale (str);
3841# ifdef USE_XIM 3956 pty.set_utf8_mode (enc_utf8);
3842 im_cb (); 3957 init_xlocale ();
3843# endif
3844 } 3958 }
3845 break; 3959 break;
3846#endif
3847 3960
3848#ifdef MENUBAR 3961 case URxvt_view_up:
3849 case XTerm_Menu: 3962 case URxvt_view_down:
3850 if (options & Opt_insecure) 3963 {
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 scr_erase_savelines ();
3970 }
3971
3852 break; 3972 break;
3853#endif 3973#endif
3854#if 0 3974
3855 case XTerm_dumpscreen: /* no error notices */ 3975#if ENABLE_PERL
3856 { 3976 case URxvt_perl:
3857 int fd; 3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3978 ; // no responses yet
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 3979 break;
3865#endif 3980#endif
3866 } 3981 }
3867} 3982}
3868/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3977 } 4092 }
3978 4093
3979 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
3980 switch (arg[i]) 4095 switch (arg[i])
3981 { 4096 {
4097#if ENABLE_STYLES
4098 case 1021:
4099 if (mode)
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103
4104 scr_touch (true);
4105 break;
4106#endif
3982 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
3983 case 1049: 4108 case 1049:
3984 if (options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
3985 if (mode == 0) 4110 if (mode == 0)
3986 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
3987 else if (mode == 1) 4112 else if (mode == 1)
3988 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
3989 break; 4114 break;
… …
4001 */ 4126 */
4002 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
4003 break; 4128 break;
4004 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 4132 break;
4008 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4009 if (state) 4134 if (!state)
4010 options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
4011 else 4136 else
4012 options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
4013 break; 4138 break;
4014 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4016 break; 4141 break;
4017 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
4058#if 0 4183#if 0
4059 case 1001: 4184 case 1001:
4060 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
4061#endif 4186#endif
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state) 4188 if (!state)
4064 options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
4065 else 4190 else
4066 options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
4067 break; 4192 break;
4068 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
4069 if (state) 4194 if (state)
4070 options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
4071 else 4196 else
4072 options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
4073 break; 4198 break;
4074 case 1047: /* secondary screen w/ clearing last */ 4199 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4202 scr_erase_screen (2);
4078 scr_change_screen (state); 4203 scr_change_screen (state);
4079 break; 4204 break;
4080 case 1049: /* secondary screen w/ clearing first */ 4205 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state); 4206 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen) 4207 if (OPTION (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 4208 if (current_screen != PRIMARY)
4084 scr_erase_screen (2); 4209 scr_erase_screen (2);
4085 break; 4210 break;
4086 default: 4211 default:
4087 break; 4212 break;
… …
4215 scr_color (Color_bg, Color_bg); 4340 scr_color (Color_bg, Color_bg);
4216 break; 4341 break;
4217 4342
4218 //case 50: // not variable spacing 4343 //case 50: // not variable spacing
4219 4344
4220#ifndef NO_BRIGHTCOLOR 4345#if ENABLE_FRILLS
4221 case 90: 4346 case 90:
4222 case 91: /* set bright fg color */ 4347 case 91: /* set bright fg color */
4223 case 92: 4348 case 92:
4224 case 93: 4349 case 93:
4225 case 94: 4350 case 94:
… …
4237 case 106: 4362 case 106:
4238 case 107: 4363 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 4365 break;
4241#endif 4366#endif
4242
4243 } 4367 }
4244 } 4368 }
4245} 4369}
4246/*}}} */ 4370/*}}} */
4247 4371
… …
4271 */ 4395 */
4272void 4396void
4273rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
4274{ 4398{
4275 va_list arg_ptr; 4399 va_list arg_ptr;
4276 unsigned char buf[256]; 4400 char buf[256];
4277 4401
4278 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 4404 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 4405 tt_write (buf, strlen (buf));
… …
4286 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
4287 */ 4411 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289 4413
4290void 4414void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 4416{
4293 if (v_buflen == 0) 4417 if (v_buflen == 0)
4294 { 4418 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4296 4420
… …
4299 4423
4300 data += written; 4424 data += written;
4301 len -= written; 4425 len -= written;
4302 } 4426 }
4303 4427
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4305 4429
4306 memcpy (v_buffer + v_buflen, data, len); 4430 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len; 4431 v_buflen += len;
4308 4432
4309 pty_ev.set (EVENT_READ | EVENT_WRITE); 4433 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4328 } 4452 }
4329 4453
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4454 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4455 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4457 pty_ev.set (EVENT_READ);
4334 destroy ();
4335} 4458}
4336 4459
4337/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
4338 4461

Diff Legend

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