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

Diff Legend

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