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

Diff Legend

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