ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

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

Diff Legend

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