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

Diff Legend

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