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

Diff Legend

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