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.289 by root, Sat Jan 28 20:36:21 2006 UTC

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

Diff Legend

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