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.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <cwchar>
58#include <csignal> 63#include <csignal>
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63
64// exception thrown when the command parser runs out of input data
65class out_of_input { } out_of_input;
66 68
67#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
68 70
69#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
70#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
118 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 122 XK_Print, 0x2399,
121 123
122 XK_space, 0x2423, 124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
124 0, 134 0,
125}; 135};
126 136
127void 137void
128rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
129{ 139{
130 x = Pixel2Col (x); 140 x = Pixel2Col (x);
131 y = Pixel2Row (y); 141 y = Pixel2Row (y);
132 142
133 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 145 return;
136 146
137 for (;;) 147 for (;;)
138 { 148 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
140 152
141 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
142 { 154 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
146 break; 157 break;
147 } 158 }
148 159
149 x--; 160 x--;
150 } 161 }
151
152} 162}
153#endif
154 163
155#if ENABLE_OVERLAY
156void 164void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 166{
159 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 170 int len;
163 171
172 fname = rxvt_utf8towcs (f->name);
173
164#if ENABLE_COMBINING 174# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
166 { 176 {
167 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
170 } 180 }
171 else 181 else
172#endif 182# endif
173 { 183 {
174 ch2 = ch; 184 ch2 = ch;
175 185
176 alloc = 0; 186 alloc = 0;
177 chr = &ch2; 187 chr = &ch2;
178 len = 1; 188 len = 1;
179 } 189 }
180 190
181 int width = strlen (f->name); 191 char attr[80]; // plenty
182 192
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
184 215
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 217
187 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
188 { 219 {
… …
191 ch = *chr++; 222 ch = *chr++;
192 223
193 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
196#if !UNICODE3 227# if !UNICODE3
197 if (ch >= 0x10000) 228 if (ch >= 0x10000)
198 ch = 0xfffd; 229 ch = 0xfffd;
199#endif 230# endif
200 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
201 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
202 } 235 }
203 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
242 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 243 scr_overlay_set (0, len + 1, fname);
205 244
245 free (fname);
246
206#if ENABLE_COMBINING 247# if ENABLE_COMBINING
207 if (alloc) 248 if (alloc)
208 delete [] alloc; 249 delete [] alloc;
209#endif 250# endif
210} 251}
211#endif 252#endif
212 253
213void 254void
214rxvt_term::commit_iso14755 () 255rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 272 mb[0] = ch[0];
232 len = 1; 273 len = 1;
233 } 274 }
234 275
235 if (len > 0) 276 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 277 tt_write (mb, len);
237 else 278 else
238 scr_bell (); 279 scr_bell ();
239 } 280 }
240 281
241 iso14755buf = 0; 282 iso14755buf = 0;
… …
265rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
266{ 307{
267 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
268 unsigned int newlen; 309 unsigned int newlen;
269 KeySym keysym; 310 KeySym keysym;
270#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */
272#endif
273 int valid_keysym; 311 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
275 313
276 /* 314 /*
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 316 * escape sequence to toggle the Keypad.
279 * 317 *
280 * Always permit `shift' to override the current setting 318 * Always permit `shift' to override the current setting
281 */ 319 */
282 shft = (ev.state & ShiftMask); 320 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 321 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 322 meta = ev.state & ModMetaMask;
285 323
286 if (numlock_state || (ev.state & ModNumLockMask)) 324 if (numlock_state || (ev.state & ModNumLockMask))
287 { 325 {
288 numlock_state = (ev.state & ModNumLockMask); 326 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 327 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 335 Status status_return;
298 336
299#if 0 337#if 0
300#ifdef X_HAVE_UTF8_STRING 338#ifdef X_HAVE_UTF8_STRING
301 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 339 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 340 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 341 KBUFSZ, &keysym, &status_return);
304 else 342 else
305#endif 343#endif
306#endif 344#endif
307 { 345 {
… …
309 347
310 // the XOpenIM manpage lies about hardcoding the locale 348 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 349 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 350 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 351 SET_LOCALE (rs[Rs_imLocale]);
352
314 // assume wchar_t == unicode or better 353 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 354 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 355 KBUFSZ, &keysym, &status_return);
356
317 if (rs[Rs_imLocale]) 357 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 358 SET_LOCALE (locale);
319 359
320 if (status_return == XLookupChars 360 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 361 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 382 || status_return == XLookupBoth;
343 } 383 }
344 else 384 else
345#endif 385#endif
346 { 386 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 387 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 388 valid_keysym = keysym != NoSymbol;
349 } 389 }
350 390
351 if (valid_keysym) 391 if (valid_keysym)
352 { 392 {
353#ifdef KEYSYM_RESOURCE 393#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 394 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 395 return;
356#endif 396#endif
357 397
358 if (TermWin.saveLines) 398 if (saveLines)
359 { 399 {
360#ifdef UNSHIFTED_SCROLLKEYS 400#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 401 if (!ctrl && !meta)
362#else 402#else
363 if (IS_SCROLL_MOD) 403 if (IS_SCROLL_MOD)
364#endif 404#endif
365 { 405 {
366 int lnsppg; 406 int lnsppg;
367 407
368#ifdef PAGING_CONTEXT_LINES 408#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 409 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 410#else
371 lnsppg = TermWin.nrow * 4 / 5; 411 lnsppg = nrow * 4 / 5;
372#endif 412#endif
373 if (keysym == XK_Prior) 413 if (keysym == XK_Prior)
374 { 414 {
375 scr_page (UP, lnsppg); 415 scr_page (UP, lnsppg);
376 return; 416 return;
… …
404 scr_move_to (0, 1); 444 scr_move_to (0, 1);
405 return; 445 return;
406 } 446 }
407 else if (keysym == XK_End) 447 else if (keysym == XK_End)
408 { 448 {
409 scr_move_to (1, 0); 449 scr_move_to (1, 1);
410 return; 450 return;
411 } 451 }
412 } 452 }
413#endif 453#endif
414 } 454 }
… …
425 { 465 {
426 switch (keysym) 466 switch (keysym)
427 { 467 {
428 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
429 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
430 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
431 return; 471 return;
432#if TODO 472#if TODO
433 /* rxvt extras */ 473 /* rxvt extras */
434 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
435 change_font (FONT_UP); 475 change_font (FONT_UP);
… …
513 else 553 else
514 strcpy (kbuf, key_backspace); 554 strcpy (kbuf, key_backspace);
515 break; 555 break;
516#endif 556#endif
517#ifndef NO_DELETE_KEY 557#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior
559 case XK_KP_Delete:
560 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
562 {
563 strcpy (kbuf, "\033On");
564 break;
565 }
566 /* FALLTHROUGH */
567# endif
518 case XK_Delete: 568 case XK_Delete:
519 strcpy (kbuf, key_delete); 569 strcpy (kbuf, key_delete);
520 break; 570 break;
521#endif 571#endif
522 case XK_Tab: 572 case XK_Tab:
… …
625#ifdef XK_KP_Begin 675#ifdef XK_KP_Begin
626 case XK_KP_Begin: 676 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 677 strcpy (kbuf, "\033Ou");
628 break; 678 break;
629 679
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 680#endif
638 case XK_KP_F1: /* "\033OP" */ 681 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 682 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 683 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 684 case XK_KP_F4: /* "\033OS" */
… …
673 break; 716 break;
674 717
675 case XK_Find: 718 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 719 strcpy (kbuf, "\033[1~");
677 break; 720 break;
721
722#ifdef XK_KP_End
723 case XK_KP_Insert:
724 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
726 {
727 strcpy (kbuf, "\033Op");
728 break;
729 }
730 /* FALLTHROUGH */
731#endif
678 case XK_Insert: 732 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 733 strcpy (kbuf, "\033[2~");
680 break; 734 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 735#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 736 case DXK_Remove:
… …
802 { 856 {
803#ifdef META8_OPTION 857#ifdef META8_OPTION
804 /* set 8-bit on */ 858 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
806 { 860 {
807 unsigned char *ch; 861 char *ch;
808 862
809 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 864 *ch |= 0x80;
811 865
812 meta = 0; 866 meta = 0;
… …
814#endif 868#endif
815 /* nil */ ; 869 /* nil */ ;
816 } 870 }
817 } 871 }
818 872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
875
819 if (len <= 0) 876 if (len <= 0)
820 return; /* not mapped */ 877 return; /* not mapped */
821 878
822 if (options & Opt_scrollTtyKeypress) 879 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 880 if (view_start)
824 { 881 {
825 TermWin.view_start = 0; 882 view_start = 0;
826 want_refresh = 1; 883 want_refresh = 1;
827 } 884 }
828 885
829 /* 886 /*
830 * these modifications only affect the static keybuffer 887 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 902#ifdef META8_OPTION
846 && meta_char == C0_ESC 903 && meta_char == C0_ESC
847#endif 904#endif
848 ) 905 )
849 { 906 {
850 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
851 tt_write (&ch, 1); 908 tt_write (&ch, 1);
852 } 909 }
853 910
854#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */
856 unsigned char *p;
857 int i;
858
859 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
860 for (i = 0, p = kbuf; i < len; i++, p++)
861 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
862 fprintf (stderr, "'\n");
863#endif /* DEBUG_CMD */
864 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
865} 912}
866/*}}} */ 913/*}}} */
867 914
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */
871unsigned int 916unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 918{
874 unsigned int n, s; 919 unsigned int n, s;
875 920
876 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 959 }
915#endif 960#endif
916 961
917 if (want_refresh) 962 if (want_refresh)
918 { 963 {
964 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
965 {
966 int row = view_start;
967 int end_row = row + nrow;
968
969 while (row > top_row && ROW (row - 1).is_longer ())
970 --row;
971
972 do
973 {
974 int start_row = row;
975 line_t *l;
976
977 do
978 {
979 l = &ROW (row++);
980
981 if (!(l->f & LINE_FILTERED))
982 {
983 // line not filtered, mark it as filtered
984 l->f |= LINE_FILTERED;
985 while (l->is_longer ())
986 {
987 l = &ROW (row++);
988 l->f |= LINE_FILTERED;
989 }
990
991 // and filter it
992 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
993
994 break;
995 }
996 }
997 while (l->is_longer () && row < end_row);
998 }
999 while (row < end_row);
1000 }
1001
919 scr_refresh (refresh_type); 1002 scr_refresh ();
920 scrollbar_show (1); 1003 scrollbar_show (1);
921#ifdef USE_XIM 1004#ifdef USE_XIM
922 IMSendSpot (); 1005 IMSendSpot ();
923#endif 1006#endif
924 } 1007 }
… …
927} 1010}
928 1011
929void 1012void
930rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
931{ 1014{
932 SET_R (this); 1015 make_current ();
933 SET_LOCALE (locale);
934 1016
935 display->flush (); 1017 display->flush ();
936 1018
937 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1021}
940 1022
941void 1023void
942rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
943{ 1025{
944 SET_R (this); 1026 make_current ();
945 SET_LOCALE (locale);
946 1027
947 refresh_limit = 1; 1028 refresh_limit = 1;
948 refresh_count = 0; 1029 refresh_count = 0;
949 flush (); 1030 flush ();
950} 1031}
… …
954rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
955{ 1036{
956 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
957 want_refresh = 1; 1038 want_refresh = 1;
958 1039
959 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
960} 1041}
961#endif 1042#endif
962 1043
963#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
964void 1045void
… …
978rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
979{ 1060{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 { 1063 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1064 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
986 } 1066 }
987} 1067}
988#endif 1068#endif
… …
992rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
993{ 1073{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 { 1075 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1077 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 } 1079 }
1001} 1080}
1002#endif 1081#endif
… …
1007{ 1086{
1008 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1090 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1091 if (view_start == top_row || view_start == 0)
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1092 mouse_slip_wheel_speed = 0;
1015 1093
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1094 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1096 }
1020} 1097}
1021#endif 1098#endif
1022 1099
1100#if HAVE_SCHED_YIELD
1101static struct event_handler
1102{
1103 check_watcher cw_yield;
1104
1105 void yield (check_watcher &w)
1106 {
1107 sched_yield ();
1108 w.stop ();
1109 }
1110
1111 event_handler ()
1112 : cw_yield (this, &event_handler::yield)
1113 {
1114 }
1115} event_handler;
1116#endif
1117
1023bool 1118bool
1024rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
1025{ 1120{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1122
1028 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
1029 { 1124 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1125 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1126 n = 0;
1032 } 1127 }
1033 1128
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1037 1132
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1039 1134
1040 if (n > 0) 1135 if (r > 0)
1041 { 1136 {
1042 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
1043 return true; 1138 return true;
1044 } 1139 }
1045 else if (n < 0 && errno != EAGAIN) 1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 {
1142#if HAVE_SCHED_YIELD
1143 if (display->is_local)
1144 event_handler.cw_yield.start ();
1145#endif
1146 }
1147 else
1148 {
1149 pty_ev.stop ();
1150
1151 if (!OPTION (Opt_hold))
1046 destroy (); 1152 destroy ();
1153 }
1047 1154
1048 return false; 1155 return false;
1049} 1156}
1050 1157
1051void 1158void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1053{ 1160{
1054 SET_R (this); 1161 make_current ();
1055 SET_LOCALE (locale);
1056 1162
1057 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1058 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1165 while (pty_fill ())
1060 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1065} 1171}
1066 1172
1067void 1173void
1068rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1069{ 1175{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1071 recolour_cursor (); 1177 recolour_cursor ();
1072 1178
1073#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1180 hidden_pointer = 0;
1075 1181
1076 if (options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1184#endif
1079} 1185}
1080 1186
1081#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1082void 1188void
1083rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1084{ 1190{
1085 if (! (options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1086 return; 1192 return;
1087 1193
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1089 XFlush (display->display); 1195 XFlush (xdisp);
1090 1196
1091 hidden_pointer = 1; 1197 hidden_pointer = 1;
1092} 1198}
1093 1199
1094void 1200void
1095rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1096{ 1202{
1097 SET_R (this); 1203 make_current ();
1098 SET_LOCALE (locale);
1099 1204
1100 pointer_blank (); 1205 pointer_blank ();
1101} 1206}
1102#endif 1207#endif
1103 1208
… …
1168 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1169 (32 + x + 1), 1274 (32 + x + 1),
1170 (32 + y + 1)); 1275 (32 + y + 1));
1171} 1276}
1172 1277
1173#ifdef USING_W11LIB
1174void
1175rxvt_W11_process_x_event (XEvent *ev)
1176{
1177 rxvt_t *r = rxvt_get_r ();
1178
1179 x_cb (*ev);
1180}
1181#endif
1182
1183/*{{{ process an X event */ 1278/*{{{ process an X event */
1184void 1279void
1185rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1186{ 1281{
1187 SET_R (this); 1282 make_current ();
1188 SET_LOCALE (locale);
1189 1283
1190#if defined(CURSOR_BLINK) 1284 dLocal (Display *, xdisp);
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1285
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 if (ev.xany.window == vt
1200 } 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1201#endif 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return;
1202 1290
1203#if defined(POINTER_BLANK) 1291 // for XQueryPointer
1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1205 {
1206 if (ev.type == MotionNotify
1207 || ev.type == ButtonPress
1208 || ev.type == ButtonRelease)
1209 if (hidden_pointer)
1210 pointer_unblank ();
1211
1212 if (ev.type == KeyPress && hidden_pointer == 0)
1213 pointer_blank ();
1214 }
1215#endif
1216
1217 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1294 unsigned int unused_mask;
1220 1295
1221 switch (ev.type) 1296 switch (ev.type)
… …
1228 1303
1229 break; 1304 break;
1230 1305
1231 case KeyRelease: 1306 case KeyRelease:
1232 { 1307 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1234 KeySym ks; 1309 KeySym keysym;
1235 1310
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif 1312#endif
1238 1313
1239#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support 1315 // ISO 14755 support
1241 if (iso14755buf) 1316 if (iso14755buf)
… …
1246# endif 1321# endif
1247# if ISO_14755 1322# if ISO_14755
1248 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1249 // first: controls 1324 // first: controls
1250 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1253 { 1328 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1255 commit_iso14755 (); 1330 commit_iso14755 ();
1256 return; // case-break; 1331 goto skip_switch;
1257 } 1332 }
1258 1333
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks) 1335 if (i[0] == keysym)
1261 { 1336 {
1262 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 (); 1338 commit_iso14755 ();
1264 return; // case-break; 1339 goto skip_switch;
1265 } 1340 }
1266 1341
1267 scr_bell (); 1342 scr_bell ();
1268# endif 1343# endif
1269 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1288 else 1363 else
1289 iso14755buf = 0; 1364 iso14755buf = 0;
1290 } 1365 }
1291#endif 1366#endif
1292 1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1297 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1298#endif 1377#endif
1299 break; 1378 break;
1300 } 1379 }
1301 1380
… …
1307 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1308 break; 1387 break;
1309 1388
1310 case ClientMessage: 1389 case ClientMessage:
1311 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1313 destroy ();
1314#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink))
1320 { 1392 {
1321 /* Get Dnd data */ 1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1322 Atom ActualType; 1394 {
1323 int ActualFormat; 1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1324 unsigned char *data; 1396 {
1325 unsigned long Size, RemainingBytes; 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1326 1398 {
1327 XGetWindowProperty (display->display, display->root, 1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1328 xa[XA_DNDSELECTION], 1400 destroy ();
1329 0L, 1000000L, 1401 }
1330 False, AnyPropertyType, 1402#if ENABLE_EWMH
1331 &ActualType, &ActualFormat, 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1332 &Size, &RemainingBytes, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1333 &data); 1406 &ev);
1334 set_string_property (XA_CUT_BUFFER0, data); 1407#endif
1335 XFree (data); 1408 }
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1409 }
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1410#if ENABLE_XEMBED
1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1412 {
1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1414 focus_in ();
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out ();
1417 }
1418#endif
1338 } 1419 }
1339#endif /* OFFIX_DND */
1340 break; 1420 break;
1341 1421
1342 case MappingNotify: 1422 case MappingNotify:
1343 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1344 break; 1424 break;
… …
1367 break; 1447 break;
1368 } 1448 }
1369 break; 1449 break;
1370 1450
1371 case FocusIn: 1451 case FocusIn:
1372 if (!TermWin.focus) 1452 focus_in ();
1453 break;
1454
1455 case FocusOut:
1456 focus_out ();
1457 break;
1458
1459 case ConfigureNotify:
1460 if (ev.xconfigure.window == parent[0])
1373 { 1461 {
1374 TermWin.focus = 1; 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 { 1463 ;
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394 1464
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1466 {
1444 seen_resize = 1; 1467 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1469 }
1447 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1450 check_our_parents (); 1475 check_our_parents ();
1451#endif 1476#endif
1452 } 1477 }
1453 break; 1478 break;
1454 1479
1455 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1457 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459 1485
1460 break; 1486 break;
1461 1487
1462 case SelectionClear: 1488 case SelectionClear:
1463 selection_clear (); 1489 selection_clear ();
… …
1470 1496
1471 case SelectionRequest: 1497 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1473 break; 1499 break;
1474 1500
1501 case MapNotify:
1502 mapped = 1;
1503#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1505#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break;
1508
1475 case UnmapNotify: 1509 case UnmapNotify:
1476 TermWin.mapped = 0; 1510 mapped = 0;
1477#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1479#endif 1513#endif
1480 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1481
1482 case MapNotify:
1483 TermWin.mapped = 1;
1484#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif
1487 break; 1515 break;
1488 1516
1489#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1490 case ReparentNotify: 1518 case ReparentNotify:
1491 rootwin_cb (ev); 1519 rootwin_cb (ev);
1492 break; 1520 break;
1493#endif /* TRANSPARENT */ 1521#endif /* TRANSPARENT */
1494 1522
1495 case GraphicsExpose: 1523 case GraphicsExpose:
1496 case Expose: 1524 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1525 if (ev.xany.window == vt)
1498 { 1526 {
1499 do 1527 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1503 1531
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1533
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1509 1537
1510 scr_refresh (refresh_type); 1538 want_refresh = 1;
1511 } 1539 }
1512 else 1540 else
1513 { 1541 {
1514 XEvent unused_event; 1542 XEvent unused_event;
1515 1543
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1517 ; 1545 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1547 ;
1520 1548
1521 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1522 { 1550 {
1523 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1524 scrollbar_show (0); 1552 scrollbar_show (0);
1525 } 1553 }
1526#ifdef MENUBAR
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose ();
1529#endif
1530 1554
1531#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1534#endif 1558#endif
1535 } 1559 }
1536 break; 1560 break;
1537 1561
1538 case MotionNotify: 1562 case MotionNotify:
1539#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1540 if (hidden_pointer) 1564 if (hidden_pointer)
1541 pointer_unblank (); 1565 pointer_unblank ();
1542#endif 1566#endif
1543#if MENUBAR
1544 if (isMenuBarWindow (ev.xany.window))
1545 {
1546 menubar_control (ev.xbutton);
1547 break;
1548 }
1549#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1568 break;
1552 1569
1553 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1554 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1576 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1558 ; 1578 ;
1559 1579
1560 XQueryPointer (display->display, TermWin.vt, 1580 XQueryPointer (xdisp, vt,
1561 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1584 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1577#endif 1597#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1598 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1599 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1600
1581#ifdef SELECTION_SCROLLING 1601#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1602 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1603 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1604 {
1585 int dist; 1605 int dist;
1586 1606
1587 /* don't clobber the current delay if we are 1607 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1608 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1616 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1617 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1618 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1619
1600 /* calc number of lines to scroll */ 1620 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1621 if (ev.xbutton.y < int_bwidth)
1602 { 1622 {
1603 scroll_selection_dir = UP; 1623 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1624 dist = int_bwidth - ev.xbutton.y;
1605 } 1625 }
1606 else 1626 else
1607 { 1627 {
1608 scroll_selection_dir = DN; 1628 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1629 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1630 }
1611 1631
1612 scroll_selection_lines = Pixel2Height (dist) 1632 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1633 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1634 + 1;
1615 MIN_IT (scroll_selection_lines, 1635 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1636 SELECTION_SCROLL_MAX_LINES);
1617 } 1637 }
1618 else 1638 else
1619 { 1639 {
1620 /* we are within the text window, so we 1640 /* we are within the text window, so we
… …
1629#endif 1649#endif
1630 } 1650 }
1631 } 1651 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1653 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1635 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1636 ; 1656 ;
1637 1657
1638 XQueryPointer (display->display, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1639 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1662 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1664 scrollbar_size ());
1645 scr_refresh (refresh_type); 1665 want_refresh = 1;
1646 refresh_limit = 0; 1666 refresh_limit = 0;
1647 scrollbar_show (1); 1667 scrollbar_show (1);
1648 } 1668 }
1649 break; 1669 break;
1650 } 1670 }
1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1700}
1701
1702void
1703rxvt_term::focus_in ()
1704{
1705 if (!focus)
1706 {
1707 focus = 1;
1708 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1712#if USE_XIM
1713 if (Input_Context != NULL)
1714 {
1715 IMSetStatusPosition ();
1716 XSetICFocus (Input_Context);
1717 }
1718#endif
1719#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif
1723#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade])
1725 {
1726 pix_colors = pix_colors_focused;
1727 scr_recolour ();
1728 }
1729#endif
1730 }
1731}
1732
1733void
1734rxvt_term::focus_out ()
1735{
1736 if (focus)
1737 {
1738 focus = 0;
1739 want_refresh = 1;
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1742
1743#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf)
1745 {
1746 iso14755buf = 0;
1747# if ENABLE_OVERLAY
1748 scr_overlay_off ();
1749# endif
1750 }
1751#endif
1752#if USE_XIM
1753 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context);
1755#endif
1756#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink))
1758 cursor_blink_ev.stop ();
1759 hidden_cursor = 0;
1760#endif
1761#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade])
1763 {
1764 pix_colors = pix_colors_unfocused;
1765 scr_recolour ();
1766 }
1767#endif
1768 }
1651} 1769}
1652 1770
1653#if TRANSPARENT 1771#if TRANSPARENT
1654void 1772void
1655rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1774{
1657 SET_R (this); 1775 make_current ();
1658 SET_LOCALE (locale);
1659 1776
1660 switch (ev.type) 1777 switch (ev.type)
1661 { 1778 {
1662 case PropertyNotify: 1779 case PropertyNotify:
1663 /* 1780 /*
… …
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669 return; 1786 return;
1670 1787
1671 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1672 case ReparentNotify: 1789 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1675 break; 1792 break;
1676 } 1793 }
1677} 1794}
1678#endif 1795#endif
… …
1681rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1682{ 1799{
1683 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1684 1801
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1686 if (!bypass_keystate) 1804 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1806
1689 /* 1807 /*
1690 * VT window processing of button press 1808 * VT window processing of button press
1691 */ 1809 */
1692 if (ev.window == TermWin.vt) 1810 if (ev.window == vt)
1693 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1694#if ISO_14755 1815#if ISO_14755
1695 // 5.4 1816 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1818 {
1698 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1712 { 1833 {
1713 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1714 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1715 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1716 { 1838 {
1717 /* only report double clicks */ 1839 /* only report double clicks */
1718 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1719 mouse_report (ev); 1841 mouse_report (ev);
… …
1751#else 1873#else
1752 selection.rect = false; 1874 selection.rect = false;
1753#endif 1875#endif
1754 1876
1755 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1879 {
1758 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1760 else 1882 else
1761 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1902 case Button3: 2024 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2025 if (scrollBar.style != R_SB_XTERM)
1904 { 2026 {
1905 if (scrollbar_above_slider (ev.y)) 2027 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2029 scr_page (UP, nrow - 1);
1908# else 2030# else
1909 scr_page (UP, TermWin.nrow / 4); 2031 scr_page (UP, nrow / 4);
1910# endif 2032# endif
1911 else if (scrollbar_below_slider (ev.y)) 2033 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2034# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2035 scr_page (DN, nrow - 1);
1914# else 2036# else
1915 scr_page (DN, TermWin.nrow / 4); 2037 scr_page (DN, nrow / 4);
1916# endif 2038# endif
1917 else 2039 else
1918 scrollBar.setMotion (); 2040 scrollBar.setMotion ();
1919 } 2041 }
1920 else 2042 else
1921 { 2043 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2044 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2045 (nrow
1924 * scrollbar_position (ev.y) 2046 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2047 / scrollbar_size ()));
1926 } 2048 }
1927 2049
1928 break; 2050 break;
1929 } 2051 }
1930 } 2052 }
2053
1931 return; 2054 return;
1932 } 2055 }
1933#if MENUBAR
1934 /*
1935 * Menubar window processing of button press
1936 */
1937 if (isMenuBarWindow (ev.window))
1938 menubar_control (ev);
1939#endif
1940} 2056}
1941 2057
1942void 2058void
1943rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
1944{ 2060{
… …
1950 2066
1951 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1952 { 2068 {
1953 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1954 scrollbar_show (0); 2070 scrollbar_show (0);
1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1956 refresh_type &= ~SMOOTH_REFRESH;
1957#endif
1958 } 2071 }
1959 2072
1960#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
1963#endif 2076#endif
1964 2077
1965 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1966 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
1967#if ISO_14755 2083#if ISO_14755
1968 // 5.4 2084 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2086 return;
1971#endif 2087#endif
2088
1972 if (reportmode) 2089 if (reportmode)
1973 { 2090 {
1974 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1975 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1976 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2006 { 2123 {
2007 case Button1: 2124 case Button1:
2008 case Button3: 2125 case Button3:
2009 selection_make (ev.time); 2126 selection_make (ev.time);
2010 break; 2127 break;
2128
2011 case Button2: 2129 case Button2:
2012 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2013 break; 2132 break;
2133
2014#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2015 case Button4: 2135 case Button4:
2016 case Button5: 2136 case Button5:
2017 { 2137 {
2018 int i; 2138 int i;
… …
2020 2140
2021 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2022 2142
2023 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2024 i = 1; 2144 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2146 i = nrow - 1;
2027 else 2147 else
2028 i = 5; 2148 i = 5;
2029 2149
2030# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2151 if (ev.state & ControlMask)
2032 { 2152 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2156
2037 if (slip_wheel_ev.at < NOW) 2157 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2159
2040 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2041 } 2161 }
2042 else 2162 else
2043 { 2163 {
2044# endif 2164# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2165 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2166 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2058 } 2168 }
2059#endif 2169# endif
2060 } 2170 }
2061 break; 2171 break;
2062#endif 2172#endif
2063 } 2173 }
2064 } 2174 }
2065#ifdef MENUBAR
2066 else if (isMenuBarWindow (ev.window))
2067 menubar_control (ev);
2068#endif
2069} 2175}
2070 2176
2071#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2072#if TINTING 2178#if TINTING
2073/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2074 2180
2075typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2076 2182
2077void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2078{ 2184{
2079 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2080 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2190 int i;
2085 2191
2086 Visual* visual = display->visual; 2192 Visual *visual = term->visual;
2087 2193
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2195
2090 /* for convenience */ 2196 /* for convenience */
2091 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2315 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2317 2423
2318 pchanged = 0; 2424 pchanged = 0;
2319 2425
2320 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2322 2428
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2325 2431
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2327 2433
2328 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2329 { 2435 {
2330 if (am_transparent) 2436 if (am_transparent)
2331 { 2437 {
2332 pchanged = 1; 2438 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2335 } 2441 }
2336 2442
2337 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2338 } 2444 }
2339 2445
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2447 XSync (xdisp, False);
2342 2448
2343 /* 2449 /*
2344 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2347 */ 2453 */
2348 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2352 2458
2353 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2358 2464
2359 if (!i || prop == NULL 2465 if (!i || prop == NULL
2360#if TINTING 2466#if TINTING
… …
2379 Window cr; 2485 Window cr;
2380 XImage *image; 2486 XImage *image;
2381 GC gc; 2487 GC gc;
2382 XGCValues gcvalue; 2488 XGCValues gcvalue;
2383 2489
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2494 nx = ny = 0;
2389 2495
… …
2399 nh += sy; 2505 nh += sy;
2400 ny = -sy; 2506 ny = -sy;
2401 sy = 0; 2507 sy = 0;
2402 } 2508 }
2403 2509
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2406 2512
2407 XSync (display->display, False); 2513 XSync (xdisp, False);
2408 allowedxerror = -1; 2514 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2516
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2519 allowedxerror = 0;
2414 2520
2415 if (image == NULL) 2521 if (image == NULL)
2416 { 2522 {
2417 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2418 { 2524 {
2419 pchanged = 1; 2525 pchanged = 1;
2420 if (TermWin.pixmap != None) 2526 if (pixmap != None)
2421 { 2527 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2528 XFreePixmap (xdisp, pixmap);
2423 TermWin.pixmap = None; 2529 pixmap = None;
2424 } 2530 }
2425 } 2531 }
2426 2532
2427 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2428 } 2534 }
2429 else 2535 else
2430 { 2536 {
2431 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2538 XFreePixmap (xdisp, pixmap);
2433 2539
2434#if TINTING 2540#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2542 {
2437 unsigned short rm, gm, bm; 2543 rxvt_rgba c;
2438 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2439 2545
2440 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused[Color_tint].get (this, c);
2441 2547
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2443 } 2549 }
2444#endif 2550#endif
2445 2551
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2447 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2556 XFreeGC (xdisp, gc);
2452 XDestroyImage (image); 2557 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2455 2560
2456 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2562 pchanged = 1;
2458 2563
2459 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2460 } 2565 }
2461 } 2566 }
2462 2567
2463 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2465 else 2570 else
2466 { 2571 {
2467 unsigned int n; 2572 unsigned int n;
2468 /* 2573 /*
2469 * InheritPixmap transparency 2574 * InheritPixmap transparency
2470 */ 2575 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2577 {
2473 oldp = TermWin.parent[i]; 2578 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2580 &parent[i], &list, &n);
2476 XFree (list); 2581 XFree (list);
2477 2582
2478 if (TermWin.parent[i] == display->root) 2583 if (parent[i] == display->root)
2479 { 2584 {
2480 if (oldp != None) 2585 if (oldp != None)
2481 pchanged = 1; 2586 pchanged = 1;
2482 2587
2483 break; 2588 break;
2484 } 2589 }
2485 2590
2486 if (oldp != TermWin.parent[i]) 2591 if (oldp != parent[i])
2487 pchanged = 1; 2592 pchanged = 1;
2488 } 2593 }
2489 2594
2490 n = 0; 2595 n = 0;
2491 2596
2492 if (pchanged) 2597 if (pchanged)
2493 { 2598 {
2494 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2495 { 2600 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2603 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2605 break;
2501 } 2606 }
2502 } 2607 }
2503 } 2608 }
2504 2609
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2611 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2614 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2511 } 2616 }
2512 else 2617 else
2513 { 2618 {
2514#if WAIT_FOR_WM
2515 /* wait (an arbitrary period) for the WM to do its thing
2516 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1);
2518#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2520 { 2620 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2523 } 2623 }
2524 2624
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2526 am_transparent = 1; 2626 am_transparent = 1;
2527 } 2627 }
2528 2628
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2630 parent[i] = None;
2531 } 2631 }
2532 2632
2533 if (scrollBar.win) 2633 if (scrollBar.win)
2534 { 2634 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2537 scrollbar_show (0); 2637 scrollbar_show (0);
2538 } 2638 }
2539 2639
2540 if (am_transparent) 2640 if (am_transparent)
… …
2552 2652
2553bool 2653bool
2554rxvt_term::cmd_parse () 2654rxvt_term::cmd_parse ()
2555{ 2655{
2556 bool flag = false; 2656 bool flag = false;
2557 unicode_t ch = NOCHAR; 2657 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2658 char *seq_begin; // remember start of esc-sequence here
2559 2659
2560 for (;;) 2660 for (;;)
2561 { 2661 {
2562 if (ch == NOCHAR) 2662 if (ch == NOCHAR)
2563 { 2663 {
2564 seq_begin = cmdbuf_ptr; 2664 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2665 ch = next_char ();
2566 }
2567 2666
2568 if (ch == NOCHAR) // TODO: improve 2667 if (ch == NOCHAR)
2569 break; 2668 break;
2669 }
2570 2670
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2671 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2672 {
2573 if (!seen_input) 2673 if (!seen_input)
2574 { 2674 {
… …
2578 // some window managers resize the window early, and these programs 2678 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2679 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2680 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2681 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2682 // resized.
2583 if (seen_resize) 2683 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2684 kill (-cmd_pid, SIGWINCH);
2585 } 2685 }
2586 2686
2587 /* Read a text string from the input buffer */ 2687 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2688 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2689 bool refreshnow = false;
2590 int nlines = 0; 2690 int nlines = 0;
2591 unicode_t *str = buf; 2691 wchar_t *str = buf;
2692 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2693
2593 for (;;) 2694 for (;;)
2594 { 2695 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2696 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2697 break;
2597 2698
2598 *str++ = ch; 2699 *str++ = ch;
2599 2700
2600 if (ch == C0_LF) 2701 if (ch == C0_LF || str >= eol)
2601 { 2702 {
2703 if (ch == C0_LF)
2602 nlines++; 2704 nlines++;
2705
2603 refresh_count++; 2706 refresh_count++;
2604 2707
2605 if (!(options & Opt_jumpScroll) 2708 if (!OPTION (Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2710 {
2608 refreshnow = true; 2711 refreshnow = true;
2712 refresh_count = 0;
2609 ch = NOCHAR; 2713 ch = NOCHAR;
2610 break; 2714 break;
2611 } 2715 }
2612 2716
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2717 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2718 if (nlines >= nrow - 1)
2615 { 2719 {
2720 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2721 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2616 scr_add_lines (buf, nlines, str - buf); 2722 scr_add_lines (buf, str - buf, nlines);
2723
2617 nlines = 0; 2724 nlines = 0;
2618 str = buf; 2725 str = buf;
2726 eol = str + min (ncol, UBUFSIZ);
2619 } 2727 }
2620 }
2621 2728
2622 if (str >= buf + UBUFSIZ) 2729 if (str >= eol)
2623 { 2730 {
2731 if (eol >= buf + UBUFSIZ)
2732 {
2624 ch = NOCHAR; 2733 ch = NOCHAR;
2625 break; 2734 break;
2735 }
2736 else
2737 eol = min (eol + ncol, buf + UBUFSIZ);
2738 }
2739
2626 } 2740 }
2627 2741
2628 seq_begin = cmdbuf_ptr; 2742 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2743 ch = next_char ();
2630 } 2744 }
2631 2745
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2632 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2633 2749
2634 /* 2750 /*
2635 * If there have been a lot of new lines, then update the screen 2751 * If there have been a lot of new lines, then update the screen
2636 * What the heck I'll cheat and only refresh less than every page-full. 2752 * What the heck I'll cheat and only refresh less than every page-full.
2637 * the number of pages between refreshes is refresh_limit, which 2753 * the number of pages between refreshes is refresh_limit, which
2638 * is incremented here because we must be doing flat-out scrolling. 2754 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2755 */
2640 if (refreshnow) 2756 if (refreshnow)
2641 { 2757 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++; 2759 refresh_limit++;
2644 else 2760 else
2645 { 2761 {
2646 flag = true; 2762 flag = true;
2647 scr_refresh (refresh_type); 2763 scr_refresh ();
2764 want_refresh = 1;
2648 } 2765 }
2649 } 2766 }
2650 2767
2651 } 2768 }
2652 else 2769 else
… …
2667 } 2784 }
2668 2785
2669 return flag; 2786 return flag;
2670} 2787}
2671 2788
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679}
2680
2681// read the next character 2789// read the next character
2682unicode_t 2790wchar_t
2683rxvt_term::next_char () 2791rxvt_term::next_char () NOTHROW
2684{ 2792{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2793 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2794 {
2687 // assume 7-bit to be ascii ALWAYS 2795 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2797 return *cmdbuf_ptr++;
2690 2798
2691 wchar_t wc; 2799 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2800 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2801
2694 if (len == (size_t)-2) 2802 if (len == (size_t)-2)
2695 { 2803 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2804 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2805 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2806 break;
2699 } 2807 }
2700 2808
2701 if (len == (size_t)-1) 2809 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2810 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2811
2704 // assume wchar == unicode 2812 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2813 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2814 return wc & UNICODE_MASK;
2707 } 2815 }
2708 2816
2709 return NOCHAR; 2817 return NOCHAR;
2710} 2818}
2819
2820// read the next octet
2821uint32_t
2822rxvt_term::next_octet () NOTHROW
2823{
2824 return cmdbuf_ptr < cmdbuf_endp
2825 ? (unsigned char)*cmdbuf_ptr++
2826 : NOCHAR;
2827}
2828
2829static class out_of_input out_of_input;
2711 2830
2712/* rxvt_cmd_getc () - Return next input character */ 2831/* rxvt_cmd_getc () - Return next input character */
2713/* 2832/*
2714 * Return the next input character after first passing any keyboard input 2833 * Return the next input character after first passing any keyboard input
2715 * to the command. 2834 * to the command.
2716 */ 2835 */
2717unicode_t 2836wchar_t
2718rxvt_term::cmd_getc () 2837rxvt_term::cmd_getc () THROW ((class out_of_input))
2719{ 2838{
2720 unicode_t c = next_char (); 2839 wchar_t c = next_char ();
2721 2840
2722 if (c == NOCHAR) 2841 if (c == NOCHAR)
2723 throw out_of_input; 2842 throw out_of_input;
2724 2843
2725 return c; 2844 return c;
2726} 2845}
2727 2846
2728unicode_t 2847uint32_t
2729rxvt_term::cmd_get8 () 2848rxvt_term::cmd_get8 () THROW ((class out_of_input))
2730{ 2849{
2731 unicode_t c = next_octet (); 2850 uint32_t c = next_octet ();
2732 2851
2733 if (c == NOCHAR) 2852 if (c == NOCHAR)
2734 throw out_of_input; 2853 throw out_of_input;
2735 2854
2736 return c; 2855 return c;
… …
2836 case C0_ESC: 2955 case C0_ESC:
2837 process_escape_seq (); 2956 process_escape_seq ();
2838 break; 2957 break;
2839 case C0_ENQ: /* terminal Status */ 2958 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 2959 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2960 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 2961 else
2844 tt_write ((unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 2963 break;
2847 case C0_BEL: /* bell */ 2964 case C0_BEL: /* bell */
2848 scr_bell (); 2965 scr_bell ();
2849 break; 2966 break;
2850 case C0_BS: /* backspace */ 2967 case C0_BS: /* backspace */
… …
2974 scr_charset_set (2, (unsigned int)cmd_getc ()); 3091 scr_charset_set (2, (unsigned int)cmd_getc ());
2975 break; 3092 break;
2976 case '+': 3093 case '+':
2977 scr_charset_set (3, (unsigned int)cmd_getc ()); 3094 scr_charset_set (3, (unsigned int)cmd_getc ());
2978 break; 3095 break;
2979#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
2980 case '6': 3097 case '6':
2981 scr_backindex (); 3098 scr_backindex ();
2982 break; 3099 break;
2983#endif 3100#endif
2984 case '7': 3101 case '7':
2985 scr_cursor (SAVE); 3102 scr_cursor (SAVE);
2986 break; 3103 break;
2987 case '8': 3104 case '8':
2988 scr_cursor (RESTORE); 3105 scr_cursor (RESTORE);
2989 break; 3106 break;
2990#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
2991 case '9': 3108 case '9':
2992 scr_forwardindex (); 3109 scr_forwardindex ();
2993 break; 3110 break;
2994#endif 3111#endif
2995 case '=': 3112 case '=':
… …
3005 break; 3122 break;
3006 3123
3007 /* 8.3.87: NEXT LINE */ 3124 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 3125 case C1_NEL: /* ESC E */
3009 { 3126 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 3127 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 3128 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 3129 }
3013 break; 3130 break;
3014 3131
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 3132 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 3133 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 3155 process_dcs_seq ();
3039 break; 3156 break;
3040 3157
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 3159 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 3161 break; /* steal obsolete ESC [ c */
3046 3162
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 3164 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 3165 process_csi_seq ();
… …
3158 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3159 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3160 if (arg[p] == -1) 3276 if (arg[p] == -1)
3161 arg[p] = ndef; 3277 arg[p] = ndef;
3162 3278
3163#ifdef DEBUG_CMD
3164 fprintf (stderr, "CSI ");
3165 for (p = 0; p < nargs; p++)
3166 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3167 fprintf (stderr, "%c\n", ch);
3168#endif
3169
3170 /* 3279 /*
3171 * private mode handling 3280 * private mode handling
3172 */ 3281 */
3173 if (priv) 3282 if (priv)
3174 { 3283 {
3175 switch (priv) 3284 switch (priv)
3176 { 3285 {
3177 case '>': 3286 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3180 break; 3298 break;
3181 case '?': 3299 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3302 break;
… …
3289 3407
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3408 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3409 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3410 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3411 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3412 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3413 break;
3296 3414
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3415 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3416 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3417 break;
3301 3418
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3419 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3420 process_sgr_mode (nargs, arg);
3304 break; 3421 break;
… …
3311 break; 3428 break;
3312 case 6: /* CPR requested */ 3429 case 6: /* CPR requested */
3313 scr_report_position (); 3430 scr_report_position ();
3314 break; 3431 break;
3315 case 7: /* unofficial extension */ 3432 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3433 if (OPTION (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3434 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3435 break;
3319 case 8: /* unofficial extension */ 3436 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3438 break;
… …
3388 break; 3505 break;
3389 case CSI_75: 3506 case CSI_75:
3390 scr_cursor (RESTORE); 3507 scr_cursor (RESTORE);
3391 break; 3508 break;
3392 3509
3393#if ENABLE_FRILLS 3510#if !ENABLE_MINIMAL
3394 case CSI_74: 3511 case CSI_74:
3395 process_window_ops (arg, nargs); 3512 process_window_ops (arg, nargs);
3396 break; 3513 break;
3397#endif 3514#endif
3398 3515
… …
3405 break; 3522 break;
3406 } 3523 }
3407} 3524}
3408/*}}} */ 3525/*}}} */
3409 3526
3410#if ENABLE_FRILLS 3527#if !ENABLE_MINIMAL
3411/* ARGSUSED */ 3528/* ARGSUSED */
3412void 3529void
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3531{
3415 int x, y; 3532 int x, y;
3416 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3417 Window wdummy; 3534 Window wdummy;
3535
3536 dLocal (Display *, xdisp);
3418 3537
3419 if (nargs == 0) 3538 if (nargs == 0)
3420 return; 3539 return;
3421 3540
3422 switch (args[0]) 3541 switch (args[0])
3423 { 3542 {
3424 /* 3543 /*
3425 * commands 3544 * commands
3426 */ 3545 */
3427 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3429 break; 3548 break;
3430 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3551 break;
3434 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3436 break; 3554 break;
3437 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3557 break;
3440 case 5: /* raise window */ 3558 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3442 break; 3560 break;
3443 case 6: /* lower window */ 3561 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3445 break; 3563 break;
3446 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3447 scr_touch (true); 3565 scr_touch (true);
3448 break; 3566 break;
3449 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3568 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3569 (unsigned int) (args[1] * fheight));
3452 break; 3570 break;
3453 3571
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3572 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3573 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3574 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3575 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3576 (unsigned int) (args[1] * fheight));
3459 break; 3577 break;
3460 3578
3461 3579
3462 /* 3580 /*
3463 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3464 */ 3582 */
3465 case 11: /* report window state */ 3583 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3586 break;
3469 case 13: /* report window position */ 3587 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3593 break;
3476 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3597 break;
3480 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3600 break;
3483 case 19: /* report window size (chars) */ 3601 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3603 break;
3486 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3487 { 3605 {
3488 char *s; 3606 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3609 XFree (s);
3492 } 3610 }
3493 break; 3611 break;
3494 case 21: /* report window title */ 3612 case 21: /* report window title */
3495 { 3613 {
3496 char *s; 3614 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3617 XFree (s);
3500 } 3618 }
3501 break; 3619 break;
3502 } 3620 }
3503} 3621}
… …
3506/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3507/* 3625/*
3508 * get input up until STRING TERMINATOR (or BEL) 3626 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3627 * ends_how is terminator used. returned input must be free()'d
3510 */ 3628 */
3511unsigned char * 3629char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3630rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3631{
3514 unicode_t ch; 3632 unicode_t ch;
3515 bool seen_esc = false; 3633 bool seen_esc = false;
3516 unsigned int n = 0; 3634 unsigned int n = 0;
… …
3535 else if (ch < 0x20) 3653 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3654 return NULL; /* other control character - exit */
3537 3655
3538 seen_esc = false; 3656 seen_esc = false;
3539 3657
3540 if (n >= sizeof (string) - 1) 3658 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3659 // stop at some sane length
3542 return NULL; 3660 return NULL;
3543 3661
3544 if (ch == C0_SYN) 3662 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3663 string[n++] = cmd_get8 ();
… …
3549 3667
3550 string[n++] = '\0'; 3668 string[n++] = '\0';
3551 3669
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3670 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3671
3554 return (unsigned char *)rxvt_wcstombs (string); 3672 return rxvt_wcstombs (string);
3555} 3673}
3556 3674
3557/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
3558/* 3676/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3677 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3678 */
3561void 3679void
3562rxvt_term::process_dcs_seq () 3680rxvt_term::process_dcs_seq ()
3563{ 3681{
3564 unsigned char *s; 3682 char *s;
3565 unicode_t eh; 3683 unicode_t eh;
3566 3684
3567 /* 3685 /*
3568 * Not handled yet 3686 * Not handled yet
3569 */ 3687 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3706 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3707 arg = arg * 10 + (ch - '0');
3590 3708
3591 if (ch == ';') 3709 if (ch == ';')
3592 { 3710 {
3593 unsigned char *s = get_to_st (eh); 3711 char *s = get_to_st (eh);
3594 3712
3595 if (s) 3713 if (s)
3596 { 3714 {
3597 process_xterm_seq (arg, (char *)s, eh); 3715 process_xterm_seq (arg, s, eh);
3598 free (s); 3716 free (s);
3599 } 3717 }
3600 } 3718 }
3601} 3719}
3602 3720
3603void 3721void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3723{
3606 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3607 { 3725 {
3608 unsigned short r, g, b; 3726 rxvt_rgba c;
3609 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3610 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3611 } 3735 }
3612 else 3736 else
3613 set_window_color (color, str); 3737 set_window_color (color, str);
3614} 3738}
3615 3739
3616/* 3740/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3742 */
3641void 3743void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3744rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3745{
3644 int changed = 0;
3645 int color; 3746 int color;
3646 char *buf, *name; 3747 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3749 int saveop = op;
3750
3751 dLocal (Display *, xdisp);
3649 3752
3650 assert (str != NULL); 3753 assert (str != NULL);
3651 switch (op) 3754 switch (op)
3652 { 3755 {
3653 case XTerm_name: 3756 case XTerm_name:
… …
3669 unsigned long bytes_after; 3772 unsigned long bytes_after;
3670 unsigned char *value = 0; 3773 unsigned char *value = 0;
3671 const char *str = ""; 3774 const char *str = "";
3672 3775
3673 if (prop 3776 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3781 && actual_type != None
3679 && actual_format == 8) 3782 && actual_format == 8)
3680 str = (const char *)(value); 3783 str = (const char *)(value);
3681 3784
3682 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3683 3786
3684 XFree (value); 3787 XFree (value);
3685 } 3788 }
3686 else 3789 else
3687 { 3790 {
… …
3691 { 3794 {
3692 *eq = 0; 3795 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3694 } 3797 }
3695 else 3798 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3697 display->atom (str)); 3800 display->atom (str));
3698 } 3801 }
3699 break; 3802 break;
3700 3803
3701 case XTerm_Color: 3804 case XTerm_Color:
… …
3703 { 3806 {
3704 if ((name = strchr (buf, ';')) == NULL) 3807 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3808 break;
3706 3809
3707 *name++ = '\0'; 3810 *name++ = '\0';
3708 color = atoi (buf); 3811 color = atoi (buf) + minCOLOR;
3709 3812
3710 if (color < 0 || color >= TOTAL_COLORS) 3813 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3814 break;
3712 3815
3713 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3817 *buf++ = '\0';
3715 3818
3716 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3717 {
3718 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 }
3722 else
3723 set_window_color (color + minCOLOR, name);
3724 } 3820 }
3725 break; 3821 break;
3726 case XTerm_Color00: 3822 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3728 break; 3824 break;
3729 case XTerm_Color01: 3825 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3731 break; 3827 break;
3732#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3735 break; 3831 break;
3736#endif 3832#endif
3737 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3738 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3739 break; 3835 break;
3740 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3742 break; 3838 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break;
3753 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3842 break;
3843 case Rxvt_Color_BD:
3844 case URxvt_Color_BD:
3845 process_color_seq (op, Color_BD, str, resp);
3846 break;
3847 case Rxvt_Color_UL:
3848 case URxvt_Color_UL:
3849 process_color_seq (op, Color_UL, str, resp);
3850 break;
3851 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp);
3755 break; 3853 break;
3756#endif 3854#endif
3757#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3856 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3760 check_our_parents (); 3858 check_our_parents ();
3761 if (am_transparent) 3859 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3763 break; 3861 break;
3764#endif 3862#endif
3765 3863
3766 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3767 if (*str != ';') 3866 if (*str != ';')
3768 { 3867 {
3769#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true); 3871 scr_touch (true);
3872#endif
3774 } 3873 }
3874
3875 int changed = 0;
3876
3775 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3776 { 3878 {
3777 str++; 3879 str++;
3778#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3780#endif 3882#endif
3781 } 3883 }
3782 3884
3783 if (changed) 3885 if (changed)
3784 { 3886 {
3785#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3888 resize_pixmap ();
3787#endif
3788 scr_touch (true); 3889 scr_touch (true);
3890#endif
3789 } 3891 }
3892 }
3790 break; 3893 break;
3791 3894
3792 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3794 break; 3897 break;
3795 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3797 break; 3900 break;
3798 3901
3799 case XTerm_logfile: 3902 case XTerm_logfile:
3800 // TODO, when secure mode? 3903 // TODO, when secure mode?
3801 break; 3904 break;
3802 3905
3906#if 0
3907 case Rxvt_dumpscreen: /* no error notices */
3908 {
3909 int fd;
3910 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3911 {
3912 scr_dump (fd);
3913 close (fd);
3914 }
3915 }
3916 break;
3917#endif
3803 case XTerm_font: 3918 case XTerm_font:
3804 op = URxvt_font; 3919 op = URxvt_font;
3805 case URxvt_font: 3920 case URxvt_font:
3806#if ENABLE_STYLES 3921#if ENABLE_STYLES
3807 case URxvt_boldFont: 3922 case URxvt_boldFont:
3808 case URxvt_italicFont: 3923 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3924 case URxvt_boldItalicFont:
3810#endif 3925#endif
3811 if (query) 3926 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3927 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3929 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3930 resp);
3816 else 3931 else
3817 { 3932 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3933 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3934
… …
3821 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3822 set_fonts (); 3937 set_fonts ();
3823 } 3938 }
3824 break; 3939 break;
3825 3940
3826#if ENABLE_FRILLS 3941 case URxvt_version:
3827 case XTerm_locale:
3828 if (query) 3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3949#if !ENABLE_MINIMAL
3950 case URxvt_locale:
3951 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3830 else 3953 else
3831 { 3954 {
3832 set_locale (str); 3955 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3957 init_xlocale ();
3836# endif
3837 } 3958 }
3838 break; 3959 break;
3839#endif
3840 3960
3841#ifdef MENUBAR 3961 case URxvt_view_up:
3842 case XTerm_Menu: 3962 case URxvt_view_down:
3843 if (options & Opt_insecure) 3963 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 scr_erase_savelines ();
3970 }
3971
3845 break; 3972 break;
3846#endif 3973#endif
3847#if 0 3974
3848 case XTerm_dumpscreen: /* no error notices */ 3975#if ENABLE_PERL
3849 { 3976 case URxvt_perl:
3850 int fd; 3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3978 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3979 break;
3858#endif 3980#endif
3859 } 3981 }
3860} 3982}
3861/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3892 return state; 4014 return state;
3893} 4015}
3894 4016
3895/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3896void 4018void
3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3898{ 4020{
3899 unsigned int i, j; 4021 unsigned int i, j;
3900 int state; 4022 int state;
3901 4023
3902 static const struct 4024 static const struct
… …
3913 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3914 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3915 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
3917 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc
3919 { menuBar_esc, PrivMode_menuBar },
3920#endif
3921 // 18, 19 printing-related 4040 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
3923#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 4044#endif
… …
3970 } 4089 }
3971 4090
3972 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4092 switch (arg[i])
3974 { 4093 {
4094#if ENABLE_STYLES
4095 case 1021:
4096 set_option (Opt_intensityStyles, mode);
4097
4098 scr_touch (true);
4099 break;
4100#endif
3975 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
3976 case 1049: 4102 case 1049:
3977 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4104 if (mode == 0)
3979 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
3980 else if (mode == 1) 4106 else if (mode == 1)
3981 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
3982 break; 4108 break;
… …
3994 */ 4120 */
3995 PrivMode (1, PrivMode_vt52); 4121 PrivMode (1, PrivMode_vt52);
3996 break; 4122 break;
3997 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4126 break;
4001 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 4128 set_option (Opt_jumpScroll, !state);
4006 break; 4129 break;
4007 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4009 break; 4132 break;
4010 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
… …
4016 /* case 8: - auto repeat, can't do on a per window basis */ 4139 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4020 break; 4143 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 4144#ifdef scrollBar_esc
4029 case scrollBar_esc: 4145 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4031 { 4147 {
4032 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
… …
4051#if 0 4167#if 0
4052 case 1001: 4168 case 1001:
4053 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4054#endif 4170#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 4172 set_option (Opt_scrollTtyOutput, !state);
4060 break; 4173 break;
4061 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 4175 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 4176 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4178 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4180 scr_erase_screen (2);
4071 scr_change_screen (state); 4181 scr_change_screen (state);
4072 break; 4182 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4183 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4184 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4187 scr_erase_screen (2);
4078 break; 4188 break;
4079 default: 4189 default:
4080 break; 4190 break;
… …
4208 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4209 break; 4319 break;
4210 4320
4211 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4212 4322
4213#ifndef NO_BRIGHTCOLOR 4323#if !ENABLE_MINIMAL
4214 case 90: 4324 case 90:
4215 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4216 case 92: 4326 case 92:
4217 case 93: 4327 case 93:
4218 case 94: 4328 case 94:
… …
4230 case 106: 4340 case 106:
4231 case 107: 4341 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4342 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4343 break;
4234#endif 4344#endif
4235
4236 } 4345 }
4237 } 4346 }
4238} 4347}
4239/*}}} */ 4348/*}}} */
4240 4349
… …
4264 */ 4373 */
4265void 4374void
4266rxvt_term::tt_printf (const char *fmt,...) 4375rxvt_term::tt_printf (const char *fmt,...)
4267{ 4376{
4268 va_list arg_ptr; 4377 va_list arg_ptr;
4269 unsigned char buf[256]; 4378 char buf[256];
4270 4379
4271 va_start (arg_ptr, fmt); 4380 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4381 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4382 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4383 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 4388 * or generated by us in response to a query ESC sequence.
4280 */ 4389 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 4391
4283void 4392void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 4394{
4395 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4396 return;
4397
4398 if (pty->pty < 0)
4399 return;
4400
4286 if (v_buflen == 0) 4401 if (v_buflen == 0)
4287 { 4402 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4403 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4289 4404
4290 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4291 return; 4406 return;
4292 4407
4293 data += written; 4408 data += written;
4294 len -= written; 4409 len -= written;
4295 } 4410 }
4296 4411
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 4413
4299 memcpy (v_buffer + v_buflen, data, len); 4414 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4415 v_buflen += len;
4301 4416
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4303} 4418}
4304 4419
4305void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4306{ 4421{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308 4423
4309 if (written > 0) 4424 if (written > 0)
4310 { 4425 {
4311 v_buflen -= written; 4426 v_buflen -= written;
4312 4427
… …
4321 } 4436 }
4322 4437
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4438 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4439 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4441 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4442}
4329 4443
4330/*----------------------- end-of-file (C source) -----------------------*/ 4444/*----------------------- end-of-file (C source) -----------------------*/
4331 4445

Diff Legend

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