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

Diff Legend

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