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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.249 by root, Sun Jan 8 01:02:15 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
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
… …
113 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 125 XK_Print, 0x2399,
116 126
117 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,
118 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
119 0, 137 0,
120}; 138};
121 139
122void 140void
123rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
124{ 142{
125 x = Pixel2Col (x); 143 x = Pixel2Col (x);
126 y = Pixel2Row (y); 144 y = Pixel2Row (y);
127 145
128 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 148 return;
131 149
132 for (;;) 150 for (;;)
133 { 151 {
134 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];
135 155
136 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
137 { 157 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
140 break; 160 break;
141 } 161 }
142 162
143 x--; 163 x--;
144 } 164 }
145
146} 165}
147#endif
148 166
149#if ENABLE_OVERLAY
150void 167void
151rxvt_term::iso14755_51 (wchar_t ch) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 172 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 173 int len;
155 174
175 fname = rxvt_utf8towcs (f->name);
176
156#if ENABLE_COMBINING 177# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
158 { 179 {
159 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
162 } 183 }
163 else 184 else
164#endif 185# endif
165 { 186 {
187 ch2 = ch;
188
166 alloc = 0; 189 alloc = 0;
167 chr = &ch; 190 chr = &ch2;
168 len = 1; 191 len = 1;
169 } 192 }
170 193
194 char attr[80]; // plenty
195
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
171 scr_overlay_new (0, -1, 8 + 5, len); 217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 220
173 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
174 { 222 {
175 char buf[9]; 223 char buf[9];
176 224
177 ch = *chr++; 225 ch = *chr++;
178 226
179 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
182#if !UNICODE3 230# if !UNICODE3
183 if (ch >= 0x10000) 231 if (ch >= 0x10000)
184 ch = 0xfffd; 232 ch = 0xfffd;
185#endif 233# endif
186 scr_overlay_set (11, y, ch); 234 scr_overlay_set (11, y, ch, r);
187 scr_overlay_set (12, y, NOCHAR); 235 scr_overlay_set (12, y, NOCHAR, r);
188 } 236 }
189 237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
190#if ENABLE_COMBINING 243# if ENABLE_COMBINING
191 if (alloc) 244 if (alloc)
192 delete [] alloc; 245 delete [] alloc;
193#endif 246# endif
194} 247}
195#endif 248#endif
196 249
197void 250void
198rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
215 mb[0] = ch[0]; 268 mb[0] = ch[0];
216 len = 1; 269 len = 1;
217 } 270 }
218 271
219 if (len > 0) 272 if (len > 0)
220 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
221 else 274 else
222 scr_bell (); 275 scr_bell ();
223 } 276 }
224 277
225 iso14755buf = 0; 278 iso14755buf = 0;
… …
253 KeySym keysym; 306 KeySym keysym;
254#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
255 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
256#endif 309#endif
257 int valid_keysym; 310 int valid_keysym;
258 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
259 312
260 /* 313 /*
261 * 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
262 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
263 * 316 *
264 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
265 */ 318 */
266 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
269 322
270 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
271 { 324 {
272 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
281 Status status_return; 334 Status status_return;
282 335
283#if 0 336#if 0
284#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
285 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
286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
287 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
288 else 341 else
289#endif 342#endif
290#endif 343#endif
291 { 344 {
… …
293 346
294 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
298 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
301 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 357 SET_LOCALE (locale);
303 358
304 if (status_return == XLookupChars 359 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
326 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
327 } 382 }
328 else 383 else
329#endif 384#endif
330 { 385 {
331 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
332 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
333 } 388 }
334 389
335 if (valid_keysym) 390 if (valid_keysym)
336 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
337 if (TermWin.saveLines) 397 if (saveLines)
338 { 398 {
339#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 400 if (!ctrl && !meta)
341#else 401#else
342 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
343#endif 403#endif
344 { 404 {
345 int lnsppg; 405 int lnsppg;
346 406
347#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 409#else
350 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
351#endif 411#endif
352 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
353 { 413 {
354 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
355 return; 415 return;
… …
406 { 466 {
407 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
410 return; 470 return;
411#if TODO // TODO 471#if TODO
412 /* rxvt extras */ 472 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 474 change_font (FONT_UP);
415 return; 475 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 535 }
476#endif 536#endif
477 537
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 539 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 540 {
506 newlen = 1; 541 newlen = 1;
507 switch (keysym) 542 switch (keysym)
508 { 543 {
509#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
517 else 552 else
518 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
519 break; 554 break;
520#endif 555#endif
521#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
522 case XK_Delete: 567 case XK_Delete:
523 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
524 break; 569 break;
525#endif 570#endif
526 case XK_Tab: 571 case XK_Tab:
… …
629#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
630 case XK_KP_Begin: 675 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
632 break; 677 break;
633 678
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 679#endif
642 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
677 break; 715 break;
678 716
679 case XK_Find: 717 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
681 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
682 case XK_Insert: 731 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
684 break; 733 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 735 case DXK_Remove:
… …
776#undef FKEY 825#undef FKEY
777 default: 826 default:
778 newlen = 0; 827 newlen = 0;
779 break; 828 break;
780 } 829 }
830
781 if (newlen) 831 if (newlen)
782 len = strlen (kbuf); 832 len = strlen (kbuf);
783 } 833 }
784 834
785 /* 835 /*
… …
794 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
795 { 845 {
796 len = 1; 846 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
799 else 854 else
800 { 855 {
801#ifdef META8_OPTION 856#ifdef META8_OPTION
802 /* set 8-bit on */ 857 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
804 { 859 {
805 unsigned char *ch; 860 char *ch;
806 861
807 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
808 *ch |= 0x80; 863 *ch |= 0x80;
809 864
810 meta = 0; 865 meta = 0;
… …
812#endif 867#endif
813 /* nil */ ; 868 /* nil */ ;
814 } 869 }
815 } 870 }
816 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
817 if (len <= 0) 875 if (len <= 0)
818 return; /* not mapped */ 876 return; /* not mapped */
819 877
820 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 879 if (view_start)
822 { 880 {
823 TermWin.view_start = 0; 881 view_start = 0;
824 want_refresh = 1; 882 want_refresh = 1;
825 } 883 }
826 884
827 /* 885 /*
828 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
843#ifdef META8_OPTION 901#ifdef META8_OPTION
844 && meta_char == C0_ESC 902 && meta_char == C0_ESC
845#endif 903#endif
846 ) 904 )
847 { 905 {
848 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
849 tt_write (&ch, 1); 907 tt_write (&ch, 1);
850 } 908 }
851 909
852#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
853 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
861#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
863} 921}
864/*}}} */ 922/*}}} */
865 923
866#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
869unsigned int 927unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
871{ 929{
872 unsigned int n, s; 930 unsigned int n, s;
873 931
874 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
894 952
895 cmd_parse (); 953 cmd_parse ();
896 954
897 return 0; 955 return 0;
898} 956}
899#endif /* MENUBAR_MAX */ 957#endif
900 958
901void 959void
902rxvt_term::flush () 960rxvt_term::flush ()
903{ 961{
962 flush_ev.stop ();
963
904#ifdef TRANSPARENT 964#ifdef TRANSPARENT
905 if (want_full_refresh) 965 if (want_full_refresh)
906 { 966 {
907 want_full_refresh = 0; 967 want_full_refresh = 0;
908 scr_clear (); 968 scr_clear ();
… …
910 } 970 }
911#endif 971#endif
912 972
913 if (want_refresh) 973 if (want_refresh)
914 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
915 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
916 scrollbar_show (1); 1015 scrollbar_show (1);
917#ifdef USE_XIM 1016#ifdef USE_XIM
918 IMSendSpot (); 1017 IMSendSpot ();
919#endif 1018#endif
920 } 1019 }
921 1020
922 display->flush (); 1021 display->flush ();
923
924 flush_ev.stop ();
925} 1022}
926 1023
927void 1024void
928rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
929{ 1026{
… …
931 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
932 1029
933 display->flush (); 1030 display->flush ();
934 1031
935 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
937} 1034}
938 1035
939void 1036void
940rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
941{ 1038{
… …
1005{ 1102{
1006 if (mouse_slip_wheel_speed == 0 1103 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1105 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1010 refresh_type |= SMOOTH_REFRESH; 1111 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1112 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1114 }
1014} 1115}
1015#endif 1116#endif
1016 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1017bool 1136bool
1018rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1019{ 1138{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1140
1022 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1023 { 1142 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1144 n = 0;
1026 } 1145 }
1027 1146
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1031 1150
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1033 1152
1034 if (n > 0) 1153 if (r > 0)
1035 { 1154 {
1036 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1037 return true; 1156 return true;
1038 } 1157 }
1039 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
1040 destroy (); 1170 destroy ();
1171 }
1041 1172
1042 return false; 1173 return false;
1043} 1174}
1044 1175
1045void 1176void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1178{
1048 SET_R (this); 1179 SET_R (this);
1049 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
1050 1181
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1182 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1183 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1184 while (pty_fill ())
1056 if (cmd_parse ()) 1185 if (cmd_parse ())
1057 break; 1186 break;
1187
1188 if (revents & EVENT_WRITE)
1189 pty_write ();
1058} 1190}
1059 1191
1060void 1192void
1061rxvt_term::pointer_unblank () 1193rxvt_term::pointer_unblank ()
1062{ 1194{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1195 XDefineCursor (display->display, vt, TermWin_cursor);
1064 recolour_cursor (); 1196 recolour_cursor ();
1065 1197
1066#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1199 hidden_pointer = 0;
1068 1200
1069 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif 1203#endif
1072} 1204}
1073 1205
1074#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1075void 1207void
1076rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1077{ 1209{
1078 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1079 return; 1211 return;
1080 1212
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1082 XFlush (display->display); 1214 XFlush (display->display);
1083 1215
1084 hidden_pointer = 1; 1216 hidden_pointer = 1;
1085} 1217}
1086 1218
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1273#endif
1142
1143 } 1274 }
1144 1275
1145#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1278 if (key_state & 16)
1148 fputc ('C', stderr); 1279 fputc ('C', stderr);
1149 if (key_state & 4) 1280 if (key_state & 4)
1150 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1285 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1287 button_number,
1157 x + 1, 1288 x + 1,
1158 y + 1); 1289 y + 1);
1159#else 1290#endif
1291
1160 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
1162 (32 + x + 1), 1294 (32 + x + 1),
1163 (32 + y + 1)); 1295 (32 + y + 1));
1164#endif
1165} 1296}
1166 1297
1167#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
1168void 1299void
1169rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
1176 1307
1177/*{{{ process an X event */ 1308/*{{{ process an X event */
1178void 1309void
1179rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
1180{ 1311{
1312 dDisp;
1313
1181 SET_R (this); 1314 SET_R (this);
1182 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1183 1316
1184#if defined(CURSOR_BLINK)
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1186 {
1187 if (hidden_cursor)
1188 {
1189 hidden_cursor = 0;
1190 want_refresh = 1;
1191 }
1192
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1194 }
1195#endif
1196
1197#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1199 {
1200 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease)
1203 if (hidden_pointer)
1204 pointer_unblank ();
1205
1206 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank ();
1208 }
1209#endif
1210
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return;
1214#endif
1215
1216 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1319 unsigned int unused_mask;
1219 1320
1220 switch (ev.type) 1321 switch (ev.type)
1221 { 1322 {
1222 case KeyPress: 1323 case KeyPress:
1223#if ISO_14755 1324#if ISO_14755
… …
1227 1328
1228 break; 1329 break;
1229 1330
1230 case KeyRelease: 1331 case KeyRelease:
1231 { 1332 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233 KeySym ks; 1334 KeySym ks;
1234 1335
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1337#endif
1237 1338
… …
1250 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1252 { 1353 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 (); 1355 commit_iso14755 ();
1255 return; // case-break; 1356 goto skip_switch;
1256 } 1357 }
1257 1358
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks) 1360 if (i[0] == ks)
1260 { 1361 {
1261 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 (); 1363 commit_iso14755 ();
1263 return; // case-break; 1364 goto skip_switch;
1264 } 1365 }
1265 1366
1266 scr_bell (); 1367 scr_bell ();
1267# endif 1368# endif
1268 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1287 else 1388 else
1288 iso14755buf = 0; 1389 iso14755buf = 0;
1289 } 1390 }
1290#endif 1391#endif
1291 1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1396
1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1293 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
1296 mouse_slip_wheel_speed = 0; 1401 mouse_slip_wheel_speed = 0;
… …
1306 button_release (ev.xbutton); 1411 button_release (ev.xbutton);
1307 break; 1412 break;
1308 1413
1309 case ClientMessage: 1414 case ClientMessage:
1310 if (ev.xclient.format == 32 1415 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1417 {
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1418 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312 destroy (); 1419 destroy ();
1420#if ENABLE_EWMH
1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422 XSendEvent (disp, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &ev);
1425#endif
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1313#ifdef OFFIX_DND 1436#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */ 1437 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile 1439 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir 1440 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink)) 1441 || ev.xclient.data.l[0] == DndLink))
1319 { 1442 {
1320 /* Get Dnd data */ 1443 /* Get Dnd data */
1321 Atom ActualType; 1444 Atom ActualType;
1322 int ActualFormat; 1445 int ActualFormat;
1323 unsigned char *data; 1446 unsigned char *data;
1324 unsigned long Size, RemainingBytes; 1447 unsigned long Size, RemainingBytes;
1325 1448
1326 XGetWindowProperty (display->display, display->root, 1449 XGetWindowProperty (disp, display->root,
1327 xa[XA_DNDSELECTION], 1450 xa[XA_DNDSELECTION],
1328 0L, 1000000L, 1451 0L, 1000000L,
1329 False, AnyPropertyType, 1452 False, AnyPropertyType,
1330 &ActualType, &ActualFormat, 1453 &ActualType, &ActualFormat,
1331 &Size, &RemainingBytes, 1454 &Size, &RemainingBytes,
1332 &data); 1455 &data);
1333 XChangeProperty (display->display, display->root, 1456 set_string_property (XA_CUT_BUFFER0, data);
1334 XA_CUT_BUFFER0, XA_STRING,
1335 8, PropModeReplace,
1336 data, strlen (data));
1337 XFree (data); 1457 XFree (data);
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340 } 1460 }
1341#endif /* OFFIX_DND */ 1461#endif /* OFFIX_DND */
1342 break; 1462 break;
1343 1463
1344 case MappingNotify: 1464 case MappingNotify:
… …
1369 break; 1489 break;
1370 } 1490 }
1371 break; 1491 break;
1372 1492
1373 case FocusIn: 1493 case FocusIn:
1374 if (!TermWin.focus) 1494 focus_in ();
1495 break;
1496
1497 case FocusOut:
1498 focus_out ();
1499 break;
1500
1501 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0])
1375 { 1503 {
1376 TermWin.focus = 1; 1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1505 ;
1378#ifdef USE_XIM 1506
1379 if (Input_Context != NULL) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1508 {
1381 IMSetStatusPosition (); 1509 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1511 }
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 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398
1399 }
1400 break;
1401
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444 1512
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1514 if (OPTION (Opt_transparent))
1447 {
1448 check_our_parents (); 1515 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif 1516#endif
1453 } 1517 }
1454 break; 1518 break;
1455 1519
1456 case PropertyNotify: 1520 case PropertyNotify:
… …
1464 selection_clear (); 1528 selection_clear ();
1465 break; 1529 break;
1466 1530
1467 case SelectionNotify: 1531 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1532 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1533 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1534 break;
1472 1535
1473 case SelectionRequest: 1536 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1475 break; 1538 break;
1476 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1477 case UnmapNotify: 1548 case UnmapNotify:
1478 TermWin.mapped = 0; 1549 mapped = 0;
1479#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1481#endif 1552#endif
1482 break; 1553 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; 1554 break;
1490 1555
1491#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1492 case ReparentNotify: 1557 case ReparentNotify:
1493 rootwin_cb (ev); 1558 rootwin_cb (ev);
1494 break; 1559 break;
1495#endif /* TRANSPARENT */ 1560#endif /* TRANSPARENT */
1496 1561
1497 case GraphicsExpose: 1562 case GraphicsExpose:
1498 case Expose: 1563 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1500 { 1565 {
1501 do 1566 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1570
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1572
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, False);
1511 1576
1512 scr_refresh (refresh_type); 1577 scr_refresh (refresh_type);
1513 } 1578 }
1514 else 1579 else
1515 { 1580 {
1516 XEvent unused_event; 1581 XEvent unused_event;
1517 1582
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519 ; 1584 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1586 ;
1522 1587
1523 if (isScrollbarWindow (ev.xany.window)) 1588 if (isScrollbarWindow (ev.xany.window))
1524 { 1589 {
1525 scrollBar.setIdle (); 1590 scrollBar.setIdle ();
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1595 menubar_expose ();
1531#endif 1596#endif
1532 1597
1533#ifdef TRANSPARENT 1598#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1599 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1600 XClearWindow (disp, ev.xany.window);
1536#endif 1601#endif
1537 } 1602 }
1538 break; 1603 break;
1539 1604
1540 case MotionNotify: 1605 case MotionNotify:
… …
1547 { 1612 {
1548 menubar_control (ev.xbutton); 1613 menubar_control (ev.xbutton);
1549 break; 1614 break;
1550 } 1615 }
1551#endif 1616#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1618 break;
1554 1619
1555 if (ev.xany.window == TermWin.vt) 1620 if (ev.xany.window == vt)
1556 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1625 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1627 ;
1561 1628
1562 XQueryPointer (display->display, TermWin.vt, 1629 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1633 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1635 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1637 {
1571#endif 1638#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1644 break;
1578 } 1645 }
1579#endif 1646#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1649
1582#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1653 {
1586 int dist; 1654 int dist;
1587 1655
1588 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1668
1601 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1603 { 1671 {
1604 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1606 } 1674 }
1607 else 1675 else
1608 { 1676 {
1609 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1678 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1679 }
1612 1680
1613 scroll_selection_lines = Pixel2Height (dist) 1681 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1683 + 1;
1616 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1618 } 1686 }
1619 else 1687 else
1620 { 1688 {
1621 /* we are within the text window, so we 1689 /* we are within the text window, so we
… …
1630#endif 1698#endif
1631 } 1699 }
1632 } 1700 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1702 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1703 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1704 MotionNotify, &ev))
1705 ;
1706
1637 XQueryPointer (display->display, scrollBar.win, 1707 XQueryPointer (disp, scrollBar.win,
1638 &unused_root, &unused_child, 1708 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1710 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1711 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1713 scrollbar_size ());
1644 scr_refresh (refresh_type); 1714 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1715 refresh_limit = 0;
1646 scrollbar_show (1); 1716 scrollbar_show (1);
1647 } 1717 }
1648 break; 1718 break;
1649 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1749}
1750
1751void
1752rxvt_term::focus_in ()
1753{
1754 if (!focus)
1755 {
1756 focus = 1;
1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 {
1764 IMSetStatusPosition ();
1765 XSetICFocus (Input_Context);
1766 }
1767#endif
1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_focused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::focus_out ()
1784{
1785 if (focus)
1786 {
1787 focus = 0;
1788 want_refresh = 1;
1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1795 iso14755buf = 0;
1796# if ENABLE_OVERLAY
1797 scr_overlay_off ();
1798# endif
1799 }
1800#endif
1801#if USE_XIM
1802 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context);
1804#endif
1805#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink))
1807 cursor_blink_ev.stop ();
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817 }
1650} 1818}
1651 1819
1652#if TRANSPARENT 1820#if TRANSPARENT
1653void 1821void
1654rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
… …
1661 case PropertyNotify: 1829 case PropertyNotify:
1662 /* 1830 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1665 */ 1833 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1834 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1836 return;
1671 1837
1672 /* FALLTHROUGH */ 1838 /* FALLTHROUGH */
1673 case ReparentNotify: 1839 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1841 want_refresh = want_full_refresh = 1;
1676 break; 1842 break;
1677 } 1843 }
1678} 1844}
1679#endif 1845#endif
… …
1682rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1683{ 1849{
1684 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1685 1851
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1687 if (!bypass_keystate) 1854 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1856
1690 /* 1857 /*
1691 * VT window processing of button press 1858 * VT window processing of button press
1692 */ 1859 */
1693 if (ev.window == TermWin.vt) 1860 if (ev.window == vt)
1694 { 1861 {
1695#if ISO_14755 1862#if ISO_14755
1696 // 5.4 1863 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1865 {
… …
1700 return; 1867 return;
1701 } 1868 }
1702#endif 1869#endif
1703 1870
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1871 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1872
1705 if (reportmode) 1873 if (reportmode)
1706 { 1874 {
1707 /* mouse report from vt window */ 1875 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1876 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1877 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1712 { 1880 {
1713 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1714 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1715 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1716 { 1885 {
1717 /* only report double clicks */ 1886 /* only report double clicks */
1718 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1719 mouse_report (ev); 1888 mouse_report (ev);
… …
1738 } 1907 }
1739 else 1908 else
1740 { 1909 {
1741 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1743 switch (ev.button) 1914 switch (ev.button)
1744 { 1915 {
1745 case Button1: 1916 case Button1:
1917 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */
1919#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask);
1921#else
1922 selection.rect = false;
1923#endif
1924
1746 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748 { 1927 {
1749 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1751 else 1930 else
1752 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1753 } 1932 }
1754 else 1933 else
1755 { 1934 {
1756 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1757 MEvent.clicks++; 1936 MEvent.clicks++;
1758 else 1937 else
1759 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1760 1939
1761 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1762 } 1941 }
1763 1942
1764 MEvent.button = Button1; 1943 MEvent.button = Button1;
1765 break; 1944 break;
1766 1945
1767 case Button3: 1946 case Button3:
1768 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1769 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1770 else 1949 else
1771 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1772 1951
1773 MEvent.button = Button3; 1952 MEvent.button = Button3;
1774 break; 1953 break;
1775 } 1954 }
1776 } 1955 }
1777 1956
1778 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1779 return; 1958 return;
1780 } 1959 }
1781 1960
… …
1893 case Button3: 2072 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2073 if (scrollBar.style != R_SB_XTERM)
1895 { 2074 {
1896 if (scrollbar_above_slider (ev.y)) 2075 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2077 scr_page (UP, nrow - 1);
1899# else 2078# else
1900 scr_page (UP, TermWin.nrow / 4); 2079 scr_page (UP, nrow / 4);
1901# endif 2080# endif
1902 else if (scrollbar_below_slider (ev.y)) 2081 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2083 scr_page (DN, nrow - 1);
1905# else 2084# else
1906 scr_page (DN, TermWin.nrow / 4); 2085 scr_page (DN, nrow / 4);
1907# endif 2086# endif
1908 else 2087 else
1909 scrollBar.setMotion (); 2088 scrollBar.setMotion ();
1910 } 2089 }
1911 else 2090 else
1912 { 2091 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2092 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2093 (nrow
1915 * scrollbar_position (ev.y) 2094 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2095 / scrollbar_size ()));
1917 } 2096 }
1918 2097
1919 break; 2098 break;
1920 } 2099 }
1921 } 2100 }
2101
1922 return; 2102 return;
1923 } 2103 }
2104
1924#if MENUBAR 2105#if MENUBAR
1925 /* 2106 /*
1926 * Menubar window processing of button press 2107 * Menubar window processing of button press
1927 */ 2108 */
1928 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
1951#ifdef SELECTION_SCROLLING 2132#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2133 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
1954#endif 2135#endif
1955 2136
1956 if (ev.window == TermWin.vt) 2137 if (ev.window == vt)
1957 { 2138 {
1958#if ISO_14755 2139#if ISO_14755
1959 // 5.4 2140 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2142 return;
… …
1991 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1992 && bypass_keystate 2173 && bypass_keystate
1993 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1994 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1995 2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
1996 switch (ev.button) 2180 switch (ev.button)
1997 { 2181 {
1998 case Button1: 2182 case Button1:
1999 case Button3: 2183 case Button3:
2000 selection_make (ev.time); 2184 selection_make (ev.time);
… …
2011 2195
2012 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2013 2197
2014 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2015 i = 1; 2199 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2200 else if (OPTION (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2201 i = nrow - 1;
2018 else 2202 else
2019 i = 5; 2203 i = 5;
2020 2204
2021# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
2023 { 2207 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2025 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;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2211
2028 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2214
2031 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
… …
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2259 int i;
2076 2260
2077 Visual* visual = display->visual; 2261 Visual *visual = display->visual;
2078 2262
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2264
2081 /* for convenience */ 2265 /* for convenience */
2082 mask_r = visual->red_mask; 2266 mask_r = visual->red_mask;
… …
2303 Atom atype; 2487 Atom atype;
2304 unsigned char *prop = NULL; 2488 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2489 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2490 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2491 XWindowAttributes wattr, wrootattr;
2492 dDisp;
2308 2493
2309 pchanged = 0; 2494 pchanged = 0;
2310 2495
2311 if (!(options & Opt_transparent)) 2496 if (!OPTION (Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2497 return pchanged; /* Don't try any more */
2313 2498
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2499 XGetWindowAttributes (disp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2500 rootdepth = wrootattr.depth;
2316 2501
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2502 XGetWindowAttributes (disp, parent[0], &wattr);
2318 2503
2319 if (rootdepth != wattr.depth) 2504 if (rootdepth != wattr.depth)
2320 { 2505 {
2321 if (am_transparent) 2506 if (am_transparent)
2322 { 2507 {
2323 pchanged = 1; 2508 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2510 am_transparent = am_pixmap_trans = 0;
2326 } 2511 }
2327 2512
2328 return pchanged; /* Don't try any more */ 2513 return pchanged; /* Don't try any more */
2329 } 2514 }
2330 2515
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2516 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2517 XSync (disp, False);
2333 2518
2334 /* 2519 /*
2335 * Make the frame window set by the window manager have 2520 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2521 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2522 * windows for each client, so we have to take care about that.
2338 */ 2523 */
2339 i = (xa[XA_XROOTPMAPID] 2524 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2527 &nitems, &bytes_after, &prop) == Success);
2343 2528
2344 if (!i || prop == NULL) 2529 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2530 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2533 &nitems, &bytes_after, &prop) == Success);
2349 2534
2350 if (!i || prop == NULL 2535 if (!i || prop == NULL
2351#if TINTING 2536#if TINTING
… …
2370 Window cr; 2555 Window cr;
2371 XImage *image; 2556 XImage *image;
2372 GC gc; 2557 GC gc;
2373 XGCValues gcvalue; 2558 XGCValues gcvalue;
2374 2559
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2560 XTranslateCoordinates (disp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2561 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2562 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2563 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2564 nx = ny = 0;
2380 2565
… …
2390 nh += sy; 2575 nh += sy;
2391 ny = -sy; 2576 ny = -sy;
2392 sy = 0; 2577 sy = 0;
2393 } 2578 }
2394 2579
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2580 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2581 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582
2583 XSync (disp, False);
2397 allowedxerror = -1; 2584 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2586
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2588 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2589 allowedxerror = 0;
2403 2590
2404 if (image == NULL) 2591 if (image == NULL)
2405 { 2592 {
2406 if (am_transparent && am_pixmap_trans) 2593 if (am_transparent && am_pixmap_trans)
2407 { 2594 {
2408 pchanged = 1; 2595 pchanged = 1;
2409 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2410 { 2597 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2598 XFreePixmap (disp, pixmap);
2412 TermWin.pixmap = None; 2599 pixmap = None;
2413 } 2600 }
2414 } 2601 }
2415 2602
2416 am_pixmap_trans = 0; 2603 am_pixmap_trans = 0;
2417 } 2604 }
2418 else 2605 else
2419 { 2606 {
2420 if (TermWin.pixmap != None) 2607 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2608 XFreePixmap (disp, pixmap);
2422 2609
2423#if TINTING 2610#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2611 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2612 {
2426 unsigned short rm, gm, bm; 2613 unsigned short rm, gm, bm;
… …
2430 2617
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2618 ShadeXImage (display, image, shade, rm, gm, bm);
2432 } 2619 }
2433#endif 2620#endif
2434 2621
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2622 pixmap = XCreatePixmap (disp, vt,
2436 szHint.width, szHint.height, image->depth); 2623 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2625 XPutImage (disp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2626 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2627 XFreeGC (disp, gc);
2441 XDestroyImage (image); 2628 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2630 XClearWindow (disp, parent[0]);
2444 2631
2445 if (!am_transparent || !am_pixmap_trans) 2632 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2633 pchanged = 1;
2447 2634
2448 am_transparent = am_pixmap_trans = 1; 2635 am_transparent = am_pixmap_trans = 1;
2449 } 2636 }
2450 } 2637 }
2451 2638
2452 if (!am_pixmap_trans) 2639 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 else
2453 { 2642 {
2454 unsigned int n; 2643 unsigned int n;
2455 /* 2644 /*
2456 * InheritPixmap transparency 2645 * InheritPixmap transparency
2457 */ 2646 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2648 {
2460 oldp = TermWin.parent[i]; 2649 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2650 XQueryTree (disp, parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n); 2651 &parent[i], &list, &n);
2463 XFree (list); 2652 XFree (list);
2464 2653
2465 if (TermWin.parent[i] == display->root) 2654 if (parent[i] == display->root)
2466 { 2655 {
2467 if (oldp != None) 2656 if (oldp != None)
2468 pchanged = 1; 2657 pchanged = 1;
2469 2658
2470 break; 2659 break;
2471 } 2660 }
2472 2661
2473 if (oldp != TermWin.parent[i]) 2662 if (oldp != parent[i])
2474 pchanged = 1; 2663 pchanged = 1;
2475 } 2664 }
2476 2665
2477 n = 0; 2666 n = 0;
2478 2667
2479 if (pchanged) 2668 if (pchanged)
2480 { 2669 {
2481 for (; n < (unsigned int)i; n++) 2670 for (; n < (unsigned int)i; n++)
2482 { 2671 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2672 XGetWindowAttributes (disp, parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2674 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2676 break;
2488 } 2677 }
2489 } 2678 }
2490 } 2679 }
2491 2680
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2681 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2493 { 2682 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2684 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2685 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2686 /* XXX: also turn off Opt_transparent? */
2498 } 2687 }
2499 else 2688 else
2500 { 2689 {
… …
2503 * needed for fvwm2.2.2 (and before?) */ 2692 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1); 2693 sleep (1);
2505#endif 2694#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2695 for (n = 0; n < (unsigned int)i; n++)
2507 { 2696 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2698 XClearWindow (disp, parent[n]);
2510 } 2699 }
2511 2700
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2513 am_transparent = 1; 2702 am_transparent = 1;
2514 } 2703 }
2515 2704
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2706 parent[i] = None;
2518 } 2707 }
2519 2708
2520 // this is experimental
2521 if (scrollBar.win) 2709 if (scrollBar.win)
2522 { 2710 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2712 scrollBar.setIdle ();
2526 scrollbar_show (0); 2713 scrollbar_show (0);
2527 } 2714 }
2528 2715
2716 if (am_transparent)
2717 {
2718 want_refresh = want_full_refresh = 1;
2719 if (am_pixmap_trans)
2720 flush ();
2721 }
2722
2529 return pchanged; 2723 return pchanged;
2530} 2724}
2531#endif 2725#endif
2532 2726
2533/*}}} */ 2727/*}}} */
2534 2728
2535bool 2729bool
2536rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2537{ 2731{
2538 bool flag = false; 2732 bool flag = false;
2539 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2541 2735
2542 for (;;) 2736 for (;;)
2543 { 2737 {
2544 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
2545 { 2739 {
2546 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2547 ch = next_char (); 2741 ch = next_char ();
2548 }
2549 2742
2550 if (ch == NOCHAR) // TODO: improve 2743 if (ch == NOCHAR)
2551 break; 2744 break;
2745 }
2552 2746
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 { 2748 {
2555 if (!seen_input) 2749 if (!seen_input)
2556 { 2750 {
2557 seen_input = 1; 2751 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2752 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2753 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2754 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2755 // then sometimes get the size wrong.
2756 // unfortunately other programs are even more buggy and dislike
2757 // being sent SIGWINCH, so only do it when we were in fact being
2758 // resized.
2759 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2563 } 2761 }
2564 2762
2565 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2765 bool refreshnow = false;
2568 int nlines = 0; 2766 int nlines = 0;
2569 unicode_t *str = buf; 2767 wchar_t *str = buf;
2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2570 2769
2571 for (;;) 2770 for (;;)
2572 { 2771 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2773 break;
2575 2774
2576 *str++ = ch; 2775 *str++ = ch;
2577 2776
2578 if (ch == C0_LF) 2777 if (ch == C0_LF || str >= eol)
2579 { 2778 {
2779 if (ch == C0_LF)
2580 nlines++; 2780 nlines++;
2781
2581 refresh_count++; 2782 refresh_count++;
2582 2783
2583 if (!(options & Opt_jumpScroll) 2784 if (!OPTION (Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2786 {
2586 refreshnow = true; 2787 refreshnow = true;
2788 refresh_count = 0;
2587 ch = NOCHAR; 2789 ch = NOCHAR;
2588 break; 2790 break;
2589 } 2791 }
2590 2792
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2794 if (nlines >= nrow - 1)
2593 { 2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2594 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2798
2595 nlines = 0; 2799 nlines = 0;
2596 str = buf; 2800 str = buf;
2801 eol = str + min (ncol, UBUFSIZ);
2597 } 2802 }
2598 }
2599 2803
2600 if (str >= buf + UBUFSIZ) 2804 if (str >= eol)
2601 { 2805 {
2806 if (eol >= buf + UBUFSIZ)
2807 {
2602 ch = NOCHAR; 2808 ch = NOCHAR;
2603 break; 2809 break;
2810 }
2811 else
2812 eol = min (eol + ncol, buf + UBUFSIZ);
2813 }
2814
2604 } 2815 }
2605 2816
2606 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2818 ch = next_char ();
2608 } 2819 }
2609 2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2610 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2611 2823
2612 /* 2824 /*
2613 * If there have been a lot of new lines, then update the screen 2825 * If there have been a lot of new lines, then update the screen
2614 * What the heck I'll cheat and only refresh less than every page-full. 2826 * What the heck I'll cheat and only refresh less than every page-full.
2615 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling. 2828 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2829 */
2618 if (refreshnow) 2830 if (refreshnow)
2619 { 2831 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++; 2833 refresh_limit++;
2622 else 2834 else
2623 { 2835 {
2624 flag = true; 2836 flag = true;
2625 scr_refresh (refresh_type); 2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2626 } 2839 }
2627 } 2840 }
2628 2841
2629 } 2842 }
2630 else 2843 else
… …
2645 } 2858 }
2646 2859
2647 return flag; 2860 return flag;
2648} 2861}
2649 2862
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2659// read the next character 2863// read the next character
2660unicode_t 2864wchar_t
2661rxvt_term::next_char () 2865rxvt_term::next_char ()
2662{ 2866{
2663 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2664 { 2868 {
2665 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2667 return *cmdbuf_ptr++; 2871 return *cmdbuf_ptr++;
2668 2872
2669 wchar_t wc; 2873 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671 2875
2672 if (len == (size_t)-2) 2876 if (len == (size_t)-2)
2673 { 2877 {
2674 // the mbstate stores incomplete sequences. didn't know this :/ 2878 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2676 break; 2880 break;
2677 } 2881 }
2678 2882
2679 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2885
2682 // assume wchar == unicode 2886 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2684 return wc; 2888 return wc & UNICODE_MASK;
2685 } 2889 }
2686 2890
2687 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2688} 2901}
2689 2902
2690/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2691/* 2904/*
2692 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2693 * to the command. 2906 * to the command.
2694 */ 2907 */
2695unicode_t 2908wchar_t
2696rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2697{ 2910{
2698 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2699 2912
2700 if (c == NOCHAR) 2913 if (c == NOCHAR)
2701 throw out_of_input; 2914 throw out_of_input;
2702 2915
2703 return c; 2916 return c;
2704} 2917}
2705 2918
2706unicode_t 2919uint32_t
2707rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2708{ 2921{
2709 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2710 2923
2711 if (c == NOCHAR) 2924 if (c == NOCHAR)
2712 throw out_of_input; 2925 throw out_of_input;
2713 2926
2714 return c; 2927 return c;
… …
2814 case C0_ESC: 3027 case C0_ESC:
2815 process_escape_seq (); 3028 process_escape_seq ();
2816 break; 3029 break;
2817 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2818 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2821 else 3033 else
2822 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2823 (unsigned int)strlen (VT100_ANS));
2824 break; 3035 break;
2825 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2826 scr_bell (); 3037 scr_bell ();
2827 break; 3038 break;
2828 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
2983 break; 3194 break;
2984 3195
2985 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
2986 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
2987 { 3198 {
2988 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
2989 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2990 } 3201 }
2991 break; 3202 break;
2992 3203
2993 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
2994 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
3016 process_dcs_seq (); 3227 process_dcs_seq ();
3017 break; 3228 break;
3018 3229
3019 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3020 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
3021 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3022 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3023 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
3024 3234
3025 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3026 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
3027 process_csi_seq (); 3237 process_csi_seq ();
… …
3152 { 3362 {
3153 switch (priv) 3363 switch (priv)
3154 { 3364 {
3155 case '>': 3365 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3366 if (ch == CSI_DA) /* secondary device attributes */
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3367 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158 break; 3368 break;
3159 case '?': 3369 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3371 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3372 break;
… …
3267 3477
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3478 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3479 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3480 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3483 break;
3274 3484
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3277 (unsigned int) (sizeof (VT100_ANS) - 1));
3278 break; 3487 break;
3279 3488
3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3281 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
3282 break; 3491 break;
… …
3289 break; 3498 break;
3290 case 6: /* CPR requested */ 3499 case 6: /* CPR requested */
3291 scr_report_position (); 3500 scr_report_position ();
3292 break; 3501 break;
3293 case 7: /* unofficial extension */ 3502 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 3503 if (OPTION (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3504 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 3505 break;
3297 case 8: /* unofficial extension */ 3506 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 3508 break;
… …
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3600rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3601{
3393 int x, y; 3602 int x, y;
3394 XWindowAttributes wattr; 3603 XWindowAttributes wattr;
3395 Window wdummy; 3604 Window wdummy;
3605 dDisp;
3396 3606
3397 if (nargs == 0) 3607 if (nargs == 0)
3398 return; 3608 return;
3399 3609
3400 switch (args[0]) 3610 switch (args[0])
3401 { 3611 {
3402 /* 3612 /*
3403 * commands 3613 * commands
3404 */ 3614 */
3405 case 1: /* deiconify window */ 3615 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3616 XMapWindow (disp, parent[0]);
3407 break; 3617 break;
3408 case 2: /* iconify window */ 3618 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3619 XIconifyWindow (disp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3620 break;
3412 case 3: /* set position (pixels) */ 3621 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3622 XMoveWindow (disp, parent[0], args[1], args[2]);
3414 break; 3623 break;
3415 case 4: /* set size (pixels) */ 3624 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3626 break;
3418 case 5: /* raise window */ 3627 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3628 XRaiseWindow (disp, parent[0]);
3420 break; 3629 break;
3421 case 6: /* lower window */ 3630 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3631 XLowerWindow (disp, parent[0]);
3423 break; 3632 break;
3424 case 7: /* refresh window */ 3633 case 7: /* refresh window */
3425 scr_touch (true); 3634 scr_touch (true);
3426 break; 3635 break;
3427 case 8: /* set size (chars) */ 3636 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3637 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
3430 break; 3639 break;
3431 3640
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3641 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3642 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3643 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3644 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3645 (unsigned int) (args[1] * fheight));
3437 break; 3646 break;
3438 3647
3439 3648
3440 /* 3649 /*
3441 * reports - some output format copied from XTerm 3650 * reports - some output format copied from XTerm
3442 */ 3651 */
3443 case 11: /* report window state */ 3652 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3655 break;
3447 case 13: /* report window position */ 3656 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3658 XTranslateCoordinates (disp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3659 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3660 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3661 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3662 break;
3454 case 14: /* report window size (pixels) */ 3663 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3664 XGetWindowAttributes (disp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3666 break;
3458 case 18: /* report text area size (chars) */ 3667 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3668 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3669 break;
3461 case 19: /* report window size (chars) */ 3670 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3671 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3672 break;
3464 case 20: /* report icon label */ 3673 case 20: /* report icon label */
3465 { 3674 {
3466 char *s; 3675 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3676 XGetIconName (disp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3678 XFree (s);
3470 } 3679 }
3471 break; 3680 break;
3472 case 21: /* report window title */ 3681 case 21: /* report window title */
3473 { 3682 {
3474 char *s; 3683 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3684 XFetchName (disp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3686 XFree (s);
3478 } 3687 }
3479 break; 3688 break;
3480 } 3689 }
3481} 3690}
… …
3484/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
3485/* 3694/*
3486 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
3487 * ends_how is terminator used. returned input must be free()'d 3696 * ends_how is terminator used. returned input must be free()'d
3488 */ 3697 */
3489unsigned char * 3698char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3700{
3492 unicode_t prev = 0, ch; 3701 unicode_t ch;
3702 bool seen_esc = false;
3493 unsigned int n = 0; 3703 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3704 wchar_t string[STRING_MAX];
3496 3705
3497 while ((ch = cmd_getc ()) != NOCHAR) 3706 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3707 {
3499 if (prev == C0_ESC) 3708 if (seen_esc)
3500 { 3709 {
3501 if (ch == 0x5c) /* 7bit ST */ 3710 if (ch == 0x5c) /* 7bit ST */
3502 break; 3711 break;
3503 else 3712 else
3504 return NULL; 3713 return NULL;
3505 } 3714 }
3715 else if (ch == C0_ESC)
3716 {
3717 seen_esc = true;
3718 continue;
3719 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3720 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3721 break;
3508 else if (ch < 0x20) 3722 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3723 return NULL; /* other control character - exit */
3510 3724
3511 if (n >= sizeof (string) - 1) 3725 seen_esc = false;
3726
3727 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3728 // stop at some sane length
3513 return NULL; 3729 return NULL;
3514 3730
3515 if (ch == C0_SYN) 3731 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3732 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3733 else
3521 string[n++] = prev = ch; 3734 string[n++] = ch;
3522 } 3735 }
3523 3736
3524 string[n++] = '\0'; 3737 string[n++] = '\0';
3525 3738
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3740
3531 return s; 3741 return rxvt_wcstombs (string);
3532} 3742}
3533 3743
3534/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
3535/* 3745/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3537 */ 3747 */
3538void 3748void
3539rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
3540{ 3750{
3541 unsigned char *s; 3751 char *s;
3542 unicode_t eh; 3752 unicode_t eh;
3543 3753
3544 /* 3754 /*
3545 * Not handled yet 3755 * Not handled yet
3546 */ 3756 */
… …
3565 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3566 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
3567 3777
3568 if (ch == ';') 3778 if (ch == ';')
3569 { 3779 {
3570 unsigned char *s = get_to_st (eh); 3780 char *s = get_to_st (eh);
3571 3781
3572 if (s) 3782 if (s)
3573 { 3783 {
3574 process_xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
3575 free (s); 3785 free (s);
3576 } 3786 }
3577 } 3787 }
3578} 3788}
3579 3789
3580void 3790void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3582{ 3792{
3583 if (str[0] == '?' && !str[1]) 3793 if (str[0] == '?' && !str[1])
3584 { 3794 {
3585 unsigned short r, g, b; 3795 unsigned short r, g, b;
3586 pix_colors_focused[color].get (display, r, g, b); 3796 pix_colors_focused[color].get (display, r, g, b);
… …
3590 set_window_color (color, str); 3800 set_window_color (color, str);
3591} 3801}
3592 3802
3593/* 3803/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3805 */
3618void 3806void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3620{ 3808{
3621 int changed = 0; 3809 int changed = 0;
3622 int color; 3810 int color;
3623 char *buf, *name; 3811 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3812 bool query = str[0] == '?' && !str[1];
3813 int saveop = op;
3814 dDisp;
3625 3815
3626 assert (str != NULL); 3816 assert (str != NULL);
3627 switch (op) 3817 switch (op)
3628 { 3818 {
3629 case XTerm_name: 3819 case XTerm_name:
… …
3636 set_title (str); 3826 set_title (str);
3637 break; 3827 break;
3638 case XTerm_property: 3828 case XTerm_property:
3639 if (str[0] == '?') 3829 if (str[0] == '?')
3640 { 3830 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3831 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3832 Atom actual_type;
3643 int actual_format; 3833 int actual_format;
3644 unsigned long nitems; 3834 unsigned long nitems;
3645 unsigned long bytes_after; 3835 unsigned long bytes_after;
3646 unsigned char *value = 0; 3836 unsigned char *value = 0;
3647 const char *str = ""; 3837 const char *str = "";
3648 3838
3649 if (prop 3839 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3840 && XGetWindowProperty (disp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3841 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3842 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3843 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3844 && actual_type != None
3655 && actual_format == 8) 3845 && actual_format == 8)
… …
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3854 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3855
3666 if (eq) 3856 if (eq)
3667 { 3857 {
3668 *eq = 0; 3858 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3859 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3860 }
3674 else 3861 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3862 XDeleteProperty (disp, parent[0],
3676 display->atom (str)); 3863 display->atom (str));
3677 } 3864 }
3678 break; 3865 break;
3679 3866
3680 case XTerm_Color: 3867 case XTerm_Color:
… …
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break; 3915 break;
3729 case XTerm_Color_RV: 3916 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731 break; 3918 break;
3919 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921 break;
3922#endif
3923#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3926 check_our_parents ();
3927 if (am_transparent)
3928 want_full_refresh = want_refresh = 1;
3929 break;
3732#endif 3930#endif
3733 3931
3734 case XTerm_Pixmap: 3932 case XTerm_Pixmap:
3735 if (*str != ';') 3933 if (*str != ';')
3736 { 3934 {
… …
3744 { 3942 {
3745 str++; 3943 str++;
3746#if XPM_BACKGROUND 3944#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3945 changed += scale_pixmap (str);
3748#endif 3946#endif
3749
3750 } 3947 }
3948
3751 if (changed) 3949 if (changed)
3752 { 3950 {
3753#ifdef XPM_BACKGROUND 3951#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3952 resize_pixmap ();
3755#endif 3953#endif
… …
3766 3964
3767 case XTerm_logfile: 3965 case XTerm_logfile:
3768 // TODO, when secure mode? 3966 // TODO, when secure mode?
3769 break; 3967 break;
3770 3968
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR 3969#ifdef MENUBAR
3806 case XTerm_Menu: 3970 case URxvt_Menu:
3807 if (options & Opt_insecure) 3971 if (OPTION (Opt_insecure))
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break; 3973 break;
3810#endif 3974#endif
3811#if 0 3975#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3976 case XTerm_dumpscreen: /* no error notices */
… …
3816 { 3980 {
3817 scr_dump (fd); 3981 scr_dump (fd);
3818 close (fd); 3982 close (fd);
3819 } 3983 }
3820 } 3984 }
3985 break;
3986#endif
3987 case XTerm_font:
3988 op = URxvt_font;
3989 case URxvt_font:
3990#if ENABLE_STYLES
3991 case URxvt_boldFont:
3992 case URxvt_italicFont:
3993 case URxvt_boldItalicFont:
3994#endif
3995 if (query)
3996 tt_printf ("\33]%d;%-.250s%c", saveop,
3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3998 ? fontset[op - URxvt_font]->fontdesc : "",
3999 resp);
4000 else
4001 {
4002 const char *&res = rs[Rs_font + (op - URxvt_font)];
4003
4004 res = strdup (str);
4005 allocated.push_back ((void *)res);
4006 set_fonts ();
4007 }
4008 break;
4009
4010#if ENABLE_FRILLS
4011 case URxvt_locale:
4012 if (query)
4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014 else
4015 {
4016 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8);
4018 init_xlocale ();
4019 }
4020 break;
4021
4022 case URxvt_view_up:
4023 case URxvt_view_down:
4024 {
4025 int lines = atoi (str);
4026
4027 if (lines)
4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
4029 else
4030 scr_erase_savelines ();
4031 }
4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
3821 break; 4040 break;
3822#endif 4041#endif
3823 } 4042 }
3824} 4043}
3825/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
… …
3934 } 4153 }
3935 4154
3936 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4156 switch (arg[i])
3938 { 4157 {
4158#if ENABLE_STYLES
4159 case 1021:
4160 set_option (Opt_intensityStyles, mode);
4161
4162 scr_touch (true);
4163 break;
4164#endif
3939 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
4166 case 1049:
3940 if (options & Opt_secondaryScreen) 4167 if (OPTION (Opt_secondaryScreen))
3941 if (mode == 0) 4168 if (mode == 0)
3942 scr_cursor (RESTORE); 4169 scr_cursor (RESTORE);
3943 else if (mode == 1) 4170 else if (mode == 1)
3944 scr_cursor (SAVE); 4171 scr_cursor (SAVE);
3945 break; 4172 break;
… …
3957 */ 4184 */
3958 PrivMode (1, PrivMode_vt52); 4185 PrivMode (1, PrivMode_vt52);
3959 break; 4186 break;
3960 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4190 break;
3964 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
3965 if (state)
3966 options &= ~Opt_jumpScroll;
3967 else
3968 options |= Opt_jumpScroll; 4192 set_option (Opt_jumpScroll, !state);
3969 break; 4193 break;
3970 case 5: /* reverse video */ 4194 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
3972 break; 4196 break;
3973 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
4014#if 0 4238#if 0
4015 case 1001: 4239 case 1001:
4016 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
4017#endif 4241#endif
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state)
4020 options &= ~Opt_scrollTtyOutput;
4021 else
4022 options |= Opt_scrollTtyOutput; 4243 set_option (Opt_scrollTtyOutput, !state);
4023 break; 4244 break;
4024 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
4025 if (state)
4026 options |= Opt_scrollTtyKeypress; 4246 set_option (Opt_scrollTtyKeypress, state);
4027 else
4028 options &= ~Opt_scrollTtyKeypress;
4029 break; 4247 break;
4030 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 4251 scr_erase_screen (2);
4034 scr_change_screen (state); 4252 scr_change_screen (state);
4035 break; 4253 break;
4036 case 1049: /* secondary screen w/ clearing first */ 4254 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 4255 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 4256 if (OPTION (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 4257 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 4258 scr_erase_screen (2);
4041 break; 4259 break;
4042 default: 4260 default:
4043 break; 4261 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 4287 rendset = 0, rendstyle = ~RS_None;
4070 break; 4288 break;
4071 case 1: 4289 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4290 rendset = 1, rendstyle = RS_Bold;
4073 break; 4291 break;
4074 //case 2: // faint or second colour 4292 //case 2: // low intensity
4075 //case 3: // italic 4293 case 3:
4294 rendset = 1, rendstyle = RS_Italic;
4295 break;
4076 case 4: 4296 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4297 rendset = 1, rendstyle = RS_Uline;
4078 break; 4298 break;
4079 case 5: // slowly blinking 4299 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4300 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4312 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4313 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4314 //...
4095 //case 19: // ninth alt font 4315 //case 19: // ninth alt font
4096 //case 20: // gothic 4316 //case 20: // gothic
4097 case 21: // disable bold, faint 4317 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4318 rendset = 0, rendstyle = RS_Bold;
4099 break; 4319 break;
4100 case 22: 4320 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4321 rendset = 0, rendstyle = RS_Bold;
4102 break; 4322 break;
4103 //case 23: disable italic 4323 case 23: // disable italic
4324 rendset = 0, rendstyle = RS_Italic;
4325 break;
4104 case 24: 4326 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4327 rendset = 0, rendstyle = RS_Uline;
4106 break; 4328 break;
4107 case 25: 4329 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4330 rendset = 0, rendstyle = RS_Blink;
4109 break; 4331 break;
4110 case 26: 4332 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4333 rendset = 0, rendstyle = RS_Blink;
4112 break; 4334 break;
4113 case 27: 4335 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4336 rendset = 0, rendstyle = RS_RVid;
4115 break; 4337 break;
… …
4133 case 35: 4355 case 35:
4134 case 36: 4356 case 36:
4135 case 37: 4357 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4358 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4359 break;
4138#ifdef TTY_256COLOR 4360 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4361 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4362 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4363 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4364 i += 2;
4144 } 4365 }
4145 break; 4366 break;
4146#endif
4147 case 39: /* default fg */ 4367 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4368 scr_color (Color_fg, Color_fg);
4149 break; 4369 break;
4150 4370
4151 case 40: 4371 case 40:
… …
4156 case 45: 4376 case 45:
4157 case 46: 4377 case 46:
4158 case 47: 4378 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4380 break;
4161#ifdef TTY_256COLOR 4381 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4382 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4383 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4385 i += 2;
4167 } 4386 }
4168 break; 4387 break;
4169#endif
4170 case 49: /* default bg */ 4388 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4389 scr_color (Color_bg, Color_bg);
4172 break; 4390 break;
4173 4391
4174#ifndef NO_BRIGHTCOLOR 4392 //case 50: // not variable spacing
4393
4394#if ENABLE_FRILLS
4175 case 90: 4395 case 90:
4176 case 91: /* set bright fg color */ 4396 case 91: /* set bright fg color */
4177 case 92: 4397 case 92:
4178 case 93: 4398 case 93:
4179 case 94: 4399 case 94:
4180 case 95: 4400 case 95:
4181 case 96: 4401 case 96:
4182 case 97: 4402 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4404 break;
4186 case 100: 4405 case 100:
4187 case 101: /* set bright bg color */ 4406 case 101: /* set bright bg color */
4188 case 102: 4407 case 102:
4189 case 103: 4408 case 103:
4190 case 104: 4409 case 104:
4191 case 105: 4410 case 105:
4192 case 106: 4411 case 106:
4193 case 107: 4412 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4414 break;
4197#endif 4415#endif
4198
4199 } 4416 }
4200 } 4417 }
4201} 4418}
4202/*}}} */ 4419/*}}} */
4203 4420
… …
4227 */ 4444 */
4228void 4445void
4229rxvt_term::tt_printf (const char *fmt,...) 4446rxvt_term::tt_printf (const char *fmt,...)
4230{ 4447{
4231 va_list arg_ptr; 4448 va_list arg_ptr;
4232 unsigned char buf[256]; 4449 char buf[256];
4233 4450
4234 va_start (arg_ptr, fmt); 4451 va_start (arg_ptr, fmt);
4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4452 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4236 va_end (arg_ptr); 4453 va_end (arg_ptr);
4237 tt_write (buf, strlen (buf)); 4454 tt_write (buf, strlen (buf));
… …
4239 4456
4240/* ---------------------------------------------------------------------- */ 4457/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4458/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4459 * or generated by us in response to a query ESC sequence.
4243 */ 4460 */
4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462
4244void 4463void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4464rxvt_term::tt_write (const char *data, unsigned int len)
4246{ 4465{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4466 if (pty.pty < 0)
4467 return;
4248 4468
4249 if (len) 4469 if (v_buflen == 0)
4470 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4472
4473 if ((unsigned int)written == len)
4474 return;
4475
4476 data += written;
4477 len -= written;
4250 { 4478 }
4479
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4481
4482 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len;
4484
4485 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486}
4487
4488void rxvt_term::pty_write ()
4489{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491
4492 if (written > 0)
4493 {
4494 v_buflen -= written;
4495
4251 if (v_buflen == 0) 4496 if (v_buflen == 0)
4252 { 4497 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4498 free (v_buffer);
4280 v_buffer = 0; 4499 v_buffer = 0;
4281 v_buflen = 0; 4500 v_buflen = 0;
4282 4501
4283 pty_ev.set (EVENT_READ); 4502 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4503 return;
4296 } 4504 }
4505
4506 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4507 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ);
4298} 4510}
4299 4511
4300/*----------------------- end-of-file (C source) -----------------------*/ 4512/*----------------------- end-of-file (C source) -----------------------*/
4301 4513

Diff Legend

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