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.48 by pcg, Sat Feb 21 21:15:03 2004 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2006 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * 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
32 * 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
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
42 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
43 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
44 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
45 46
46/*{{{ includes: */ 47/*{{{ includes: */
47#include "../config.h" /* NECESSARY */ 48#include "../config.h"
48#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
49#include "version.h" 51#include "version.h"
50#include "command.h" 52#include "command.h"
51 53
52#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
53 63
54/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
55 65
56/*{{{ Convert the keypress event into a string */ 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68#if ENABLE_FRILLS || ISO_14755
69
70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
57void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
58rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
59{ 285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
304{
60 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
61 unsigned int newlen; 306 unsigned int newlen;
62 KeySym keysym; 307 KeySym keysym;
63#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */
65#endif
66 int valid_keysym; 308 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
68 315
69 /* 316 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
72 * 319 *
73 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
74 */ 321 */
75 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
76 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
77 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
78 325
79 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
80 { 327 {
81 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
87#ifdef USE_XIM 334#ifdef USE_XIM
88 if (Input_Context) 335 if (Input_Context)
89 { 336 {
90 Status status_return; 337 Status status_return;
91 338
339#if 0
92#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
95 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
96 else 344 else
97#endif 345#endif
98 346#endif
99 { 347 {
100 wchar_t wkbuf[KBUFSZ + 1]; 348 wchar_t wkbuf[KBUFSZ + 1];
101 349
102 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
106 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
109 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 360 SET_LOCALE (locale);
111 361
112 if (status_return == XLookupChars 362 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
114 { 364 {
365 /* make sure the user can type ctrl-@, i.e. NUL */
366 if (len == 1 && *wkbuf == 0)
367 {
368 kbuf[0] = 0;
369 len = 1;
370 }
371 else
372 {
115 wkbuf[len] = 0; 373 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 374 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 375 if (len < 0)
118 len = 0; 376 len = 0;
377 }
119 } 378 }
120 else 379 else
121 len = 0; 380 len = 0;
122 } 381 }
123 382
124 valid_keysym = status_return == XLookupKeySym 383 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
126 } 385 }
127 else 386 else
128#endif 387#endif
129
130 { 388 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 390 valid_keysym = keysym != NoSymbol;
133 } 391 }
134 392
135 if (valid_keysym) 393 if (valid_keysym)
136 { 394 {
137 /* for some backwards compatibility */ 395#ifdef KEYSYM_RESOURCE
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 396 if (keyboard->dispatch (this, keysym, ev.state))
139# ifdef HOTKEY_CTRL 397 return;
140 if (ctrl)
141# else
142 if (meta)
143# endif 398#endif
144 {
145 if (keysym == ks_bigfont)
146 {
147 change_font (0, FONT_UP);
148 return;
149 }
150 else if (keysym == ks_smallfont)
151 {
152 change_font (0, FONT_DN);
153 return;
154 }
155 }
156#endif
157 399
158 if (TermWin.saveLines) 400 if (saveLines)
159 { 401 {
160#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 403 if (!ctrl && !meta)
162 {
163#else 404#else
164 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
165 { 407 {
166#endif
167 int lnsppg; 408 int lnsppg;
168 409
169#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
171#else 412#else
172 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
173#endif 414#endif
174 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
175 { 416 {
176 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
177 return; 418 return;
… …
205 scr_move_to (0, 1); 446 scr_move_to (0, 1);
206 return; 447 return;
207 } 448 }
208 else if (keysym == XK_End) 449 else if (keysym == XK_End)
209 { 450 {
210 scr_move_to (1, 0); 451 scr_move_to (1, 1);
211 return; 452 return;
212 } 453 }
213 } 454 }
214#endif 455#endif
215
216 } 456 }
217 457
218 if (shft) 458 if (shft)
219 { 459 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 460 /* Shift + F1 - F10 generates F11 - F20 */
221 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
222 { 462 {
223 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
224 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
225 } 465 }
226 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
227 { 467 {
228 switch (keysym) 468 switch (keysym)
229 { 469 {
230 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
233 return; 473 return;
474#if TODO
234 /* rxvt extras */ 475 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 477 change_font (FONT_UP);
237 return; 478 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 480 change_font (FONT_DN);
240 return; 481 return;
482#endif
241 } 483 }
242 } 484 }
243 } 485 }
244#ifdef PRINTPIPE 486
245 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
246 { 488 // ISO 14755 support
247 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
248 return;
249 } 490 {
250#endif 491 int hv;
251#ifdef GREEK_SUPPORT 492
252 if (keysym == ks_greekmodeswith) 493 if (iso14755buf & ISO_14755_51
253 { 494 && (keysym == XK_space || keysym == XK_KP_Space
254 greek_mode = !greek_mode; 495 || keysym == XK_Return || keysym == XK_KP_Enter))
255 if (greek_mode)
256 { 496 {
257 xterm_seq (XTerm_title, 497 commit_iso14755 ();
258 (greek_getmode () == GREEK_ELOT928 498 iso14755buf = ISO_14755_51;
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 499# if ISO_14755
260 greek_reset (); 500 iso14755_51 (0);
501# endif
502 return;
261 } 503 }
262 else 504 else if (keysym == XK_BackSpace)
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 {
270#ifdef KEYSYM_RESOURCE
271 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 505 {
273 unsigned int l; 506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
274 const unsigned char *kbuf0; 507# if ISO_14755
275 const unsigned char ch = C0_ESC; 508 iso14755_51 (iso14755buf & ISO_14755_MASK);
276
277 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++;
279
280 /* escape prefix */
281 if (meta)
282# ifdef META8_OPTION
283 if (meta_char == C0_ESC)
284# endif 509# endif
285 tt_write (&ch, 1); 510 return;
286 tt_write (kbuf0, l); 511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
287 return; 519 return;
288 } 520 }
289 else 521 else
290#endif
291
292 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
293 newlen = 1; 553 newlen = 1;
294 switch (keysym) 554 switch (keysym)
295 { 555 {
296#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 557 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
299 { 559 {
300 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
303 } 563 }
304 else 564 else
305 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
306# ifdef MULTICHAR_SET 566 break;
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
308 { 573 {
309 int col, row; 574 strcpy (kbuf, "\033On");
310 575 break;
311 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 576 }
577 /* FALLTHROUGH */
317# endif 578# endif
318 break;
319#endif
320#ifndef NO_DELETE_KEY
321 case XK_Delete: 579 case XK_Delete:
322 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN (kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 581 break;
336#endif 582#endif
337 case XK_Tab: 583 case XK_Tab:
338 if (shft) 584 if (shft)
339 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
340 else 586 else
341 { 587 {
342#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 589 if (ctrl)
344 meta = 1; 590 meta = 1;
… …
349#endif 595#endif
350 newlen = 0; 596 newlen = 0;
351 } 597 }
352 break; 598 break;
353 599
354
355#ifdef XK_KP_Left 600#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
361 { 606 {
362 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
363 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 609 break;
365 } 610 }
366 else 611 else
367 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
370#endif 615#endif
371 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
375 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
376 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 622 /* do Shift first */
378 if (shft) 623 if (shft)
379 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 625 else if (ctrl)
381 { 626 {
382 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
383 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 629 }
385 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 632 break;
423 633
424#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
426 case XK_KP_Prior: 636 case XK_KP_Prior:
427 /* allow shift to override */ 637 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
429 { 639 {
430 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
431 break; 641 break;
432 } 642 }
433 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
434# endif 644# endif
435 case XK_Prior: 645 case XK_Prior:
436 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
437 break; 647 break;
438# ifdef XK_KP_Next 648# ifdef XK_KP_Next
439 case XK_KP_Next: 649 case XK_KP_Next:
440 /* allow shift to override */ 650 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
442 { 652 {
443 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
444 break; 654 break;
445 } 655 }
446 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
447# endif 657# endif
448 case XK_Next: 658 case XK_Next:
449 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
450 break; 660 break;
451#endif 661#endif
452 case XK_KP_Enter: 662 case XK_KP_Enter:
453 /* allow shift to override */ 663 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
455 { 665 {
456 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
457 } 678 }
458 else 679 else
459 { 680 {
460 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
461 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
462 } 683 }
463 break; 684 break;
464 685
465#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
466 case XK_KP_Begin: 687 case XK_KP_Begin:
467 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
468 break; 689 break;
469 690
470 case XK_KP_Insert:
471 STRCPY (kbuf, "\033Op");
472 break;
473
474 case XK_KP_Delete:
475 STRCPY (kbuf, "\033On");
476 break;
477#endif 691#endif
478 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
482 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
484 break; 698 break;
485 699
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 702 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 703 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 704 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 705 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 706 case XK_KP_0: /* "\033Op" : "0" */
… …
498 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
499 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
500 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 716 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
504 { 718 {
505 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 721 }
508 else 722 else
509 { 723 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
512 } 726 }
513 break; 727 break;
514 728
515 case XK_Find: 729 case XK_Find:
516 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
517 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
518 case XK_Insert: 743 case XK_Insert:
519 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
520 break; 745 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 747 case DXK_Remove:
523 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
524#endif 749#endif
525 case XK_Execute: 750 case XK_Execute:
526 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
527 break; 752 break;
528 case XK_Select: 753 case XK_Select:
529 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
530 break; 755 break;
531#ifdef XK_KP_End 756#ifdef XK_KP_End
532 case XK_KP_End: 757 case XK_KP_End:
533 /* allow shift to override */ 758 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
535 { 760 {
536 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
537 break; 762 break;
538 } 763 }
539 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
540#endif 765#endif
541 case XK_End: 766 case XK_End:
542 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
543 break; 768 break;
544#ifdef XK_KP_Home 769#ifdef XK_KP_Home
545 case XK_KP_Home: 770 case XK_KP_Home:
546 /* allow shift to override */ 771 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
548 { 773 {
549 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
550 break; 775 break;
551 } 776 }
552 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
553#endif 778#endif
554 case XK_Home: 779 case XK_Home:
555 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
556 break; 781 break;
557 782
558#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
559 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 785
… …
612#undef FKEY 837#undef FKEY
613 default: 838 default:
614 newlen = 0; 839 newlen = 0;
615 break; 840 break;
616 } 841 }
842
617 if (newlen) 843 if (newlen)
618 len = STRLEN (kbuf); 844 len = strlen (kbuf);
619 } 845 }
846
620 /* 847 /*
621 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
622 */ 849 */
623#ifdef META8_OPTION 850#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 851 if (meta && (meta_char == 0x80) && len > 0)
… …
629 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
630 { 857 {
631 len = 1; 858 len = 1;
632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
633 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
634 else 866 else
635 { 867 {
636#ifdef META8_OPTION 868#ifdef META8_OPTION
637 /* set 8-bit on */ 869 /* set 8-bit on */
638 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
639 { 871 {
640 unsigned char *ch; 872 char *ch;
641 873
642 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 875 *ch |= 0x80;
876
644 meta = 0; 877 meta = 0;
645 } 878 }
646#endif 879#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat (kbuf, len);
650#endif
651 /* nil */ ; 880 /* nil */ ;
652 } 881 }
653 } 882 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
654 886
655 if (len <= 0) 887 if (len <= 0)
656 return; /* not mapped */ 888 return; /* not mapped */
657 889
658 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
659 if (TermWin.view_start) 891 if (view_start)
660 { 892 {
661 TermWin.view_start = 0; 893 view_start = 0;
662 want_refresh = 1; 894 want_refresh = 1;
663 } 895 }
664 896
665 /* 897 /*
666 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 910
679 /* escape prefix */ 911 /* escape prefix */
680 if (meta 912 if (meta
681#ifdef META8_OPTION 913#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 914 && meta_char == C0_ESC
683#endif 915#endif
684 ) 916 )
685 { 917 {
686 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
687
688 tt_write (&ch, 1); 919 tt_write (&ch, 1);
689 } 920 }
690#ifdef DEBUG_CMD
691 if (debug_key)
692 { /* Display keyboard buffer contents */
693 char *p;
694 int i;
695 921
696 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
703} 923}
704/*}}} */
705 924
706#if (MENUBAR_MAX) 925void
707/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
708/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
709unsigned int 1003unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
711{ 1005{
712 unsigned int n, s; 1006 unsigned int n, s;
713 1007
714 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
716 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
717 { 1012 {
718 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
722 s += n; 1017 s += n;
723 } 1018 }
1019
724 if (count > s) 1020 if (count > s)
725 { 1021 {
726 rxvt_print_error ("data loss: cmd_write too large"); 1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 1023 count = s;
728 } 1024 }
1025
729 for (; count--;) 1026 for (; count--;)
730 *cmdbuf_endp++ = *str++; 1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
731 return 0; 1031 return 0;
732} 1032}
733#endif /* MENUBAR_MAX */ 1033#endif
734 1034
735void 1035void
736rxvt_term::flush () 1036rxvt_term::flush ()
737{ 1037{
738#ifdef TRANSPARENT 1038 flush_ev.stop ();
739 if (want_full_refresh) 1039
1040#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ())
740 { 1042 {
741 want_full_refresh = 0;
742 scr_clear (); 1043 scr_clear (true);
743 scr_touch (false); 1044 scr_touch (false);
744 want_refresh = 1;
745 } 1045 }
746#endif 1046#endif
747 1047
748 if (want_refresh) 1048 if (want_refresh)
749 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
750 scr_refresh (refresh_type); 1088 scr_refresh ();
751 scrollbar_show (1); 1089 scrollbar_show (1);
752#ifdef USE_XIM 1090#ifdef USE_XIM
753 IMSendSpot (); 1091 IMSendSpot ();
754#endif 1092#endif
755
756 } 1093 }
757 1094
758 display->flush (); 1095 display->flush ();
759} 1096}
760 1097
761void 1098void
762rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
763{ 1100{
764 SET_R (this); 1101 make_current ();
765 SET_LOCALE (locale);
766 1102
1103 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107}
1108
1109void
1110rxvt_term::flush_cb (time_watcher &w)
1111{
1112 make_current ();
1113
1114 refresh_count = 0;
767 flush (); 1115 flush ();
768} 1116}
769 1117
770#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
771void 1119void
772rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
773{ 1121{
774 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
775 want_refresh = 1; 1123 want_refresh = 1;
776 1124
777 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
778} 1126}
779#endif 1127#endif
780 1128
781#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
782void 1130void
… …
789 w.start (w.at + TEXT_BLINK_INTERVAL); 1137 w.start (w.at + TEXT_BLINK_INTERVAL);
790 } 1138 }
791} 1139}
792#endif 1140#endif
793 1141
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void
1144rxvt_term::cont_scroll_cb (time_watcher &w)
1145{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1151 }
1152}
1153#endif
1154
1155#ifdef SELECTION_SCROLLING
1156void
1157rxvt_term::sel_scroll_cb (time_watcher &w)
1158{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 }
1165}
1166#endif
1167
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void
1170rxvt_term::slip_wheel_cb (time_watcher &w)
1171{
1172 if (mouse_slip_wheel_speed == 0
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 }
1182}
1183#endif
1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
794bool 1210bool
795rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
796{ 1212{
797 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1214
1215 if (CBUFSIZ == n)
1216 {
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1218 n = 0;
1219 }
798 1220
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
802 1224
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
804 1226
805 if (n > 0) 1227 if (r > 0)
806 { 1228 {
807 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
808 return true; 1230 return true;
809 } 1231 }
810 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
811 destroy (); 1244 destroy ();
1245 }
812 1246
813 return false; 1247 return false;
814} 1248}
815 1249
816void 1250void
817rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
818{ 1252{
819 SET_R (this); 1253 make_current ();
820 SET_LOCALE (locale); 1254
1255 if (revents & EVENT_READ)
1256 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ())
1258 if (cmd_parse ())
1259 break;
821 1260
822 if (revents & EVENT_WRITE) 1261 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 1262 pty_write ();
824 else if (revents & EVENT_READ)
825 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ())
831 {
832 if (!seen_input)
833 {
834 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch ();
837 }
838
839 uint32_t ch = NOCHAR;
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break;
848
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch;
858
859 for (;;)
860 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else
866 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (! (Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true;
878 flag = false;
879 ch = NOCHAR;
880 break;
881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 }
898 }
899
900 scr_add_lines (buf, nlines, str - buf);
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
914 refresh_limit++;
915
916 scr_refresh (refresh_type);
917 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 }
936 }
937 }
938 }
939} 1263}
940 1264
941// read the next character, currently handles UTF-8 1265void
942// will probably handle all sorts of other stuff in the future 1266rxvt_term::pointer_unblank ()
943uint32_t
944rxvt_term::next_char ()
945{ 1267{
946 while (cmdbuf_ptr < cmdbuf_endp) 1268 XDefineCursor (dpy, vt, TermWin_cursor);
947 { 1269 recolour_cursor ();
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++;
950 1270
951 wchar_t wc; 1271#ifdef POINTER_BLANK
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1272 hidden_pointer = 0;
953 1273
954 if (len == (size_t)-2) 1274 if (option (Opt_pointerBlank))
955 return NOCHAR; 1275 pointer_ev.start (NOW + pointerBlankDelay);
956 1276#endif
957 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959
960 // assume wchar == unicode
961 cmdbuf_ptr += len;
962 return wc;
963 }
964
965 return NOCHAR;
966}
967
968/* rxvt_cmd_getc () - Return next input character */
969/*
970 * Return the next input character after first passing any keyboard input
971 * to the command.
972 */
973uint32_t
974rxvt_term::cmd_getc ()
975{
976 for (;;)
977 {
978 uint32_t c = next_char ();
979 if (c != NOCHAR)
980 return c;
981
982 // incomplete sequences should occur rarely, still, a better solution
983 // would be preferred. either setjmp/longjmp or better design.
984 fcntl (cmd_fd, F_SETFL, 0);
985 pty_fill ();
986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
987 }
988} 1277}
989 1278
990#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
991void 1280void
992rxvt_term::pointer_unblank ()
993{
994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
995 recolour_cursor ();
996
997 hidden_pointer = 0;
998
999 if (Options & Opt_pointerBlank)
1000 pointer_ev.start (NOW + pointerBlankDelay);
1001}
1002
1003void
1004rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1005{ 1282{
1006 if (! (Options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1007 return; 1284 return;
1008 1285
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1010 XFlush (display->display); 1287 XFlush (dpy);
1011 1288
1012 hidden_pointer = 1; 1289 hidden_pointer = 1;
1013} 1290}
1014 1291
1015void 1292void
1016rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1017{ 1294{
1018 SET_R (this); 1295 make_current ();
1019 SET_LOCALE (locale);
1020 1296
1021 pointer_blank (); 1297 pointer_blank ();
1022} 1298}
1023#endif 1299#endif
1024 1300
1025void 1301void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 1303{
1028 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1029 int x, y; 1305 int x, y;
1030 1306
1031 x = ev.x; 1307 x = ev.x;
1032 y = ev.y; 1308 y = ev.y;
1033 pixel_position (&x, &y); 1309 pixel_position (&x, &y);
1034 1310
1035 if (MEvent.button == AnyButton) 1311 if (MEvent.button == AnyButton)
1036 {
1037 button_number = 3; 1312 button_number = 3;
1038 }
1039 else 1313 else
1040 { 1314 {
1041 button_number = MEvent.button - Button1; 1315 button_number = MEvent.button - Button1;
1042 /* add 0x3D for wheel events, like xterm does */ 1316 /* add 0x3D for wheel events, like xterm does */
1043 if (button_number >= 3) 1317 if (button_number >= 3)
1044 button_number += (64 - 3); 1318 button_number += (64 - 3);
1045 } 1319 }
1046 1320
1047 if (PrivateModes & PrivMode_MouseX10) 1321 if (priv_modes & PrivMode_MouseX10)
1048 { 1322 {
1049 /* 1323 /*
1050 * do not report ButtonRelease 1324 * do not report ButtonRelease
1051 * no state info allowed 1325 * no state info allowed
1052 */ 1326 */
… …
1067 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1341 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1068 + ((MEvent.state & ControlMask) ? 16 : 0); 1342 + ((MEvent.state & ControlMask) ? 16 : 0);
1069#ifdef MOUSE_REPORT_DOUBLECLICK 1343#ifdef MOUSE_REPORT_DOUBLECLICK
1070 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1344 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1071#endif 1345#endif
1072
1073 } 1346 }
1074 1347
1075#ifdef DEBUG_MOUSEREPORT 1348#if DEBUG_MOUSEREPORT
1076 fprintf (stderr, "Mouse ["); 1349 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 1350 if (key_state & 16)
1078 fputc ('C', stderr); 1351 fputc ('C', stderr);
1079 if (key_state & 4) 1352 if (key_state & 4)
1080 fputc ('S', stderr); 1353 fputc ('S', stderr);
… …
1084 fputc ('2', stderr); 1357 fputc ('2', stderr);
1085 fprintf (stderr, "]: <%d>, %d/%d\n", 1358 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 1359 button_number,
1087 x + 1, 1360 x + 1,
1088 y + 1); 1361 y + 1);
1089#else 1362#endif
1363
1090 tt_printf ("\033[M%c%c%c", 1364 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1092 (32 + x + 1), 1366 (32 + x + 1),
1093 (32 + y + 1)); 1367 (32 + y + 1));
1094#endif
1095} 1368}
1096
1097#ifdef USING_W11LIB
1098void
1099rxvt_W11_process_x_event (XEvent *ev)
1100{
1101 rxvt_t *r = rxvt_get_r ();
1102
1103 x_cb (*ev);
1104}
1105#endif
1106 1369
1107/*{{{ process an X event */ 1370/*{{{ process an X event */
1108void 1371void
1109rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1110{ 1373{
1111 SET_R (this); 1374 make_current ();
1112 SET_LOCALE (locale);
1113 1375
1114#if defined(CURSOR_BLINK) 1376 dLocal (Display *, dpy);
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1116 {
1117 if (hidden_cursor)
1118 {
1119 hidden_cursor = 0;
1120 want_refresh = 1;
1121 }
1122 1377
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1378 if (ev.xany.window == vt
1124 } 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1125#endif 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1126
1127#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 {
1130 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease)
1133 if (hidden_pointer)
1134 pointer_unblank ();
1135
1136 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank ();
1138 }
1139#endif
1140
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return; 1381 return;
1144#endif
1145 1382
1383 // for XQueryPointer
1146 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1147 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1148 unsigned int unused_mask; 1386 unsigned int unused_mask;
1149
1150#ifdef DEBUG_X
1151 const char *const eventnames[] =
1152 { /* mason - this matches my system */
1153 "",
1154 "",
1155 "KeyPress",
1156 "KeyRelease",
1157 "ButtonPress",
1158 "ButtonRelease",
1159 "MotionNotify",
1160 "EnterNotify",
1161 "LeaveNotify",
1162 "FocusIn",
1163 "FocusOut",
1164 "KeymapNotify",
1165 "Expose",
1166 "GraphicsExpose",
1167 "NoExpose",
1168 "VisibilityNotify",
1169 "CreateNotify",
1170 "DestroyNotify",
1171 "UnmapNotify",
1172 "MapNotify",
1173 "MapRequest",
1174 "ReparentNotify",
1175 "ConfigureNotify",
1176 "ConfigureRequest",
1177 "GravityNotify",
1178 "ResizeRequest",
1179 "CirculateNotify",
1180 "CirculateRequest",
1181 "PropertyNotify",
1182 "SelectionClear",
1183 "SelectionRequest",
1184 "SelectionNotify",
1185 "ColormapNotify",
1186 "ClientMessage",
1187 "MappingNotify"
1188 };
1189#endif
1190
1191#ifdef DEBUG_X
1192 struct timeval tp;
1193 struct tm *ltt;
1194 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime (& (tp.tv_sec));
1196 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1197#endif
1198 1387
1199 switch (ev.type) 1388 switch (ev.type)
1200 { 1389 {
1201 case KeyPress: 1390 case KeyPress:
1202 lookup_key (ev.xkey); 1391 key_press (ev.xkey);
1203 break; 1392 break;
1204 1393
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1394 case KeyRelease:
1207 { 1395 key_release (ev.xkey);
1208 if (! (ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0;
1210 else
1211 {
1212 KeySym ks;
1213
1214 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0;
1217 }
1218 break; 1396 break;
1219 }
1220#endif
1221 1397
1222 case ButtonPress: 1398 case ButtonPress:
1223 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1224 break; 1400 break;
1225 1401
… …
1227 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1228 break; 1404 break;
1229 1405
1230 case ClientMessage: 1406 case ClientMessage:
1231 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1233 destroy ();
1234#ifdef OFFIX_DND
1235 /* OffiX Dnd (drag 'n' drop) protocol */
1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1237 && (ev.xclient.data.l[0] == DndFile
1238 || ev.xclient.data.l[0] == DndDir
1239 || ev.xclient.data.l[0] == DndLink))
1240 { 1409 {
1241 /* Get Dnd data */ 1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1242 Atom ActualType; 1411 {
1243 int ActualFormat; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1244 unsigned char *data; 1413 {
1245 unsigned long Size, RemainingBytes; 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1246 1415 {
1247 XGetWindowProperty (display->display, display->root, 1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1248 xa[XA_DNDSELECTION], 1417 destroy ();
1249 0L, 1000000L, 1418 }
1250 False, AnyPropertyType, 1419#if ENABLE_EWMH
1251 &ActualType, &ActualFormat, 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1252 &Size, &RemainingBytes, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1253 &data); 1423 &ev);
1254 XChangeProperty (display->display, display->root, 1424#endif
1255 XA_CUT_BUFFER0, XA_STRING, 1425 }
1256 8, PropModeReplace, 1426 }
1257 data, STRLEN (data)); 1427#if ENABLE_XEMBED
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1259 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1260 } 1436 }
1261#endif /* OFFIX_DND */
1262 break;
1263
1264 case MappingNotify:
1265 XRefreshKeyboardMapping (& (ev.xmapping));
1266 break; 1437 break;
1267 1438
1268 /* 1439 /*
1269 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1289 break; 1460 break;
1290 } 1461 }
1291 break; 1462 break;
1292 1463
1293 case FocusIn: 1464 case FocusIn:
1294 if (!TermWin.focus) 1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_out ();
1476 break;
1477
1478 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0])
1295 { 1483 {
1296 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1297 want_refresh = 1;
1298#ifdef USE_XIM
1299 if (Input_Context != NULL)
1300 XSetICFocus (Input_Context);
1301#endif
1302#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif
1306
1307 } 1485 ;
1308 break;
1309 1486
1310 case FocusOut: 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1311 if (TermWin.focus)
1312 { 1488 {
1313 TermWin.focus = 0; 1489 seen_resize = 1;
1314 want_refresh = 1; 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1315#ifdef USE_XIM
1316 if (Input_Context != NULL)
1317 XUnsetICFocus (Input_Context);
1318#endif
1319#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop ();
1322 hidden_cursor = 0;
1323#endif
1324
1325 }
1326 break;
1327
1328 case ConfigureNotify:
1329 if (ev.xconfigure.window == TermWin.parent[0])
1330 {
1331 int height, width;
1332
1333 do
1334 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height;
1337 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1491 }
1339 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340
1341 if (szHint.width != width || szHint.height != height)
1342 {
1343 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1);
1345 }
1346#ifdef DEBUG_SIZE
1347 else 1492 else
1348 { 1493 {
1349 D_SIZE ((stderr, "Size: Not resizing")); 1494#ifdef HAVE_BG_PIXMAP
1495 if (bgPixmap.window_position_sensitive ())
1496 update_background ();
1497#endif
1350 } 1498 }
1351#endif 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent)
1354 {
1355 check_our_parents ();
1356 if (am_transparent)
1357 want_full_refresh = 1;
1358 }
1359#endif
1360
1361 } 1500 }
1362 break; 1501 break;
1363 1502
1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1506 && ev.xproperty.state == PropertyNewValue)
1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1508
1509 break;
1510
1364 case SelectionClear: 1511 case SelectionClear:
1365 display->set_selection_owner (0); 1512 selection_clear ();
1366 break; 1513 break;
1367 1514
1368 case SelectionNotify: 1515 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1516 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1371 ev.xselection.property, True);
1372 break; 1518 break;
1373 1519
1374 case SelectionRequest: 1520 case SelectionRequest:
1375 selection_send (ev.xselectionrequest); 1521 selection_send (ev.xselectionrequest);
1376 break; 1522 break;
1377 1523
1524 case MapNotify:
1525 mapped = 1;
1526#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1528#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break;
1531
1378 case UnmapNotify: 1532 case UnmapNotify:
1379 TermWin.mapped = 0; 1533 mapped = 0;
1380#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1381 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1382#endif 1536#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1383 break; 1538 break;
1384
1385 case MapNotify:
1386 TermWin.mapped = 1;
1387#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif
1390 break;
1391
1392#ifdef TRANSPARENT
1393 case ReparentNotify:
1394 rootwin_cb (ev);
1395 break;
1396#endif /* TRANSPARENT */
1397 1539
1398 case GraphicsExpose: 1540 case GraphicsExpose:
1399 case Expose: 1541 case Expose:
1400 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1401 { 1543 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1544 do
1545 {
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1548 }
1406 // don't understand this, so commented it out 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1550
1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1552
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1407 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev.xexpose.x, 0, 1557 }
1410 // ev.xexpose.width, TermWin.height, False);
1411#endif
1412 want_refresh = 1; 1558 want_refresh = 1;
1413 } 1559 }
1414 else 1560 else
1415 { 1561 {
1416 XEvent unused_event; 1562 XEvent unused_event;
1417 1563
1418 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1419 Expose, 1565 ;
1420 &unused_event)) ; 1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1421 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1567 ;
1422 GraphicsExpose, 1568
1423 &unused_event)) ;
1424 if (isScrollbarWindow (ev.xany.window)) 1569 if (isScrollbarWindow (ev.xany.window))
1425 { 1570 {
1426 scrollBar.setIdle (); 1571 scrollBar.setIdle ();
1427 scrollbar_show (0); 1572 scrollbar_show (0);
1428 } 1573 }
1429#ifdef MENUBAR
1430 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1431 menubar_expose ();
1432#endif
1433#ifdef RXVT_GRAPHICS
1434 Gr_expose (ev.xany.window);
1435#endif
1436
1437 } 1574 }
1438 break; 1575 break;
1439 1576
1440 case MotionNotify: 1577 case MotionNotify:
1441#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1442 if (hidden_pointer) 1579 if (hidden_pointer)
1443 pointer_unblank (); 1580 pointer_unblank ();
1444#endif 1581#endif
1445#if MENUBAR 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1446 if (isMenuBarWindow (ev.xany.window)) 1583 break;
1584
1585 if (ev.xany.window == vt)
1447 { 1586 {
1448 menubar_control (& (ev.xbutton)); 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1449 break; 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1450 } 1589 ; // nop
1451#endif
1452 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1453 break;
1454
1455 if (ev.xany.window == TermWin.vt)
1456 {
1457 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1458 { 1591 {
1459 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1460 ; 1593 ;
1461 1594
1462 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (dpy, vt,
1463 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1464 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1465 & (ev.xbutton.x), & (ev.xbutton.y), 1598 &ev.xbutton.x, &ev.xbutton.y,
1466 &unused_mask); 1599 &ev.xbutton.state);
1467#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
1468 /* deal with a `jumpy' mouse */ 1601 /* deal with a `jumpy' mouse */
1469 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1602 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1470 { 1603 {
1471#endif 1604#endif
1605#if ISO_14755
1606 // 5.4
1607 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1608 {
1609 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1610 break;
1611 }
1612#endif
1472 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1615
1474#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1475 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1476 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1477 { 1619 {
1478 int dist; 1620 int dist;
1479
1480 pending_scroll_selection=1;
1481 1621
1482 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1483 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
1484 */ 1624 */
1485 if (scroll_selection_delay<=0) 1625 if (!sel_scroll_ev.active)
1486 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1487 1627
1488 /* save the event params so we can highlight 1628 /* save the event params so we can highlight
1489 * the selection in the pending-scroll loop 1629 * the selection in the pending-scroll loop
1490 */ 1630 */
1491 selection_save_x=ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1492 selection_save_y=ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1493 selection_save_state=
1494 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1495 1634
1496 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1497 if (ev.xbutton.y<TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1498 { 1637 {
1499 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1500 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1501 } 1640 }
1502 else 1641 else
1503 { 1642 {
1504 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1505 dist = ev.xbutton.y - 1644 dist = ev.xbutton.y - (int_bwidth + height);
1506 (TermWin.int_bwidth + TermWin.height);
1507 } 1645 }
1646
1508 scroll_selection_lines= (Pixel2Height (dist)/ 1647 scroll_selection_lines = Pixel2Height (dist)
1509 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1;
1510 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1511 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1512 } 1652 }
1513 else 1653 else
1514 { 1654 {
1515 /* we are within the text window, so we 1655 /* we are within the text window, so we
1516 * shouldn't be scrolling 1656 * shouldn't be scrolling
1517 */ 1657 */
1518 pending_scroll_selection = 0; 1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop();
1519 } 1660 }
1520#endif 1661#endif
1521#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1522
1523 } 1663 }
1524#endif 1664#endif
1525
1526 } 1665 }
1527 } 1666 }
1528 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1529 { 1668 {
1530 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1531 MotionNotify, &ev)) ; 1670 MotionNotify, &ev))
1671 ;
1672
1532 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1533 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1534 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1535 & (ev.xbutton.x), & (ev.xbutton.y), 1676 &ev.xbutton.x, &ev.xbutton.y,
1536 &unused_mask); 1677 &unused_mask);
1537 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1538 scrollbar_size ()); 1679 scrollbar_size ());
1539 scr_refresh (refresh_type);
1540 refresh_limit = 0; 1680 want_refresh = 1;
1541 scrollbar_show (1); 1681 scrollbar_show (1);
1542 } 1682 }
1543 break; 1683 break;
1544 } 1684 }
1545}
1546 1685
1686#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1688 {
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696 }
1697#endif
1698
1699#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 {
1702 if (ev.type == MotionNotify
1703 || ev.type == ButtonPress
1704 || ev.type == ButtonRelease)
1705 if (hidden_pointer)
1706 pointer_unblank ();
1707
1708 if (ev.type == KeyPress && hidden_pointer == 0)
1709 pointer_blank ();
1710 }
1711#endif
1712}
1713
1714void
1715rxvt_term::focus_in ()
1716{
1717 if (!focus)
1718 {
1719 focus = 1;
1720 want_refresh = 1;
1721
1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1724#if USE_XIM
1725 if (Input_Context != NULL)
1726 {
1727 IMSetPosition ();
1728 XSetICFocus (Input_Context);
1729 }
1730#endif
1731#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734#endif
1735#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade])
1737 {
1738 pix_colors = pix_colors_focused;
1739 scr_recolour ();
1740 }
1741#endif
1742#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell))
1744 {
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif
1752 }
1753}
1754
1755void
1756rxvt_term::focus_out ()
1757{
1758 if (focus)
1759 {
1760 focus = 0;
1761 want_refresh = 1;
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1765#if ENABLE_FRILLS || ISO_14755
1766 if (iso14755buf)
1767 {
1768 iso14755buf = 0;
1769# if ISO_14755
1770 scr_overlay_off ();
1771# endif
1772 }
1773#endif
1774#if USE_XIM
1775 if (Input_Context != NULL)
1776 XUnsetICFocus (Input_Context);
1777#endif
1778#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop ();
1781 hidden_cursor = 0;
1782#endif
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 pix_colors = pix_colors_unfocused;
1787 scr_recolour ();
1788 }
1789#endif
1790 }
1791}
1792
1793void
1794rxvt_term::update_fade_color (unsigned int idx)
1795{
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 rgba c;
1800 pix_colors [Color_fade].get (c);
1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1802 }
1803#endif
1804}
1805
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL
1547void 1807void
1548rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1549{ 1809{
1550 SET_R (this); 1810 make_current ();
1551 SET_LOCALE (locale);
1552 1811
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return;
1815
1816# if ENABLE_TRANSPARENCY
1553 switch (ev.type) 1817 switch (ev.type)
1554 { 1818 {
1555 case PropertyNotify: 1819 case PropertyNotify:
1820 /*
1821 * if user used some Esetroot compatible prog to set the root bg,
1822 * use the property to determine the pixmap. We use it later on.
1823 */
1556 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1557 { 1826 {
1558 if (ev.xproperty.state == PropertyNewValue) 1827 bgPixmap.set_root_pixmap ();
1559 selection_property (ev.xproperty.window, ev.xproperty.atom); 1828 update_background ();
1560 break;
1561 } 1829 }
1562#ifdef TRANSPARENT
1563 else
1564 {
1565 /*
1566 * if user used some Esetroot compatible prog to set the root bg,
1567 * use the property to determine the pixmap. We use it later on.
1568 */
1569 if (xa[XA_XROOTPMAPID] == 0)
1570 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1571
1572 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1573 return;
1574 }
1575
1576 /* FALLTHROUGH */
1577 case ReparentNotify:
1578 if ((Options & Opt_transparent) && check_our_parents ())
1579 if (am_transparent)
1580 want_full_refresh = 1;
1581 break; 1830 break;
1831 }
1582#endif 1832# endif
1583 }
1584} 1833}
1834#endif
1585 1835
1586void 1836void
1587rxvt_term::button_press (const XButtonEvent &ev) 1837rxvt_term::button_press (XButtonEvent &ev)
1588{ 1838{
1589 int reportmode = 0, clickintime; 1839 int reportmode = 0, clickintime;
1590 1840
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1841 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1842
1592 if (!bypass_keystate) 1843 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1844 reportmode = !! (priv_modes & PrivMode_mouse_report);
1845
1594 /* 1846 /*
1595 * VT window processing of button press 1847 * VT window processing of button press
1596 */ 1848 */
1597 if (ev.window == TermWin.vt) 1849 if (ev.window == vt)
1598 { 1850 {
1599#if RXVT_GRAPHICS 1851 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1600 if (ev.subwindow != None) 1852 return;
1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else
1603#endif
1604 1853
1854#if ISO_14755
1855 // 5.4
1856 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1857 {
1858 iso14755_54 (ev.x, ev.y);
1859 return;
1605 { 1860 }
1861#endif
1862
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1863 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1864
1607 if (reportmode) 1865 if (reportmode)
1866 {
1867 /* mouse report from vt window */
1868 /* save the xbutton state (for ButtonRelease) */
1869 MEvent.state = ev.state;
1870#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime)
1608 { 1872 {
1609 /* mouse report from vt window */ 1873 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1874 MEvent.clicks++;
1611 MEvent.state = ev.state; 1875
1612#ifdef MOUSE_REPORT_DOUBLECLICK 1876 if (MEvent.clicks > 1)
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1877 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1878 /* only report double clicks */
1620 MEvent.clicks = 2; 1879 MEvent.clicks = 2;
1621 mouse_report (ev); 1880 mouse_report (ev);
1622 1881
1623 /* don't report the release */ 1882 /* don't report the release */
1624 MEvent.clicks = 0; 1883 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1884 MEvent.button = AnyButton;
1626 }
1627 } 1885 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev.button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 } 1886 }
1641 else 1887 else
1642 { 1888 {
1889 /* different button, or time expired */
1890 MEvent.clicks = 1;
1891 MEvent.button = ev.button;
1892 mouse_report (ev);
1893 }
1894#else
1895 MEvent.button = ev.button;
1896 mouse_report (ev);
1897#endif /* MOUSE_REPORT_DOUBLECLICK */
1898
1899 }
1900 else
1901 {
1643 if (ev.button != MEvent.button) 1902 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1903 MEvent.clicks = 0;
1904
1645 switch (ev.button) 1905 switch (ev.button)
1646 { 1906 {
1647 case Button1: 1907 case Button1:
1908 /* allow meta + click to select rectangular areas */
1909 /* should be done in screen.C */
1910#if ENABLE_FRILLS
1911 selection.rect = !!(ev.state & ModMetaMask);
1912#else
1913 selection.rect = false;
1914#endif
1915
1648 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1650 { 1918 {
1651 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev.x, ev.y, 1);
1655 }
1656 else
1657 {
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev.x, ev.y);
1664 }
1665
1666 MEvent.button = Button1;
1667 break;
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1672 else 1921 else
1673 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
1923 }
1924 else
1925 {
1926 if (MEvent.button == Button1 && clickintime)
1927 MEvent.clicks++;
1928 else
1929 MEvent.clicks = 1;
1930
1931 selection_click (MEvent.clicks, ev.x, ev.y);
1932 }
1933
1934 MEvent.button = Button1;
1935 break;
1936
1937 case Button3:
1938 if (MEvent.button == Button3 && clickintime)
1939 selection_rotate (ev.x, ev.y);
1940 else
1941 selection_extend (ev.x, ev.y, 1);
1942
1674 MEvent.button = Button3; 1943 MEvent.button = Button3;
1675 break; 1944 break;
1676 }
1677 } 1945 }
1946 }
1947
1678 MEvent.time = ev.time; 1948 MEvent.time = ev.time;
1679 return; 1949 return;
1680 }
1681 } 1950 }
1682 1951
1683 /* 1952 /*
1684 * Scrollbar window processing of button press 1953 * Scrollbar window processing of button press
1685 */ 1954 */
… …
1749 upordown = 1; /* down */ 2018 upordown = 1; /* down */
1750 } 2019 }
1751 if (upordown) 2020 if (upordown)
1752 { 2021 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1754 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2023 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1755#endif 2024#endif
1756 if (scr_page (upordown < 0 ? UP : DN, 1)) 2025 if (scr_page (upordown < 0 ? UP : DN, 1))
1757 { 2026 {
1758 if (upordown < 0) 2027 if (upordown < 0)
1759 scrollBar.setUp (); 2028 scrollBar.setUp ();
… …
1775 break; 2044 break;
1776 case R_SB_ALIGN_BOTTOM: 2045 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
1778 break; 2047 break;
1779 } 2048 }
2049
1780 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider (ev.y) 2051 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider (ev.y)) 2052 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position (ev.y) - csrO, 2053 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1784 scrollbar_size ()); 2054
1785 scrollBar.setMotion (); 2055 scrollBar.setMotion ();
1786 break; 2056 break;
1787 2057
1788 case Button1: 2058 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2059 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1793 case Button3: 2063 case Button3:
1794 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != R_SB_XTERM)
1795 { 2065 {
1796 if (scrollbar_above_slider (ev.y)) 2066 if (scrollbar_above_slider (ev.y))
1797# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1); 2068 scr_page (UP, nrow - 1);
1799# else 2069# else
1800 scr_page (UP, TermWin.nrow / 4); 2070 scr_page (UP, nrow / 4);
1801# endif 2071# endif
1802 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollbar_below_slider (ev.y))
1803# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1); 2074 scr_page (DN, nrow - 1);
1805# else 2075# else
1806 scr_page (DN, TermWin.nrow / 4); 2076 scr_page (DN, nrow / 4);
1807# endif 2077# endif
1808 else 2078 else
1809 scrollBar.setMotion (); 2079 scrollBar.setMotion ();
1810 } 2080 }
1811 else 2081 else
1812 { 2082 {
1813 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 2084 (nrow
1815 * scrollbar_position (ev.y) 2085 * scrollbar_position (ev.y)
1816 / scrollbar_size ())); 2086 / scrollbar_size ()));
1817 } 2087 }
2088
1818 break; 2089 break;
1819 } 2090 }
1820 } 2091 }
2092
1821 return; 2093 return;
1822 } 2094 }
1823#if MENUBAR
1824 /*
1825 * Menubar window processing of button press
1826 */
1827 if (isMenuBarWindow (ev.window))
1828 menubar_control (ev);
1829#endif
1830} 2095}
1831 2096
1832void 2097void
1833rxvt_term::button_release (const XButtonEvent &ev) 2098rxvt_term::button_release (XButtonEvent &ev)
1834{ 2099{
1835 int reportmode = 0; 2100 int reportmode = 0;
1836 2101
1837 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 2103 if (!bypass_keystate)
1839 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
1840 2105
1841 if (scrollbar_isUpDn ()) 2106 if (scrollbar_isUpDn ())
1842 { 2107 {
1843 scrollBar.setIdle (); 2108 scrollBar.setIdle ();
1844 scrollbar_show (0); 2109 scrollbar_show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH;
1847#endif
1848
1849 } 2110 }
2111
1850#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 2113 if (sel_scroll_ev.active)
2114 sel_scroll_ev.stop();
1852#endif 2115#endif
2116
1853 if (ev.window == TermWin.vt) 2117 if (ev.window == vt)
1854 { 2118 {
1855#ifdef RXVT_GRAPHICS 2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1856 if (ev.subwindow != None) 2120 return;
1857 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1858 else
1859#endif
1860 2121
1861 { 2122#if ISO_14755
2123 // 5.4
2124 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2125 return;
2126#endif
2127
1862 if (reportmode) 2128 if (reportmode)
2129 {
2130 /* mouse report from vt window */
2131 /* don't report release of wheel "buttons" */
2132 if (ev.button >= 4)
2133 return;
2134#ifdef MOUSE_REPORT_DOUBLECLICK
2135 /* only report the release of 'slow' single clicks */
2136 if (MEvent.button != AnyButton
2137 && (ev.button != MEvent.button
2138 || (ev.time - MEvent.time
2139 > MULTICLICK_TIME / 2)))
1863 { 2140 {
1864 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */
1866 if (ev.button >= 4)
1867 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev.button != MEvent.button
1872 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1874 {
1875 MEvent.clicks = 0; 2141 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
1881 mouse_report (ev); 2143 mouse_report (ev);
2144 }
2145#else /* MOUSE_REPORT_DOUBLECLICK */
2146 MEvent.button = AnyButton;
2147 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 2148#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 2149 return;
2150 }
2151
2152 /*
2153 * dumb hack to compensate for the failure of click-and-drag
2154 * when overriding mouse reporting
2155 */
2156 if (priv_modes & PrivMode_mouse_report
2157 && bypass_keystate
2158 && ev.button == Button1 && MEvent.clicks <= 1)
2159 selection_extend (ev.x, ev.y, 0);
2160
2161 switch (ev.button)
2162 {
2163 case Button1:
2164 case Button3:
2165 selection_make (ev.time);
2166 break;
2167
2168 case Button2:
2169 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2170 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2171 break;
2172
2173#ifdef MOUSE_WHEEL
2174 case Button4:
2175 case Button5:
2176 {
2177 int i;
2178 page_dirn v;
2179
2180 v = ev.button == Button4 ? UP : DN;
2181
2182 if (ev.state & ShiftMask)
2183 i = 1;
2184 else if (option (Opt_mouseWheelScrollPage))
2185 i = nrow - 1;
2186 else
2187 i = 5;
2188
2189# ifdef MOUSE_SLIP_WHEELING
2190 if (ev.state & ControlMask)
2191 {
2192 mouse_slip_wheel_speed += v ? -1 : 1;
2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195
2196 if (slip_wheel_ev.at < NOW)
2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2198
2199 slip_wheel_ev.start ();
2200 }
2201 else
2202 {
2203# endif
2204 scr_page (v, i);
2205 scrollbar_show (1);
2206# ifdef MOUSE_SLIP_WHEELING
2207 }
2208# endif
1884 } 2209 }
2210 break;
2211#endif
2212 }
2213 }
2214}
2215
2216/*}}} */
2217
2218bool
2219rxvt_term::cmd_parse ()
2220{
2221 bool flag = false;
2222 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here
2224
2225 for (;;)
2226 {
2227 if (ch == NOCHAR)
2228 {
2229 seq_begin = cmdbuf_ptr;
2230 ch = next_char ();
2231
2232 if (ch == NOCHAR)
2233 break;
2234 }
2235
2236 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2237 {
2238 if (!seen_input)
2239 {
2240 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs
2244 // then sometimes get the size wrong.
2245 // unfortunately other programs are even more buggy and dislike
2246 // being sent SIGWINCH, so only do it when we were in fact being
2247 // resized.
2248 if (seen_resize && cmd_pid)
2249 kill (-cmd_pid, SIGWINCH);
2250 }
2251
2252 /* Read a text string from the input buffer */
2253 wchar_t buf[UBUFSIZ];
2254 bool refreshnow = false;
2255 int nlines = 0;
2256 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258
2259 for (;;)
2260 {
2261 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2262 break;
2263
2264 *str++ = ch;
2265
2266 if (ch == C0_LF || str >= eol)
2267 {
2268 if (ch == C0_LF)
2269 nlines++;
2270
2271 refresh_count++;
2272
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 {
2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2278 {
2279 refreshnow = true;
2280 ch = NOCHAR;
2281 break;
2282 }
2283 }
2284
2285 // scr_add_lines only works for nlines <= nrow - 1.
2286 if (nlines >= nrow - 1)
2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2290 scr_add_lines (buf, str - buf, nlines);
2291
2292 nlines = 0;
2293 str = buf;
2294 eol = str + min (ncol, UBUFSIZ);
2295 }
2296
2297 if (str >= eol)
2298 {
2299 if (eol >= buf + UBUFSIZ)
2300 {
2301 ch = NOCHAR;
2302 break;
2303 }
2304 else
2305 eol = min (eol + ncol, buf + UBUFSIZ);
2306 }
2307
2308 }
2309
2310 seq_begin = cmdbuf_ptr;
2311 ch = next_char ();
2312 }
2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2316 scr_add_lines (buf, str - buf, nlines);
2317
1885 /* 2318 /*
1886 * dumb hack to compensate for the failure of click-and-drag 2319 * If there have been a lot of new lines, then update the screen
1887 * when overriding mouse reporting 2320 * What the heck we'll cheat and only refresh less than every page-full.
2321 * if skipScroll is enabled.
1888 */ 2322 */
1889 if (PrivateModes & PrivMode_mouse_report 2323 if (refreshnow)
1890 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0);
1893
1894 switch (ev.button)
1895 { 2324 {
1896 case Button1: 2325 flag = true;
1897 case Button3:
1898 selection_make (ev.time);
1899 break;
1900 case Button2:
1901 selection_request (ev.time, ev.x, ev.y);
1902 break;
1903#ifdef MOUSE_WHEEL
1904 case Button4:
1905 case Button5:
1906 {
1907 int i;
1908 page_dirn v;
1909
1910 v = (ev.button == Button4) ? UP : DN;
1911 if (ev.state & ShiftMask)
1912 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1;
1915 else
1916 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING
1918 if (ev.state & ControlMask)
1919 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 }
1923# endif
1924# ifdef JUMP_MOUSE_WHEEL
1925 scr_page (v, i);
1926 scr_refresh (SMOOTH_REFRESH); 2326 scr_refresh ();
1927 scrollbar_show (1); 2327 want_refresh = 1;
1928# else
1929 while (i--)
1930 {
1931 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1);
1934 }
1935# endif
1936
1937 }
1938 break;
1939#endif
1940
1941 } 2328 }
1942 }
1943 }
1944#ifdef MENUBAR
1945 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev);
1947#endif
1948}
1949 2329
1950
1951#ifdef TRANSPARENT
1952/*
1953 * Check our parents are still who we think they are.
1954 * Do transparency updates if required
1955 */
1956int
1957rxvt_term::check_our_parents ()
1958{
1959 int i, pchanged, aformat, have_pixmap, rootdepth;
1960 unsigned long nitems, bytes_after;
1961 Atom atype;
1962 unsigned char *prop = NULL;
1963 Window root, oldp, *list;
1964 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr;
1966
1967 pchanged = 0;
1968
1969 if (! (Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */
1971
1972 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth;
1974
1975 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1976 if (rootdepth != wattr.depth)
1977 {
1978 if (am_transparent)
1979 { 2330 }
1980 pchanged = 1; 2331 else
1981 XSetWindowBackground (display->display, TermWin.vt,
1982 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0;
1984 } 2332 {
1985 return pchanged; /* Don't try any more */ 2333 try
1986 }
1987
1988 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync (display->display, False);
1990
1991 /*
1992 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that.
1995 */
1996 i = (xa[XA_XROOTPMAPID] != 0
1997 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success));
2000 if (!i || prop == NULL)
2001 have_pixmap = 0;
2002 else
2003 {
2004 have_pixmap = 1;
2005 rootpixmap = * ((Pixmap *)prop);
2006 XFree (prop);
2007 }
2008 if (have_pixmap)
2009 {
2010 /*
2011 * Copy display->root pixmap transparency
2012 */
2013 int sx, sy, nx, ny;
2014 unsigned int nw, nh;
2015 Window cr;
2016 XImage *image;
2017 GC gc;
2018 XGCValues gcvalue;
2019
2020 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height;
2024 nx = ny = 0;
2025 if (sx < 0)
2026 {
2027 nw += sx;
2028 nx = -sx;
2029 sx = 0;
2030 }
2031 if (sy < 0)
2032 {
2033 nh += sy;
2034 ny = -sy;
2035 sy = 0;
2036 }
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2041 ZPixmap);
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */
2044 allowedxerror = 0;
2045 if (image == NULL)
2046 {
2047 if (am_transparent && am_pixmap_trans)
2048 { 2334 {
2049 pchanged = 1; 2335 process_nonprinting (ch);
2050 if (TermWin.pixmap != None)
2051 {
2052 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None;
2054 }
2055 } 2336 }
2056 am_pixmap_trans = 0; 2337 catch (const class out_of_input &o)
2057 }
2058 else
2059 {
2060 if (TermWin.pixmap != None)
2061 XFreePixmap (display->display, TermWin.pixmap);
2062 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height,
2065 (unsigned int)image->depth);
2066 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height);
2070 XFreeGC (display->display, gc);
2071 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap);
2074 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1;
2076 am_transparent = am_pixmap_trans = 1;
2077 }
2078 }
2079 if (!am_pixmap_trans)
2080 {
2081 unsigned int n;
2082 /*
2083 * InheritPixmap transparency
2084 */
2085 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2087 i++)
2088 {
2089 oldp = TermWin.parent[i];
2090 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n);
2092 XFree (list);
2093 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2094 if (TermWin.parent[i] == display->root)
2095 { 2338 {
2096 if (oldp != None) 2339 // we ran out of input, retry later
2097 pchanged = 1; 2340 cmdbuf_ptr = seq_begin;
2098 break; 2341 break;
2099 } 2342 }
2100 if (oldp != TermWin.parent[i]) 2343
2101 pchanged = 1; 2344 ch = NOCHAR;
2102 }
2103 n = 0;
2104 if (pchanged)
2105 { 2345 }
2106 for (; n < (unsigned int)i; n++) 2346 }
2107 { 2347
2108 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2348 return flag;
2109 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2349}
2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2350
2111 { 2351// read the next character
2112 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2352wchar_t
2113 break; 2353rxvt_term::next_char () NOTHROW
2114 } 2354{
2115 } 2355 while (cmdbuf_ptr < cmdbuf_endp)
2356 {
2357 // assume 7-bit to be ascii ALWAYS
2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2359 return *cmdbuf_ptr++;
2360
2361 wchar_t wc;
2362 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2363
2364 if (len == (size_t)-2)
2116 } 2365 {
2117 if (n > (int) (sizeof (TermWin.parent) 2366 // the mbstate stores incomplete sequences. didn't know this :/
2118 / sizeof (TermWin.parent[0]))) 2367 cmdbuf_ptr = cmdbuf_endp;
2368 break;
2119 { 2369 }
2120 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground (display->display, TermWin.parent[0],
2122 PixColors[Color_fg]);
2123 XSetWindowBackground (display->display, TermWin.vt,
2124 PixColors[Color_bg]);
2125 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */
2127 }
2128 else
2129 {
2130 /* wait (an arbitrary period) for the WM to do its thing
2131 * needed for fvwm2.2.2 (and before?) */
2132# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt;
2134 2370
2135 rqt.tv_sec = 1; 2371 if (len == (size_t)-1)
2136 rqt.tv_nsec = 0; 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2137 nanosleep (&rqt, NULL); 2373
2138# else 2374 // assume wchar == unicode
2139 sleep (1); 2375 cmdbuf_ptr += len;
2140# endif 2376 return wc & UNICODE_MASK;
2141 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2144 ParentRelative);
2145 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2146 ParentRelative);
2147 am_transparent = 1;
2148 }
2149 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None;
2151 } 2377 }
2378
2379 return NOCHAR;
2380}
2381
2382// read the next octet
2383uint32_t
2384rxvt_term::next_octet () NOTHROW
2385{
2386 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR;
2389}
2390
2391static class out_of_input out_of_input;
2392
2393/* rxvt_cmd_getc () - Return next input character */
2394/*
2395 * Return the next input character after first passing any keyboard input
2396 * to the command.
2397 */
2398wchar_t
2399rxvt_term::cmd_getc () THROW ((class out_of_input))
2400{
2401 wchar_t c = next_char ();
2402
2403 if (c == NOCHAR)
2404 throw out_of_input;
2405
2152 return pchanged; 2406 return c;
2153} 2407}
2154#endif
2155 2408
2156/*}}} */ 2409uint32_t
2410rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{
2412 uint32_t c = next_octet ();
2413
2414 if (c == NOCHAR)
2415 throw out_of_input;
2416
2417 return c;
2418}
2157 2419
2158/*{{{ print pipe */ 2420/*{{{ print pipe */
2159/*----------------------------------------------------------------------*/ 2421/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2422#ifdef PRINTPIPE
2161FILE * 2423FILE *
2162rxvt_term::popen_printer () 2424rxvt_term::popen_printer ()
2163{ 2425{
2164 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2426 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2427
2166 if (stream == NULL) 2428 if (stream == NULL)
2167 rxvt_print_error ("can't open printer pipe"); 2429 rxvt_warn ("can't open printer pipe, not printing.\n");
2430
2168 return stream; 2431 return stream;
2169} 2432}
2170 2433
2171int 2434int
2172rxvt_term::pclose_printer (FILE *stream) 2435rxvt_term::pclose_printer (FILE *stream)
2173{ 2436{
2174 fflush (stream); 2437 fflush (stream);
2175 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */
2179# else
2180 return pclose (stream); 2438 return pclose (stream);
2181# endif
2182} 2439}
2183 2440
2184/* 2441/*
2185 * simulate attached vt100 printer 2442 * simulate attached vt100 printer
2186 */ 2443 */
2187void 2444void
2188rxvt_term::process_print_pipe () 2445rxvt_term::process_print_pipe ()
2189{ 2446{
2190 int done; 2447 int done;
2191 FILE *fd; 2448 FILE *fd;
2192 2449
2193 if ((fd = popen_printer ()) == NULL) 2450 if ((fd = popen_printer ()) == NULL)
2194 return; 2451 return;
2195 2452
2196 /* 2453 /*
2197 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2198 * is received. 2455 * is received.
2199 */ 2456 */
2200 for (done = 0; !done;) 2457 for (done = 0; !done;)
2201 { 2458 {
2202 unsigned char buf[8]; 2459 unsigned char buf[8];
2203 unsigned char ch; 2460 unicode_t ch;
2204 unsigned int i, len; 2461 unsigned int i, len;
2205 2462
2206 if ((ch = cmd_getc ()) != C0_ESC) 2463 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2464 {
2208 if (putc (ch, fd) == EOF) 2465 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2466 break; /* done = 1 */
… …
2224 { 2481 {
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2483 break; /* done = 1 */
2227 } 2484 }
2228 } 2485 }
2486
2229 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2230 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2231 { 2489 {
2232 done = 1; 2490 done = 1;
2233 break; 2491 break;
2234 } 2492 }
2235 } 2493 }
2236 } 2494 }
2495
2237 pclose_printer (fd); 2496 pclose_printer (fd);
2238} 2497}
2239#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
2240/*}}} */ 2499/*}}} */
2241 2500
2242/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2243enum { 2502enum {
2244 C1_40 = 0x40, 2503 C1_40 = 0x40,
2245 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2246 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2247 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2248 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2249}; 2508};
2250/* *INDENT-ON* */ 2509/* *INDENT-ON* */
2251 2510
2252/*{{{ process non-printing single characters */ 2511/*{{{ process non-printing single characters */
2253void 2512void
2254rxvt_term::process_nonprinting (unsigned char ch) 2513rxvt_term::process_nonprinting (unicode_t ch)
2255{ 2514{
2256 switch (ch) 2515 switch (ch)
2257 { 2516 {
2517 case C0_ESC:
2518 process_escape_seq ();
2519 break;
2258 case C0_ENQ: /* terminal Status */ 2520 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2521 if (rs[Rs_answerbackstring])
2260 tt_write ( 2522 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2261 (const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2523 else
2264 tt_write ((unsigned char *)VT100_ANS, 2524 tt_write (VT100_ANS, strlen (VT100_ANS));
2265 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2525 break;
2267 case C0_BEL: /* bell */ 2526 case C0_BEL: /* bell */
2268 scr_bell (); 2527 scr_bell ();
2269 break; 2528 break;
2270 case C0_BS: /* backspace */ 2529 case C0_BS: /* backspace */
… …
2285 scr_charset_choose (1); 2544 scr_charset_choose (1);
2286 break; 2545 break;
2287 case C0_SI: /* shift in - acs */ 2546 case C0_SI: /* shift in - acs */
2288 scr_charset_choose (0); 2547 scr_charset_choose (0);
2289 break; 2548 break;
2549
2550#ifdef EIGHT_BIT_CONTROLS
2551 // 8-bit controls
2552 case 0x90: /* DCS */
2553 process_dcs_seq ();
2554 break;
2555 case 0x9b: /* CSI */
2556 process_csi_seq ();
2557 break;
2558 case 0x9d: /* OSC */
2559 process_osc_seq ();
2560 break;
2561#endif
2290 } 2562 }
2291} 2563}
2292/*}}} */ 2564/*}}} */
2293 2565
2294 2566
2295/*{{{ process VT52 escape sequences */ 2567/*{{{ process VT52 escape sequences */
2296void 2568void
2297rxvt_term::process_escape_vt52 (unsigned char ch) 2569rxvt_term::process_escape_vt52 (unicode_t ch)
2298{ 2570{
2299 int row, col; 2571 int row, col;
2300 2572
2301 switch (ch) 2573 switch (ch)
2302 { 2574 {
… …
2354 2626
2355/*{{{ process escape sequences */ 2627/*{{{ process escape sequences */
2356void 2628void
2357rxvt_term::process_escape_seq () 2629rxvt_term::process_escape_seq ()
2358{ 2630{
2359 unsigned char ch = cmd_getc (); 2631 unicode_t ch = cmd_getc ();
2360 2632
2361 if (PrivateModes & PrivMode_vt52) 2633 if (priv_modes & PrivMode_vt52)
2362 { 2634 {
2363 process_escape_vt52 (ch); 2635 process_escape_vt52 (ch);
2364 return; 2636 return;
2365 } 2637 }
2366 2638
… …
2381 scr_charset_set (2, (unsigned int)cmd_getc ()); 2653 scr_charset_set (2, (unsigned int)cmd_getc ());
2382 break; 2654 break;
2383 case '+': 2655 case '+':
2384 scr_charset_set (3, (unsigned int)cmd_getc ()); 2656 scr_charset_set (3, (unsigned int)cmd_getc ());
2385 break; 2657 break;
2386#ifdef MULTICHAR_SET 2658#if !ENABLE_MINIMAL
2387 case '$':
2388 scr_charset_set (-2, (unsigned int)cmd_getc ());
2389 break;
2390#endif
2391#ifndef NO_FRILLS
2392 case '6': 2659 case '6':
2393 scr_backindex (); 2660 scr_backindex ();
2394 break; 2661 break;
2395#endif 2662#endif
2396 case '7': 2663 case '7':
2397 scr_cursor (SAVE); 2664 scr_cursor (SAVE);
2398 break; 2665 break;
2399 case '8': 2666 case '8':
2400 scr_cursor (RESTORE); 2667 scr_cursor (RESTORE);
2401 break; 2668 break;
2402#ifndef NO_FRILLS 2669#if !ENABLE_MINIMAL
2403 case '9': 2670 case '9':
2404 scr_forwardindex (); 2671 scr_forwardindex ();
2405 break; 2672 break;
2406#endif 2673#endif
2407 case '=': 2674 case '=':
… …
2417 break; 2684 break;
2418 2685
2419 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2420 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2421 { 2688 {
2422 uint32_t nlcr[] = { '\n', '\r' }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2423 scr_add_lines (nlcr, 1, 2); 2690 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2424 } 2691 }
2425 break; 2692 break;
2426 2693
2427 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2428 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2438 case C1_RI: /* ESC M */ 2705 case C1_RI: /* ESC M */
2439 scr_index (DN); 2706 scr_index (DN);
2440 break; 2707 break;
2441 2708
2442 /* 8.3.142: SINGLE-SHIFT TWO */ 2709 /* 8.3.142: SINGLE-SHIFT TWO */
2443 /*case C1_SS2: scr_single_shift (2); break; */ 2710 /*case C1_SS2: scr_single_shift (2); break; */
2444 2711
2445 /* 8.3.143: SINGLE-SHIFT THREE */ 2712 /* 8.3.143: SINGLE-SHIFT THREE */
2446 /*case C1_SS3: scr_single_shift (3); break; */ 2713 /*case C1_SS3: scr_single_shift (3); break; */
2447 2714
2448 /* 8.3.27: DEVICE CONTROL STRING */ 2715 /* 8.3.27: DEVICE CONTROL STRING */
2449 case C1_DCS: /* ESC P */ 2716 case C1_DCS: /* ESC P */
2450 process_dcs_seq (); 2717 process_dcs_seq ();
2451 break; 2718 break;
2452 2719
2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2454 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
2455 tt_write ((const unsigned char *)ESCZ_ANSWER, 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2456 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2457 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
2458 2724
2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2460 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
2461 process_csi_seq (); 2727 process_csi_seq ();
… …
2466 process_osc_seq (); 2732 process_osc_seq ();
2467 break; 2733 break;
2468 2734
2469 /* 8.3.106: RESET TO INITIAL STATE */ 2735 /* 8.3.106: RESET TO INITIAL STATE */
2470 case 'c': 2736 case 'c':
2737 mbstate.reset ();
2471 scr_poweron (); 2738 scr_poweron ();
2472 scrollbar_show (1); 2739 scrollbar_show (1);
2473 break; 2740 break;
2474 2741
2475 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2487 2754
2488/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2489/* *INDENT-OFF* */ 2756/* *INDENT-OFF* */
2490enum { 2757enum {
2491 CSI_ICH = 0x40, 2758 CSI_ICH = 0x40,
2492 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2493 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2760 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2494 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2761 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2495 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2762 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2496 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2763 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2497 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2512 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2781 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2782 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2783 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2784 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2518 }; 2785 };
2519/* *INDENT-ON* */ 2786/* *INDENT-ON* */
2520 2787
2521void 2788void
2522rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
2523{ 2790{
2524 unsigned char ch, priv, i; 2791 unicode_t ch, priv, i;
2525 unsigned int nargs, p; 2792 unsigned int nargs, p;
2526 int n, ndef; 2793 int n, ndef;
2527 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
2528 2795
2529 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
2530 arg[--nargs] = 0;
2531 2797
2532 priv = 0; 2798 priv = 0;
2533 ch = cmd_getc (); 2799 ch = cmd_getc ();
2534 if (ch >= '<' && ch <= '?') 2800 if (ch >= '<' && ch <= '?')
2535 { /* '<' '=' '>' '?' */ 2801 { /* '<' '=' '>' '?' */
2536 priv = ch; 2802 priv = ch;
2537 ch = cmd_getc (); 2803 ch = cmd_getc ();
2538 } 2804 }
2805
2539 /* read any numerical arguments */ 2806 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2807 for (n = -1; ch < CSI_ICH; )
2541 { 2808 {
2542 if (isdigit (ch)) 2809 if (isdigit (ch))
2543 { 2810 {
… …
2550 { 2817 {
2551 if (nargs < ESC_ARGS) 2818 if (nargs < ESC_ARGS)
2552 arg[nargs++] = n; 2819 arg[nargs++] = n;
2553 n = -1; 2820 n = -1;
2554 } 2821 }
2555 else if (ch == '\b') 2822 else if (IS_CONTROL (ch))
2556 {
2557 scr_backspace ();
2558 }
2559 else if (ch == C0_ESC)
2560 {
2561 process_escape_seq ();
2562 return;
2563 }
2564 else if (ch < ' ')
2565 {
2566 process_nonprinting (ch); 2823 process_nonprinting (ch);
2567 } 2824
2568 ch = cmd_getc (); 2825 ch = cmd_getc ();
2569 } 2826 }
2570 2827
2571 if (ch > CSI_7F) 2828 if (ch > CSI_7F)
2572 return; 2829 return;
… …
2578 ndef = get_byte_array_bit (csi_defaults, i); 2835 ndef = get_byte_array_bit (csi_defaults, i);
2579 for (p = 0; p < nargs; p++) 2836 for (p = 0; p < nargs; p++)
2580 if (arg[p] == -1) 2837 if (arg[p] == -1)
2581 arg[p] = ndef; 2838 arg[p] = ndef;
2582 2839
2583#ifdef DEBUG_CMD
2584 fprintf (stderr, "CSI ");
2585 for (p = 0; p < nargs; p++)
2586 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2587 fprintf (stderr, "%c\n", ch);
2588#endif
2589
2590 /* 2840 /*
2591 * private mode handling 2841 * private mode handling
2592 */ 2842 */
2593 if (priv) 2843 if (priv)
2594 { 2844 {
2595 switch (priv) 2845 switch (priv)
2596 { 2846 {
2597 case '>': 2847 case '>':
2598 if (ch == CSI_DA) /* secondary device attributes */ 2848 if (ch == CSI_DA) /* secondary device attributes */
2849 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2855 // that we do not support xterm mouse reporting (should be 95 when we do).
2856 //
2599 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2857 tt_printf ("\033[>%d;94;0c", 'U');
2858 }
2600 break; 2859 break;
2601 case '?': 2860 case '?':
2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2603 process_terminal_mode (ch, priv, nargs, arg); 2862 process_terminal_mode (ch, priv, nargs, arg);
2604 break; 2863 break;
… …
2709 2968
2710 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2969 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2711 arg[0] = -arg[0]; 2970 arg[0] = -arg[0];
2712 /* FALLTHROUGH */ 2971 /* FALLTHROUGH */
2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2972 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2973 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2715 break; 2974 break;
2716 2975
2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2976 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2718 tt_write ((const unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2719 (unsigned int) (sizeof (VT100_ANS) - 1));
2720 break; 2978 break;
2721 2979
2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2980 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2723 process_sgr_mode (nargs, arg); 2981 process_sgr_mode (nargs, arg);
2724 break; 2982 break;
… …
2730 tt_printf ("\033[0n"); 2988 tt_printf ("\033[0n");
2731 break; 2989 break;
2732 case 6: /* CPR requested */ 2990 case 6: /* CPR requested */
2733 scr_report_position (); 2991 scr_report_position ();
2734 break; 2992 break;
2735#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2993 case 7: /* unofficial extension */
2994 if (option (Opt_insecure))
2737 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2995 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2738 break; 2996 break;
2739#endif
2740 case 8: /* unofficial extension */ 2997 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2998 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2742 break; 2999 break;
2743 } 3000 }
2744 break; 3001 break;
2745 3002
2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3003 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2779 break; 3036 break;
2780 3037
2781 case CSI_RM: /* 8.3.107: RESET MODE */ 3038 case CSI_RM: /* 8.3.107: RESET MODE */
2782 if (arg[0] == 4) 3039 if (arg[0] == 4)
2783 scr_insert_mode (0); 3040 scr_insert_mode (0);
3041 else if (arg[0] == 20)
3042 priv_modes &= ~PrivMode_LFNL;
2784 break; 3043 break;
2785 3044
2786 case CSI_SM: /* 8.3.126: SET MODE */ 3045 case CSI_SM: /* 8.3.126: SET MODE */
2787 if (arg[0] == 4) 3046 if (arg[0] == 4)
2788 scr_insert_mode (1); 3047 scr_insert_mode (1);
3048 else if (arg[0] == 20)
3049 priv_modes |= PrivMode_LFNL;
2789 break; 3050 break;
2790 3051
2791 /* 3052 /*
2792 * PRIVATE USE beyond this point. All CSI_7? sequences here 3053 * PRIVATE USE beyond this point. All CSI_7? sequences here
2793 */ 3054 */
… …
2805 break; 3066 break;
2806 case CSI_75: 3067 case CSI_75:
2807 scr_cursor (RESTORE); 3068 scr_cursor (RESTORE);
2808 break; 3069 break;
2809 3070
2810#ifndef NO_FRILLS 3071#if !ENABLE_MINIMAL
2811 case CSI_74: 3072 case CSI_74:
2812 process_window_ops (arg, nargs); 3073 process_window_ops (arg, nargs);
2813 break; 3074 break;
2814#endif 3075#endif
2815 3076
2816 case CSI_78: /* DECREQTPARM */ 3077 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 3078 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3079 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 3080 break;
2820 3081
2821 default: 3082 default:
2822 break; 3083 break;
2823 } 3084 }
2824} 3085}
2825/*}}} */ 3086/*}}} */
2826 3087
2827#ifndef NO_FRILLS 3088#if !ENABLE_MINIMAL
2828/* ARGSUSED */ 3089/* ARGSUSED */
2829void 3090void
2830rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3091rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2831{ 3092{
2832 int x, y; 3093 int x, y;
2833#if 0
2834 char *s;
2835#endif
2836 XWindowAttributes wattr; 3094 XWindowAttributes wattr;
2837 Window wdummy; 3095 Window wdummy;
3096
3097 dLocal (Display *, dpy);
2838 3098
2839 if (nargs == 0) 3099 if (nargs == 0)
2840 return; 3100 return;
3101
2841 switch (args[0]) 3102 switch (args[0])
2842 { 3103 {
2843 /* 3104 /*
2844 * commands 3105 * commands
2845 */ 3106 */
2846 case 1: /* deiconify window */ 3107 case 1: /* deiconify window */
2847 XMapWindow (display->display, TermWin.parent[0]); 3108 XMapWindow (dpy, parent[0]);
2848 break; 3109 break;
2849 case 2: /* iconify window */ 3110 case 2: /* iconify window */
2850 XIconifyWindow (display->display, TermWin.parent[0], 3111 XIconifyWindow (dpy, parent[0], display->screen);
2851 DefaultScreen (display->display));
2852 break; 3112 break;
2853 case 3: /* set position (pixels) */ 3113 case 3: /* set position (pixels) */
2854 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3114 XMoveWindow (dpy, parent[0], args[1], args[2]);
2855 break; 3115 break;
2856 case 4: /* set size (pixels) */ 3116 case 4: /* set size (pixels) */
2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3117 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2858 break; 3118 break;
2859 case 5: /* raise window */ 3119 case 5: /* raise window */
2860 XRaiseWindow (display->display, TermWin.parent[0]); 3120 XRaiseWindow (dpy, parent[0]);
2861 break; 3121 break;
2862 case 6: /* lower window */ 3122 case 6: /* lower window */
2863 XLowerWindow (display->display, TermWin.parent[0]); 3123 XLowerWindow (dpy, parent[0]);
2864 break; 3124 break;
2865 case 7: /* refresh window */ 3125 case 7: /* refresh window */
2866 scr_touch (true); 3126 scr_touch (true);
2867 break; 3127 break;
2868 case 8: /* set size (chars) */ 3128 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3129 set_widthheight ((unsigned int) (args[2] * fwidth),
2870 (unsigned int) (args[1] * TermWin.fheight)); 3130 (unsigned int) (args[1] * fheight));
2871 break; 3131 break;
3132
3133 //case 9: NYI, TODO, restore maximized window or maximize window
2872 default: 3134 default:
2873 if (args[0] >= 24) /* set height (chars) */ 3135 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 3136 set_widthheight ((unsigned int)width,
2875 (unsigned int) (args[1] * TermWin.fheight)); 3137 (unsigned int) (args[1] * fheight));
2876 break; 3138 break;
3139
2877 /* 3140 /*
2878 * reports - some output format copied from XTerm 3141 * reports - some output format copied from XTerm
2879 */ 3142 */
2880 case 11: /* report window state */ 3143 case 11: /* report window state */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
2882 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3145 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 3146 break;
2884 case 13: /* report window position */ 3147 case 13: /* report window position */
2885 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
2886 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3149 XTranslateCoordinates (dpy, parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 3150 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 3151 &x, &y, &wdummy);
2889 tt_printf ("\033[3;%d;%dt", x, y); 3152 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 3153 break;
2891 case 14: /* report window size (pixels) */ 3154 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
2893 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3156 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 3157 break;
3158 case 18: /* report text area size (chars) */
3159 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3160 break;
2895 case 18: /* report window size (chars) */ 3161 case 19: /* report window size (chars) */
2896 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3162 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2897 break; 3163 break;
2898#if 0 /* XXX: currently disabled due to security concerns */
2899 case 20: /* report icon label */ 3164 case 20: /* report icon label */
3165 {
3166 char *s;
2900 XGetIconName (display->display, TermWin.parent[0], &s); 3167 XGetIconName (dpy, parent[0], &s);
2901 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s);
3170 }
2902 break; 3171 break;
2903 case 21: /* report window title */ 3172 case 21: /* report window title */
3173 {
3174 char *s;
2904 XFetchName (display->display, TermWin.parent[0], &s); 3175 XFetchName (dpy, parent[0], &s);
2905 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3176 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3177 XFree (s);
3178 }
2906 break; 3179 break;
2907#endif
2908
2909 } 3180 }
2910} 3181}
2911#endif 3182#endif
2912 3183
2913/*----------------------------------------------------------------------*/ 3184/*----------------------------------------------------------------------*/
2914/* 3185/*
2915 * get input up until STRING TERMINATOR (or BEL) 3186 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free ()d 3187 * ends_how is terminator used. returned input must be free()'d
2917 */ 3188 */
2918unsigned char * 3189char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 3190rxvt_term::get_to_st (unicode_t &ends_how)
2920{ 3191{
2921 int seen_esc = 0; /* seen escape? */ 3192 unicode_t ch;
3193 bool seen_esc = false;
2922 unsigned int n = 0; 3194 unsigned int n = 0;
2923 unsigned char *s; 3195 wchar_t string[STRING_MAX];
2924 unsigned char ch, string[STRING_MAX];
2925 3196
2926 for (; (ch = cmd_getc ());) 3197 while ((ch = cmd_getc ()) != NOCHAR)
2927 { 3198 {
2928 if (ch == C0_BEL 3199 if (seen_esc)
2929 || ch == CHAR_ST 3200 {
2930 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3201 if (ch == 0x5c) /* 7bit ST */
2931 break; 3202 break;
3203 else
3204 return NULL;
3205 }
2932 if (ch == C0_ESC) 3206 else if (ch == C0_ESC)
2933 { 3207 {
2934 seen_esc = 1; 3208 seen_esc = true;
2935 continue; 3209 continue;
2936 } 3210 }
3211 else if (ch == C0_BEL || ch == CHAR_ST)
3212 break;
2937 else if (ch == '\t') 3213 else if (ch == C0_SYN)
2938 ch = ' '; /* translate '\t' to space */ 3214 ch = cmd_get8 ();
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3215 else if (ch < 0x20)
2940 return NULL; /* other control character - exit */ 3216 return NULL; /* other control character - exit */
2941 if (n < sizeof (string) - 1) 3217
3218 seen_esc = false;
3219
3220 if (n >= STRING_MAX - 1)
3221 // stop at some sane length
3222 return NULL;
3223
2942 string[n++] = ch; 3224 string[n++] = ch;
2943 seen_esc = 0;
2944 } 3225 }
3226
2945 string[n++] = '\0'; 3227 string[n++] = '\0';
2946 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3228
2947 return NULL;
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3229 ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY (s, string, n); 3230
2950 return s; 3231 return rxvt_wcstombs (string);
2951} 3232}
2952 3233
2953/*----------------------------------------------------------------------*/ 3234/*----------------------------------------------------------------------*/
2954/* 3235/*
2955 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3236 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2956 */ 3237 */
2957void 3238void
2958rxvt_term::process_dcs_seq () 3239rxvt_term::process_dcs_seq ()
2959{ 3240{
2960 unsigned char eh, *s; 3241 char *s;
3242 unicode_t eh;
3243
2961 /* 3244 /*
2962 * Not handled yet 3245 * Not handled yet
2963 */ 3246 */
2964 s = get_to_st (&eh); 3247 s = get_to_st (eh);
2965 if (s) 3248 if (s)
2966 free (s); 3249 free (s);
3250
2967 return; 3251 return;
2968} 3252}
2969 3253
2970/*----------------------------------------------------------------------*/ 3254/*----------------------------------------------------------------------*/
2971/* 3255/*
2972 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2973 */ 3257 */
2974void 3258void
2975rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
2976{ 3260{
2977 unsigned char ch, eh, *s; 3261 unicode_t ch, eh;
2978 int arg; 3262 int arg;
2979 3263
2980 ch = cmd_getc (); 3264 ch = cmd_getc ();
2981 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3265 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 3266 arg = arg * 10 + (ch - '0');
2983 3267
2984 if (ch == ';') 3268 if (ch == ';')
2985 { 3269 {
2986 s = get_to_st (&eh); 3270 char *s = get_to_st (eh);
3271
2987 if (s) 3272 if (s)
2988 { 3273 {
2989 /*
2990 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here
2992 */
2993 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s);
2996#else
2997 (void)0;
2998#endif
2999 else
3000 xterm_seq (arg, (char *)s, eh); 3274 process_xterm_seq (arg, s, eh);
3001 free (s); 3275 free (s);
3002 } 3276 }
3003 } 3277 }
3004} 3278}
3279
3280void
3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3282{
3283 if (str[0] == '?' && !str[1])
3284 {
3285 rgba c;
3286 pix_colors_focused[color].get (c);
3287
3288#if XFT
3289 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3291 else
3292#endif
3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3294 }
3295 else
3296 set_window_color (color, str);
3297}
3298
3005/* 3299/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3007 * 0 = change iconName/title
3008 * 1 = change iconName
3009 * 2 = change title
3010 * 4 = change color
3011 * 12 = change text color
3012 * 13 = change mouse foreground color
3013 * 17 = change highlight character colour
3014 * 18 = change bold character color
3015 * 19 = change underlined character color
3016 * 46 = change logfile (not implemented)
3017 * 50 = change font
3018 *
3019 * rxvt extensions:
3020 * 10 = menu (may change in future)
3021 * 20 = bg pixmap
3022 * 39 = change default fg color
3023 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen
3025 */ 3301 */
3026void 3302void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3303rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3028{ 3304{
3029 int changed = 0; 3305 int color;
3030 int color;
3031 char *buf, *name; 3306 char *buf, *name;
3307 bool query = str[0] == '?' && !str[1];
3308 int saveop = op;
3309
3310 dLocal (Display *, dpy);
3032 3311
3033 assert (str != NULL); 3312 assert (str != NULL);
3313
3314 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3315 return;
3316
3034 switch (op) 3317 switch (op)
3035 { 3318 {
3036 case XTerm_name: 3319 case XTerm_name:
3037 set_title (str); 3320 set_title (str);
3038 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
3039 case XTerm_iconName: 3322 case XTerm_iconName:
3040 set_iconName (str); 3323 set_icon_name (str);
3041 break; 3324 break;
3042 case XTerm_title: 3325 case XTerm_title:
3043 set_title (str); 3326 set_title (str);
3044 break; 3327 break;
3328 case XTerm_property:
3329 if (str[0] == '?')
3330 {
3331 Atom prop = display->atom (str + 1);
3332 Atom actual_type;
3333 int actual_format;
3334 unsigned long nitems;
3335 unsigned long bytes_after;
3336 unsigned char *value = 0;
3337 const char *str = "";
3338
3339 if (prop
3340 && XGetWindowProperty (dpy, parent[0],
3341 prop, 0, 1<<16, 0, AnyPropertyType,
3342 &actual_type, &actual_format,
3343 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None
3345 && actual_format == 8)
3346 str = (const char *)(value);
3347
3348 tt_printf ("\033]%d;%s%c", op, str, resp);
3349
3350 XFree (value);
3351 }
3352 else
3353 {
3354 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3355
3356 if (eq)
3357 {
3358 *eq = 0;
3359 set_utf8_property (display->atom (str), eq + 1);
3360 }
3361 else
3362 XDeleteProperty (dpy, parent[0],
3363 display->atom (str));
3364 }
3365 break;
3366
3045 case XTerm_Color: 3367 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3368 for (buf = (char *)str; buf && *buf;)
3047 { 3369 {
3048 if ((name = STRCHR (buf, ';')) == NULL) 3370 if ((name = strchr (buf, ';')) == NULL)
3049 break; 3371 break;
3372
3050 *name++ = '\0'; 3373 *name++ = '\0';
3051 color = atoi (buf); 3374 color = atoi (buf) + minCOLOR;
3052 if (color < 0 || color >= TOTAL_COLORS) 3375
3376 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3053 break; 3377 break;
3378
3054 if ((buf = STRCHR (name, ';')) != NULL) 3379 if ((buf = strchr (name, ';')) != NULL)
3055 *buf++ = '\0'; 3380 *buf++ = '\0';
3056 set_window_color (color + minCOLOR, name); 3381
3382 process_color_seq (op, color, name, resp);
3057 } 3383 }
3384 break;
3385 case XTerm_Color00:
3386 process_color_seq (op, Color_fg, str, resp);
3387 break;
3388 case XTerm_Color01:
3389 process_color_seq (op, Color_bg, str, resp);
3058 break; 3390 break;
3059#ifndef NO_CURSORCOLOR 3391#ifndef NO_CURSORCOLOR
3060 case XTerm_Color_cursor: 3392 case XTerm_Color_cursor:
3061 set_window_color (Color_cursor, str); 3393 process_color_seq (op, Color_cursor, str, resp);
3062 break; 3394 break;
3063#endif 3395#endif
3064 case XTerm_Color_pointer: 3396 case XTerm_Color_pointer_fg:
3065 set_window_color (Color_pointer, str); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3398 break;
3399 case XTerm_Color_pointer_bg:
3400 process_color_seq (op, Color_pointer_bg, str, resp);
3066 break; 3401 break;
3067#ifndef NO_BOLD_UNDERLINE_REVERSE 3402#ifndef NO_BOLD_UNDERLINE_REVERSE
3068 case XTerm_Color_BD:
3069 set_window_color (Color_BD, str);
3070 break;
3071 case XTerm_Color_UL:
3072 set_window_color (Color_UL, str);
3073 break;
3074 case XTerm_Color_RV: 3403 case XTerm_Color_RV:
3075 set_window_color (Color_RV, str); 3404 process_color_seq (op, Color_RV, str, resp);
3076 break; 3405 break;
3406 case Rxvt_Color_BD:
3407 case URxvt_Color_BD:
3408 process_color_seq (op, Color_BD, str, resp);
3409 break;
3410 case Rxvt_Color_UL:
3411 case URxvt_Color_UL:
3412 process_color_seq (op, Color_UL, str, resp);
3413 break;
3414 case URxvt_Color_IT:
3415 process_color_seq (op, Color_IT, str, resp);
3416 break;
3077#endif 3417#endif
3078 3418#if ENABLE_TRANSPARENCY
3079 case XTerm_Menu: 3419 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp);
3080 /* 3421 {
3081 * rxvt_menubar_dispatch () violates the constness of the string, 3422 bool changed = false;
3082 * so DON'T do it here 3423 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3425 else
3426 changed = bgPixmap.unset_tint ();
3427 if (changed)
3428 update_background ();
3083 */ 3429 }
3430
3084 break; 3431 break;
3432#endif
3433
3434#if BG_IMAGE_FROM_FILE
3085 case XTerm_Pixmap: 3435 case Rxvt_Pixmap:
3086 if (*str != ';') 3436 if (!strcmp (str, "?"))
3087 { 3437 {
3088#if XPM_BACKGROUND 3438 char str[256];
3089 scale_pixmap (""); /* reset to default scaling */ 3439
3090 set_bgPixmap (str); /* change pixmap */ 3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3091#endif 3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3092 scr_touch (true); 3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3443 process_xterm_seq (XTerm_title, str, CHAR_ST);
3093 } 3444 }
3094 while ((str = STRCHR (str, ';')) != NULL) 3445 else
3095 { 3446 {
3447 int changed = 0;
3448
3449 if (*str != ';')
3450 {
3451 /* reset to default scaling :*/
3452 bgPixmap.unset_geometry ();
3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 changed++;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 }
3459 while (str)
3460 {
3096 str++; 3461 str++;
3097#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3098 changed += scale_pixmap (str); 3463 changed++;
3099#endif 3464 str = strchr (str, ';');
3100 3465 }
3466 if (changed)
3467 update_background ();
3101 } 3468 }
3102 if (changed)
3103 {
3104#ifdef XPM_BACKGROUND
3105 resize_pixmap ();
3106#endif
3107 scr_touch (true);
3108 }
3109 break; 3469 break;
3470#endif
3110 3471
3111 case XTerm_restoreFG: 3472 case Rxvt_restoreFG:
3112 set_window_color (Color_fg, str); 3473 set_window_color (Color_fg, str);
3113 break; 3474 break;
3114 case XTerm_restoreBG: 3475 case Rxvt_restoreBG:
3115 set_window_color (Color_bg, str); 3476 set_window_color (Color_bg, str);
3116 break; 3477 break;
3478
3117 case XTerm_logfile: 3479 case XTerm_logfile:
3480 // TODO, when secure mode?
3118 break; 3481 break;
3119 case XTerm_font: 3482
3120 change_font (0, str);
3121 break;
3122#if 0 3483#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3484 case Rxvt_dumpscreen: /* no error notices */
3124 { 3485 {
3125 int fd; 3486 int fd;
3126 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3487 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3488 {
3128 scr_dump (fd); 3489 scr_dump (fd);
3129 close (fd); 3490 close (fd);
3130 } 3491 }
3131 } 3492 }
3132 break; 3493 break;
3133#endif 3494#endif
3495 case XTerm_font:
3496 op = URxvt_font;
3497 case URxvt_font:
3498#if ENABLE_STYLES
3499 case URxvt_boldFont:
3500 case URxvt_italicFont:
3501 case URxvt_boldItalicFont:
3502#endif
3503 if (query)
3504 tt_printf ("\33]%d;%-.250s%c", saveop,
3505 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3506 ? fontset[op - URxvt_font]->fontdesc : "",
3507 resp);
3508 else
3509 {
3510 const char *&res = rs[Rs_font + (op - URxvt_font)];
3134 3511
3512 res = strdup (str);
3513 allocated.push_back ((void *)res);
3514 set_fonts ();
3515 }
3516 break;
3517
3518 case URxvt_version:
3519 if (query)
3520 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3521 op,
3522 rs[Rs_name], VERSION[0], VERSION[2],
3523 resp);
3524 break;
3525
3526#if !ENABLE_MINIMAL
3527 case URxvt_locale:
3528 if (query)
3529 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3530 else
3531 {
3532 set_locale (str);
3533 pty->set_utf8_mode (enc_utf8);
3534 init_xlocale ();
3535 }
3536 break;
3537
3538 case URxvt_view_up:
3539 case URxvt_view_down:
3540 {
3541 int lines = atoi (str);
3542
3543 if (lines)
3544 scr_page (op == URxvt_view_up ? UP : DN, lines);
3545 else
3546 scr_erase_savelines ();
3547 }
3548
3549 break;
3550#endif
3551
3552#if ENABLE_PERL
3553 case URxvt_perl:
3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3555 ; // no responses yet
3556 break;
3557#endif
3135 } 3558 }
3136} 3559}
3137/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
3138 3561
3139/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3562/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3147 * so no need for fancy checking 3570 * so no need for fancy checking
3148 */ 3571 */
3149int 3572int
3150rxvt_term::privcases (int mode, unsigned long bit) 3573rxvt_term::privcases (int mode, unsigned long bit)
3151{ 3574{
3152 int state; 3575 int state;
3153 3576
3154 if (mode == 's') 3577 if (mode == 's')
3155 { 3578 {
3156 SavedModes |= (PrivateModes & bit); 3579 SavedModes |= (priv_modes & bit);
3157 return -1; 3580 return -1;
3158 } 3581 }
3159 else 3582 else
3160 { 3583 {
3161 if (mode == 'r') 3584 if (mode == 'r')
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3586 else
3164 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3587 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3165 PrivMode (state, bit); 3588 PrivMode (state, bit);
3166 } 3589 }
3590
3167 return state; 3591 return state;
3168} 3592}
3169 3593
3170/* we're not using priv _yet_ */ 3594/* we're not using priv _yet_ */
3171void 3595void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3596rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3173{ 3597{
3174 unsigned int i, j; 3598 unsigned int i, j;
3175 int state; 3599 int state;
3600
3176 static const struct 3601 static const struct
3177 { 3602 {
3178 const int argval; 3603 const int argval;
3179 const unsigned long bit; 3604 const unsigned long bit;
3180 }
3181 argtopriv[] = { 3605 } argtopriv[] = {
3182 { 1, PrivMode_aplCUR }, 3606 { 1, PrivMode_aplCUR },
3183 { 2, PrivMode_vt52 }, 3607 { 2, PrivMode_vt52 },
3184 { 3, PrivMode_132 }, 3608 { 3, PrivMode_132 },
3185 { 4, PrivMode_smoothScroll }, 3609 { 4, PrivMode_smoothScroll },
3186 { 5, PrivMode_rVideo }, 3610 { 5, PrivMode_rVideo },
3187 { 6, PrivMode_relOrigin }, 3611 { 6, PrivMode_relOrigin },
3188 { 7, PrivMode_Autowrap }, 3612 { 7, PrivMode_Autowrap },
3613 // 8, bi-directional support mode
3189 { 9, PrivMode_MouseX10 }, 3614 { 9, PrivMode_MouseX10 },
3190#ifdef menuBar_esc 3615 // 18, 19 printing-related
3191 { menuBar_esc, PrivMode_menuBar }, 3616 { 25, PrivMode_VisibleCursor },
3192#endif
3193#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3194 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3195#endif 3619#endif
3196 { 25, PrivMode_VisibleCursor },
3197 { 35, PrivMode_ShiftKeys }, 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3198 { 40, PrivMode_132OK }, 3621 { 40, PrivMode_132OK },
3622 // 41 xterm more fixes NYI
3623 // 45 margin bell NYI
3624 // 46 start logging
3199 { 47, PrivMode_Screen }, 3625 { 47, PrivMode_Screen },
3200 { 66, PrivMode_aplKP }, 3626 { 66, PrivMode_aplKP },
3201#ifndef NO_BACKSPACE_KEY 3627#ifndef NO_BACKSPACE_KEY
3202 { 67, PrivMode_BackSpace }, 3628 { 67, PrivMode_BackSpace },
3203#endif 3629#endif
3204 { 1000, PrivMode_MouseX11 }, 3630 { 1000, PrivMode_MouseX11 },
3631 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3632 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3633 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3205 { 1010, PrivMode_TtyOutputInh }, 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3206 { 1011, PrivMode_Keypress }, 3635 { 1011, PrivMode_Keypress }, // rxvt extension
3636 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI
3207 { 1047, PrivMode_Screen }, 3639 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor
3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3209 }; 3643 };
3210 3644
3211 if (nargs == 0) 3645 if (nargs == 0)
3212 return; 3646 return;
3213 3647
… …
3228 state = privcases (mode, argtopriv[j].bit); 3662 state = privcases (mode, argtopriv[j].bit);
3229 break; 3663 break;
3230 } 3664 }
3231 3665
3232 /* extra handling for values with state unkept */ 3666 /* extra handling for values with state unkept */
3233 if (state == -1)
3234 switch (arg[i]) 3667 switch (arg[i])
3235 { 3668 {
3669#if ENABLE_STYLES
3670 case 1021:
3671 set_option (Opt_intensityStyles, mode);
3672
3673 scr_touch (true);
3674 break;
3675#endif
3236 case 1048: /* alternative cursor save */ 3676 case 1048: /* alternative cursor save */
3677 case 1049:
3678 if (option (Opt_secondaryScreen))
3237 if (mode == 0) 3679 if (mode == 0)
3238 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3239 else if (mode == 1) 3681 else if (mode == 1)
3240 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
3241 /* FALLTHROUGH */
3242 default:
3243 continue; /* for (;i;) */
3244 }
3245
3246 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i])
3248 {
3249 /* case 1: - application cursor keys */
3250 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode
3254 */
3255 PrivMode (1, PrivMode_vt52);
3256 break; 3683 break;
3684 }
3685
3686 if (state >= 0)
3687 /* extra handling for values with valid 0 or 1 state */
3688 switch (arg[i])
3689 {
3690 /* case 1: - application cursor keys */
3691 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode
3695 */
3696 PrivMode (1, PrivMode_vt52);
3697 break;
3257 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3700 set_widthheight (((state ? 132 : 80) * fwidth), height);
3260 (unsigned int)TermWin.height);
3261 break; 3701 break;
3262 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
3263 if (state)
3264 Options &= ~Opt_jumpScroll;
3265 else
3266 Options |= Opt_jumpScroll; 3703 set_option (Opt_jumpScroll, !state);
3267 break; 3704 break;
3268 case 5: /* reverse video */ 3705 case 5: /* reverse video */
3269 scr_rvideo_mode (state); 3706 scr_rvideo_mode (state);
3270 break; 3707 break;
3271 case 6: /* relative/absolute origins */ 3708 case 6: /* relative/absolute origins */
3272 scr_relative_origin (state); 3709 scr_relative_origin (state);
3273 break; 3710 break;
3274 case 7: /* autowrap */ 3711 case 7: /* autowrap */
3275 scr_autowrap (state); 3712 scr_autowrap (state);
3276 break; 3713 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3280 PrivateModes &= ~ (PrivMode_MouseX11); 3717 priv_modes &= ~PrivMode_MouseX11;
3281 break; 3718 break;
3282#ifdef menuBar_esc
3283 case menuBar_esc:
3284#ifdef MENUBAR
3285 map_menuBar (state);
3286#endif
3287 break;
3288#endif
3289#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
3290 case scrollBar_esc: 3720 case scrollBar_esc:
3291 if (scrollbar_mapping (state)) 3721 if (scrollbar_mapping (state))
3292 { 3722 {
3293 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
3294 scr_touch (true); 3724 scr_touch (true);
3295 } 3725 }
3296 break; 3726 break;
3297#endif 3727#endif
3298 case 25: /* visible/invisible cursor */ 3728 case 25: /* visible/invisible cursor */
3299 scr_cursor_visible (state); 3729 scr_cursor_visible (state);
3300 break; 3730 break;
3301 /* case 35: - shift keys */ 3731 /* case 35: - shift keys */
3302 /* case 40: - 80 <--> 132 mode */ 3732 /* case 40: - 80 <--> 132 mode */
3303 case 47: /* secondary screen */ 3733 case 47: /* secondary screen */
3304 scr_change_screen (state); 3734 scr_change_screen (state);
3305 break; 3735 break;
3306 /* case 66: - application key pad */ 3736 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3737 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3738 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
3310 PrivateModes &= ~ (PrivMode_MouseX10); 3740 priv_modes &= ~PrivMode_MouseX10;
3311 break; 3741 break;
3312#if 0 3742#if 0
3313 case 1001: 3743 case 1001:
3314 break; /* X11 mouse highlighting */ 3744 break; /* X11 mouse highlighting */
3315#endif 3745#endif
3316 case 1010: /* scroll to bottom on TTY output inhibit */ 3746 case 1010: /* scroll to bottom on TTY output inhibit */
3317 if (state)
3318 Options &= ~Opt_scrollTtyOutput;
3319 else
3320 Options |= Opt_scrollTtyOutput; 3747 set_option (Opt_scrollTtyOutput, !state);
3321 break; 3748 break;
3322 case 1011: /* scroll to bottom on key press */ 3749 case 1011: /* scroll to bottom on key press */
3323 if (state)
3324 Options |= Opt_scrollTtyKeypress; 3750 set_option (Opt_scrollTtyKeypress, state);
3325 else
3326 Options &= ~Opt_scrollTtyKeypress;
3327 break; 3751 break;
3328 case 1047: /* secondary screen w/ clearing */ 3752 case 1047: /* secondary screen w/ clearing last */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3753 if (option (Opt_secondaryScreen))
3330 if (current_screen != PRIMARY) 3754 if (current_screen != PRIMARY)
3331 scr_erase_screen (2); 3755 scr_erase_screen (2);
3332 scr_change_screen (state); 3756 scr_change_screen (state);
3333 /* FALLTHROUGH */
3334 default:
3335 break; 3757 break;
3758 case 1049: /* secondary screen w/ clearing first */
3759 scr_change_screen (state);
3760 if (option (Opt_secondaryScreen))
3761 if (current_screen != PRIMARY)
3762 scr_erase_screen (2);
3763 break;
3764 default:
3765 break;
3336 } 3766 }
3337 } 3767 }
3338} 3768}
3339/*}}} */ 3769/*}}} */
3340 3770
3341/*{{{ process sgr sequences */ 3771/*{{{ process sgr sequences */
3342void 3772void
3343rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3773rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3344{ 3774{
3345 unsigned int i; 3775 unsigned int i;
3346 short rendset; 3776 short rendset;
3347 int rendstyle; 3777 int rendstyle;
3348 3778
3349 if (nargs == 0) 3779 if (nargs == 0)
3350 { 3780 {
3351 scr_rendition (0, ~RS_None); 3781 scr_rendition (0, ~RS_None);
3352 return; 3782 return;
3353 } 3783 }
3784
3354 for (i = 0; i < nargs; i++) 3785 for (i = 0; i < nargs; i++)
3355 { 3786 {
3356 rendset = -1; 3787 rendset = -1;
3357 switch (arg[i]) 3788 switch (arg[i])
3358 { 3789 {
… …
3360 rendset = 0, rendstyle = ~RS_None; 3791 rendset = 0, rendstyle = ~RS_None;
3361 break; 3792 break;
3362 case 1: 3793 case 1:
3363 rendset = 1, rendstyle = RS_Bold; 3794 rendset = 1, rendstyle = RS_Bold;
3364 break; 3795 break;
3796 //case 2: // low intensity
3797 case 3:
3798 rendset = 1, rendstyle = RS_Italic;
3799 break;
3365 case 4: 3800 case 4:
3366 rendset = 1, rendstyle = RS_Uline; 3801 rendset = 1, rendstyle = RS_Uline;
3367 break; 3802 break;
3368 case 5: 3803 case 5: // slowly blinking
3804 case 6: // rapidly blinking
3369 rendset = 1, rendstyle = RS_Blink; 3805 rendset = 1, rendstyle = RS_Blink;
3370 break; 3806 break;
3807 //case 6: // scoansi light background
3371 case 7: 3808 case 7:
3372 rendset = 1, rendstyle = RS_RVid; 3809 rendset = 1, rendstyle = RS_RVid;
3373 break; 3810 break;
3374 case 22: 3811 case 8:
3812 // invisible. NYI
3813 break;
3814 //case 9: // crossed out
3815 //case 10: // scoansi acs off, primary font
3816 //case 11: // scoansi acs on, first alt font
3817 //case 12: // scoansi acs on, |0x80, second alt font
3818 //...
3819 //case 19: // ninth alt font
3820 //case 20: // gothic
3821 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3375 rendset = 0, rendstyle = RS_Bold; 3822 rendset = 0, rendstyle = RS_Bold;
3823 break;
3824 case 22: // normal intensity
3825 rendset = 0, rendstyle = RS_Bold;
3826 break;
3827 case 23: // disable italic
3828 rendset = 0, rendstyle = RS_Italic;
3376 break; 3829 break;
3377 case 24: 3830 case 24:
3378 rendset = 0, rendstyle = RS_Uline; 3831 rendset = 0, rendstyle = RS_Uline;
3379 break; 3832 break;
3380 case 25: 3833 case 25:
3381 rendset = 0, rendstyle = RS_Blink; 3834 rendset = 0, rendstyle = RS_Blink;
3382 break; 3835 break;
3836 case 26: // variable spacing (iso 8613)
3837 rendset = 0, rendstyle = RS_Blink;
3838 break;
3383 case 27: 3839 case 27:
3384 rendset = 0, rendstyle = RS_RVid; 3840 rendset = 0, rendstyle = RS_RVid;
3385 break; 3841 break;
3842 //case 28: // visible. NYI
3843 //case 29: // not crossed-out
3386 } 3844 }
3845
3387 if (rendset != -1) 3846 if (rendset != -1)
3388 { 3847 {
3389 scr_rendition (rendset, rendstyle); 3848 scr_rendition (rendset, rendstyle);
3390 continue; /* for (;i;) */ 3849 continue; /* for (;i;) */
3391 } 3850 }
… …
3398 case 33: 3857 case 33:
3399 case 34: 3858 case 34:
3400 case 35: 3859 case 35:
3401 case 36: 3860 case 36:
3402 case 37: 3861 case 37:
3403 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3862 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3404 Color_fg);
3405 break; 3863 break;
3406#ifdef TTY_256COLOR 3864 case 38: // set fg color, ISO 8613-6
3407 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3865 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3866 {
3410 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3867 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3411 Color_fg);
3412 i += 2; 3868 i += 2;
3413 } 3869 }
3414 break; 3870 break;
3415#endif
3416 case 39: /* default fg */ 3871 case 39: /* default fg */
3417 scr_color (Color_fg, Color_fg); 3872 scr_color (Color_fg, Color_fg);
3418 break; 3873 break;
3419 3874
3420 case 40: 3875 case 40:
… …
3423 case 43: 3878 case 43:
3424 case 44: 3879 case 44:
3425 case 45: 3880 case 45:
3426 case 46: 3881 case 46:
3427 case 47: 3882 case 47:
3428 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3883 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3429 Color_bg);
3430 break; 3884 break;
3431#ifdef TTY_256COLOR 3885 case 48: // set bg color, ISO 8613-6
3432 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3886 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3887 {
3435 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3436 Color_bg);
3437 i += 2; 3889 i += 2;
3438 } 3890 }
3439 break; 3891 break;
3440#endif
3441 case 49: /* default bg */ 3892 case 49: /* default bg */
3442 scr_color (Color_bg, Color_bg); 3893 scr_color (Color_bg, Color_bg);
3443 break; 3894 break;
3444 3895
3445#ifndef NO_BRIGHTCOLOR 3896 //case 50: // not variable spacing
3897
3898#if !ENABLE_MINIMAL
3446 case 90: 3899 case 90:
3447 case 91: /* set bright fg color */ 3900 case 91: /* set bright fg color */
3448 case 92: 3901 case 92:
3449 case 93: 3902 case 93:
3450 case 94: 3903 case 94:
3451 case 95: 3904 case 95:
3452 case 96: 3905 case 96:
3453 case 97: 3906 case 97:
3454 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3907 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3455 Color_fg);
3456 break; 3908 break;
3457 case 100: 3909 case 100:
3458 case 101: /* set bright bg color */ 3910 case 101: /* set bright bg color */
3459 case 102: 3911 case 102:
3460 case 103: 3912 case 103:
3461 case 104: 3913 case 104:
3462 case 105: 3914 case 105:
3463 case 106: 3915 case 106:
3464 case 107: 3916 case 107:
3465 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3466 Color_bg);
3467 break; 3918 break;
3468#endif 3919#endif
3469
3470 } 3920 }
3471 } 3921 }
3472} 3922}
3473/*}}} */ 3923/*}}} */
3474 3924
3475/*{{{ process Rob Nation's own graphics mode sequences */ 3925/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3476void 3926void
3477rxvt_term::process_graphics () 3927rxvt_term::process_graphics ()
3478{ 3928{
3479 unsigned char ch, cmd = cmd_getc (); 3929 unicode_t ch, cmd = cmd_getc ();
3480 3930
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3931 if (cmd == 'Q')
3483 { /* query graphics */ 3932 { /* query graphics */
3484 tt_printf ("\033G0\n"); /* no graphics */ 3933 tt_printf ("\033G0\012"); /* no graphics */
3485 return; 3934 return;
3486 } 3935 }
3487 /* swallow other graphics sequences until terminating ':' */ 3936 /* swallow other graphics sequences until terminating ':' */
3488 do 3937 do
3489 ch = cmd_getc (); 3938 ch = cmd_getc ();
3490 while (ch != ':'); 3939 while (ch != ':');
3491#else
3492 unsigned int nargs;
3493 int args[NGRX_PTS];
3494 unsigned char *text = NULL;
3495
3496 if (cmd == 'Q')
3497 { /* query graphics */
3498 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3499 return;
3500 }
3501 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3502 {
3503 int neg;
3504
3505 ch = cmd_getc ();
3506 neg = (ch == '-');
3507 if (neg || ch == '+')
3508 ch = cmd_getc ();
3509
3510 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg)
3513 args[nargs] = -args[nargs];
3514
3515 nargs++;
3516 args[nargs] = 0;
3517 if (ch != ';')
3518 break;
3519 }
3520
3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3523 int i, len = args[4];
3524
3525 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3526
3527 if (text != NULL)
3528 {
3529 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc ();
3531 text[len] = '\0';
3532 }
3533 }
3534 Gr_do_graphics (cmd, nargs, args, text);
3535#endif
3536} 3940}
3537/*}}} */ 3941/*}}} */
3538 3942
3539/* ------------------------------------------------------------------------- */ 3943/* ------------------------------------------------------------------------- */
3540 3944
… …
3544 */ 3948 */
3545void 3949void
3546rxvt_term::tt_printf (const char *fmt,...) 3950rxvt_term::tt_printf (const char *fmt,...)
3547{ 3951{
3548 va_list arg_ptr; 3952 va_list arg_ptr;
3549 unsigned char buf[256]; 3953 char buf[256];
3550 3954
3551 va_start (arg_ptr, fmt); 3955 va_start (arg_ptr, fmt);
3552 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3956 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3553 va_end (arg_ptr); 3957 va_end (arg_ptr);
3554 tt_write (buf, STRLEN (buf)); 3958 tt_write (buf, strlen (buf));
3555} 3959}
3556 3960
3557/* ---------------------------------------------------------------------- */ 3961/* ---------------------------------------------------------------------- */
3558/* Write data to the pty as typed by the user, pasted with the mouse, 3962/* Write data to the pty as typed by the user, pasted with the mouse,
3559 * or generated by us in response to a query ESC sequence. 3963 * or generated by us in response to a query ESC sequence.
3560 */ 3964 */
3965const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3966
3561void 3967void
3562rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3968rxvt_term::tt_write (const char *data, unsigned int len)
3563{ 3969{
3564 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3970 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3971 return;
3565 3972
3566 if (len) 3973 if (pty->pty < 0)
3974 return;
3975
3976 if (v_buflen == 0)
3977 {
3978 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3979
3980 if ((unsigned int)written == len)
3981 return;
3982
3983 data += written;
3984 len -= written;
3567 { 3985 }
3986
3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3988
3989 memcpy (v_buffer + v_buflen, data, len);
3990 v_buflen += len;
3991
3992 pty_ev.set (EVENT_READ | EVENT_WRITE);
3993}
3994
3995void rxvt_term::pty_write ()
3996{
3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3998
3999 if (written > 0)
4000 {
4001 v_buflen -= written;
4002
3568 if (v_buflen == 0) 4003 if (v_buflen == 0)
3569 { 4004 {
3570 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3571
3572 if ((unsigned int)written == len)
3573 return;
3574
3575 data += written;
3576 len -= written;
3577 }
3578
3579
3580 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3581
3582 memcpy (v_buffer + v_buflen, data, len);
3583 v_buflen += len;
3584 }
3585
3586 for (;;)
3587 {
3588 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3589
3590 if (written > 0)
3591 {
3592 v_buflen -= written;
3593
3594 if (v_buflen == 0)
3595 {
3596 free (v_buffer); 4005 free (v_buffer);
3597 v_buffer = 0; 4006 v_buffer = 0;
3598 v_buflen = 0;
3599 4007
3600 pty_ev.set (EVENT_READ); 4008 pty_ev.set (EVENT_READ);
3601 return;
3602 }
3603
3604 memmove (v_buffer, v_buffer + written, v_buflen);
3605 }
3606 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3607 // original code just ignores this...
3608 destroy ();
3609 else
3610 {
3611 pty_ev.set (EVENT_READ | EVENT_WRITE);
3612 return; 4009 return;
3613 } 4010 }
4011
4012 memmove (v_buffer, v_buffer + written, v_buflen);
3614 } 4013 }
4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015 pty_ev.set (EVENT_READ);
3615} 4016}
3616 4017
3617/*----------------------- end-of-file (C source) -----------------------*/ 4018/*----------------------- end-of-file (C source) -----------------------*/
3618 4019

Diff Legend

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