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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 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 ();
1040 }
1041 else
1042 w.stop ();
1043}
1044#endif
1045
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
711 } 1052 {
1053 want_refresh = 1;
1054 refresh_check ();
1055 }
1056 else
1057 w.stop ();
1058}
1059#endif
1060
1061#ifdef SELECTION_SCROLLING
1062void
1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1064{
1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1066 {
1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1068 want_refresh = 1;
1069 refresh_check ();
1070 }
1071 else
1072 w.stop ();
1073}
1074#endif
1075
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void
1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{
1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1081 {
1082 want_refresh = 1;
1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
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 ();
712} 1152}
713#endif 1153#endif
714 1154
715bool 1155bool
716rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
717{ 1157{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
719 1159
720 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
721 { 1161
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
723 n = 0;
724 } 1163 {
725 1164 // normally this indicates a "too long" command sequence - just drop the data we have
726 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
729 1169
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
731 1171
732 if (n > 0) 1172 if (r > 0)
733 { 1173 {
734 cmdbuf_endp += n; 1174 cmdbuf_endp += r;
735 return true; 1175 return true;
736 } 1176 }
737 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))
738 destroy (); 1189 destroy ();
739 1190 }
1191
740 return false; 1192 return false;
741} 1193}
742 1194
743void 1195void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
745{ 1197{
746 SET_R (this); 1198 make_current ();
747 SET_LOCALE (locale);
748 1199
749 if (revents & EVENT_WRITE) 1200 if (revents & ev::READ)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
754 if (cmd_parse ()) 1203 cmd_parse ();
755 break; 1204
1205 if (revents & ev::WRITE)
1206 pty_write ();
1207
1208 refresh_check ();
756} 1209}
1210
1211void
1212rxvt_term::pointer_unblank ()
1213{
1214 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor ();
757 1216
758#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
759void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0; 1218 hidden_pointer = 0;
766 1219
767 if (Options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
768 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1222#endif
769} 1223}
770 1224
1225#ifdef POINTER_BLANK
771void 1226void
772rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
773{ 1228{
774 if (! (Options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
775 return; 1230 return;
776 1231
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
778 XFlush (display->display); 1233 XFlush (dpy);
779 1234
780 hidden_pointer = 1; 1235 hidden_pointer = 1;
781} 1236}
782 1237
783void 1238void
784rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
785{ 1240{
786 SET_R (this); 1241 make_current ();
787 SET_LOCALE (locale);
788 1242
789 pointer_blank (); 1243 pointer_blank ();
790} 1244}
791#endif 1245#endif
792 1246
793void 1247void
794rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
795{ 1249{
796 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
797 int x, y; 1251 int x, y;
1252 int code = 32;
798 1253
799 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
800 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
801 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 }
802 1266
803 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1268 button_number = 3;
806 }
807 else 1269 else
808 { 1270 {
809 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1273 if (button_number >= 3)
812 button_number += (64 - 3); 1274 button_number += 64 - 3;
813 } 1275 }
814 1276
815 if (PrivateModes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
816 { 1278 {
817 /* 1279 /*
818 * do not report ButtonRelease 1280 * do not report ButtonRelease
819 * no state info allowed 1281 * no state info allowed
820 */ 1282 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1297 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1298 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1299#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1300 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1301#endif
840
841 } 1302 }
842 1303
843#ifdef DEBUG_MOUSEREPORT 1304#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1305 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1306 if (key_state & 16)
846 fputc ('C', stderr); 1307 fputc ('C', stderr);
847 if (key_state & 4) 1308 if (key_state & 4)
848 fputc ('S', stderr); 1309 fputc ('S', stderr);
… …
850 fputc ('A', stderr); 1311 fputc ('A', stderr);
851 if (key_state & 32) 1312 if (key_state & 32)
852 fputc ('2', stderr); 1313 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1315 button_number,
855 x + 1, 1316 x,
856 y + 1); 1317 y);
857#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
858 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1334 code + button_number + key_state,
860 (32 + x + 1), 1335 32 + x,
861 (32 + y + 1)); 1336 32 + y);
862#endif
863} 1337}
864
865#ifdef USING_W11LIB
866void
867rxvt_W11_process_x_event (XEvent *ev)
868{
869 rxvt_t *r = rxvt_get_r ();
870
871 x_cb (*ev);
872}
873#endif
874 1338
875/*{{{ process an X event */ 1339/*{{{ process an X event */
876void 1340void
877rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
878{ 1342{
879 SET_R (this); 1343 make_current ();
880 SET_LOCALE (locale);
881 1344
882#if defined(CURSOR_BLINK) 1345 dLocal (Display *, dpy);
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
884 {
885 if (hidden_cursor)
886 {
887 hidden_cursor = 0;
888 want_refresh = 1;
889 }
890 1346
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1347 if (ev.xany.window == vt
892 } 1348 && SHOULD_INVOKE (HOOK_X_EVENT)
893#endif 1349 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
894
895#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 {
898 if (ev.type == MotionNotify
899 || ev.type == ButtonPress
900 || ev.type == ButtonRelease)
901 if (hidden_pointer)
902 pointer_unblank ();
903
904 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank ();
906 }
907#endif
908
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return; 1350 return;
912#endif
913 1351
1352 // for XQueryPointer
914 Window unused_root, unused_child; 1353 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1354 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1355 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966 1356
967 switch (ev.type) 1357 switch (ev.type)
968 { 1358 {
969 case KeyPress: 1359 case KeyPress:
970 lookup_key (ev.xkey); 1360 key_press (ev.xkey);
971 break; 1361 break;
972 1362
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease: 1363 case KeyRelease:
975 { 1364 key_release (ev.xkey);
976 if (! (ev.xkey.state & ControlMask))
977 mouse_slip_wheel_speed = 0;
978 else
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1365 break;
987 }
988#endif
989 1366
990 case ButtonPress: 1367 case ButtonPress:
991 button_press (ev.xbutton); 1368 button_press (ev.xbutton);
992 break; 1369 break;
993 1370
… …
995 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
996 break; 1373 break;
997 1374
998 case ClientMessage: 1375 case ClientMessage:
999 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1377 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1001 destroy ();
1002#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink))
1008 { 1378 {
1009 /* Get Dnd data */ 1379 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1010 Atom ActualType; 1380 {
1011 int ActualFormat; 1381 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1012 unsigned char *data; 1382 {
1013 unsigned long Size, RemainingBytes; 1383 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1014 1384 {
1015 XGetWindowProperty (display->display, display->root, 1385 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1016 xa[XA_DNDSELECTION], 1386 destroy ();
1017 0L, 1000000L, 1387 }
1018 False, AnyPropertyType, 1388#if ENABLE_EWMH
1019 &ActualType, &ActualFormat, 1389 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1020 &Size, &RemainingBytes, 1390 XSendEvent (dpy, ev.xclient.window = display->root,
1391 False, SubstructureRedirectMask | SubstructureNotifyMask,
1021 &data); 1392 &ev);
1022 XChangeProperty (display->display, display->root, 1393#endif
1023 XA_CUT_BUFFER0, XA_STRING, 1394 }
1024 8, PropModeReplace, 1395 }
1025 data, STRLEN (data)); 1396#if ENABLE_XEMBED
1026 XFree (data); 1397 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1398 {
1028 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
1029 } 1405 }
1030#endif /* OFFIX_DND */
1031 break;
1032
1033 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping));
1035 break; 1406 break;
1036 1407
1037 /* 1408 /*
1038 * XXX: this is not the _current_ arrangement 1409 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1410 * Here's my conclusion:
… …
1058 break; 1429 break;
1059 } 1430 }
1060 break; 1431 break;
1061 1432
1062 case FocusIn: 1433 case FocusIn:
1063 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)
1064 { 1449 {
1065 TermWin.focus = 1; 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075
1076 } 1451 ;
1077 break;
1078 1452
1079 case FocusOut: 1453#ifdef HAVE_BG_PIXMAP
1080 if (TermWin.focus) 1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1081 { 1456 {
1082 TermWin.focus = 0; 1457 int x, y;
1083 want_refresh = 1; 1458 if (ev.xconfigure.send_event)
1084#ifdef USE_XIM 1459 {
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break;
1096
1097 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0])
1099 {
1100 int height, width;
1101
1102 do
1103 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width; 1460 x = ev.xconfigure.x;
1105 height = ev.xconfigure.height; 1461 y = ev.xconfigure.y;
1106 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;
1107 } 1469 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1470#endif
1109 1471
1110 if (szHint.width != width || szHint.height != height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1111 { 1473 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1474 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1114 } 1476 }
1115#ifdef DEBUG_SIZE
1116 else 1477 else
1117 { 1478 {
1118 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
1119 } 1488 }
1120#endif 1489
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1122 if (Options & Opt_transparent)
1123 {
1124 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif
1129 } 1491 }
1130 break; 1492 break;
1131 1493
1494 case PropertyNotify:
1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1496 break;
1497
1132 case SelectionClear: 1498 case SelectionClear:
1133 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1134 break;
1135
1136 case SelectionNotify:
1137 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor,
1139 ev.xselection.property, True);
1140 break; 1500 break;
1141 1501
1142 case SelectionRequest: 1502 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1144 break; 1504 break;
1145 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
1146 case UnmapNotify: 1530 case UnmapNotify:
1147 TermWin.mapped = 0; 1531 mapped = 0;
1148#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1150#endif 1534#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1151 break; 1536 break;
1152
1153 case MapNotify:
1154 TermWin.mapped = 1;
1155#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif
1158 break;
1159
1160#ifdef TRANSPARENT
1161 case ReparentNotify:
1162 rootwin_cb (ev);
1163 break;
1164#endif /* TRANSPARENT */
1165 1537
1166 case GraphicsExpose: 1538 case GraphicsExpose:
1167 case Expose: 1539 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1169 { 1541 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1542 do
1543 {
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1173#else 1546 }
1174 // don't understand this, so commented it out 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 {
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1177 //scr_expose (ev.xexpose.x, 0, 1555 }
1178 // ev.xexpose.width, TermWin.height, False); 1556
1179#endif
1180 want_refresh = 1; 1557 want_refresh = 1;
1181 } 1558 }
1182 else 1559 else
1183 { 1560 {
1184 XEvent unused_event; 1561 XEvent unused_event;
1185 1562
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 Expose, 1564 ;
1188 &unused_event)) ; 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1566 ;
1190 GraphicsExpose, 1567
1191 &unused_event)) ; 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1192 if (isScrollbarWindow (ev.xany.window))
1193 { 1569 {
1194 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1195 scrollbar_show (0); 1571 scrollBar.show (0);
1196 } 1572 }
1197#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose ();
1200#endif
1201 } 1573 }
1202 break; 1574 break;
1203 1575
1204 case MotionNotify: 1576 case MotionNotify:
1205#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1206 if (hidden_pointer) 1578 if (hidden_pointer)
1207 pointer_unblank (); 1579 pointer_unblank ();
1208#endif 1580#endif
1209#if MENUBAR 1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1210 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)
1211 { 1588 {
1212 menubar_control (ev.xbutton); 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1213 break; 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1214 } 1591 ; // nop
1215#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break;
1218
1219 if (ev.xany.window == TermWin.vt)
1220 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1593 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1224 ; 1595 ;
1225 1596
1226 XQueryPointer (display->display, TermWin.vt, 1597 XQueryPointer (dpy, vt,
1227 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1600 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1601 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1603 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1604 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1605 {
1235#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
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1615 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1616 ev.xbutton.state & Button3Mask ? 2 : 0);
1617
1238#ifdef SELECTION_SCROLLING 1618#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1619 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1620 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1621 {
1242 int dist; 1622 int dist;
1243
1244 pending_scroll_selection=1;
1245 1623
1246 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1248 */ 1626 */
1249 if (scroll_selection_delay<=0) 1627 if (!sel_scroll_ev.is_active ())
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1251 1629
1252 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1254 */ 1632 */
1255 selection_save_x=ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1634 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1635 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1636
1260 /* calc number of lines to scroll */ 1637 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1638 if (ev.xbutton.y < int_bwidth)
1262 { 1639 {
1263 scroll_selection_dir = UP; 1640 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1641 dist = int_bwidth - ev.xbutton.y;
1265 } 1642 }
1266 else 1643 else
1267 { 1644 {
1268 scroll_selection_dir = DN; 1645 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1646 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1647 }
1648
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1649 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1650 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1;
1274 MIN_IT (scroll_selection_lines, 1652 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1653 SELECTION_SCROLL_MAX_LINES);
1276 } 1654 }
1277 else 1655 else
1278 { 1656 {
1279 /* we are within the text window, so we 1657 /* we are within the text window, so we
1280 * shouldn't be scrolling 1658 * shouldn't be scrolling
1281 */ 1659 */
1282 pending_scroll_selection = 0; 1660 sel_scroll_ev.stop();
1283 } 1661 }
1284#endif 1662#endif
1285#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1286
1287 } 1664 }
1288#endif 1665#endif
1289
1290 } 1666 }
1291 } 1667 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1293 { 1669 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1295 MotionNotify, &ev)) ; 1671 MotionNotify, &ev))
1672 ;
1673
1296 XQueryPointer (display->display, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1297 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1677 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1678 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1680 scrollBar.size ());
1303 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1681 want_refresh = 1;
1305 scrollbar_show (1); 1682 scrollBar.show (1);
1306 } 1683 }
1307 break; 1684 break;
1308 } 1685 }
1309}
1310 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
1311void 1825void
1312rxvt_term::rootwin_cb (XEvent &ev) 1826rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1827{
1314 SET_R (this); 1828 make_current ();
1315 SET_LOCALE (locale);
1316 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
1317 switch (ev.type) 1835 switch (ev.type)
1318 { 1836 {
1319 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 */
1320 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])
1321 { 1844 {
1322 if (ev.xproperty.state == PropertyNewValue) 1845 bg_set_root_pixmap ();
1323 selection_property (ev.xproperty.window, ev.xproperty.atom); 1846 update_background ();
1324 break;
1325 } 1847 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /*
1330 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on.
1332 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335 1848
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1337 return;
1338 }
1339
1340 /* FALLTHROUGH */
1341 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1;
1344 break; 1849 break;
1850 }
1345#endif 1851# endif
1346 } 1852
1853 refresh_check ();
1347} 1854}
1855#endif
1348 1856
1349void 1857void
1350rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1351{ 1859{
1352 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1353 1861
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1355 if (!bypass_keystate) 1864 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1866
1357 /* 1867 /*
1358 * VT window processing of button press 1868 * VT window processing of button press
1359 */ 1869 */
1360 if (ev.window == TermWin.vt) 1870 if (ev.window == vt)
1361 { 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
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1884 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1885
1363 if (reportmode) 1886 if (reportmode)
1364 { 1887 {
1365 /* mouse report from vt window */ 1888 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1368#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1369 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1370 { 1893 {
1371 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1372 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1373 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1374 { 1898 {
1375 /* only report double clicks */ 1899 /* only report double clicks */
1376 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1377 mouse_report (ev); 1901 mouse_report (ev);
… …
1389 mouse_report (ev); 1913 mouse_report (ev);
1390 } 1914 }
1391#else 1915#else
1392 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1393 mouse_report (ev); 1917 mouse_report (ev);
1394#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1395 1919
1396 } 1920 }
1397 else 1921 else
1398 { 1922 {
1399 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1925
1401 switch (ev.button) 1926 switch (ev.button)
1402 { 1927 {
1403 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
1404 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1406 { 1939 {
1407 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1409 else 1942 else
1410 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1958 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1428 else 1961 else
1429 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1963
1430 MEvent.button = Button3; 1964 MEvent.button = Button3;
1431 break; 1965 break;
1432 } 1966 }
1433 } 1967 }
1968
1434 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1435 return; 1970 return;
1436 } 1971 }
1437 1972
1438 /* 1973 /*
1439 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1440 */ 1975 */
1441 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1442 { 1977 {
1443 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;
1444 /* 1986 /*
1445 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1446 * move up if mouse is above slider 1988 * move up if mouse is above slider
1447 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1448 * 1990 *
… …
1457 /* 1999 /*
1458 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1459 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1460 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1461 */ 2003 */
1462 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1463 && scrollbarnext_upButton (ev.y))
1464 || (scrollBar.style == R_SB_RXVT
1465 && scrollbarrxvt_upButton (ev.y)))
1466 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1467 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1468 && scrollbarnext_dnButton (ev.y))
1469 || (scrollBar.style == R_SB_RXVT
1470 && scrollbarrxvt_dnButton (ev.y)))
1471 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1472 else 2008 else
1473 switch (ev.button) 2009 switch (ev.button)
1474 { 2010 {
1475 case Button2: 2011 case Button2:
… …
1482 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
1483 break; 2019 break;
1484 } 2020 }
1485 } 2021 }
1486 else 2022 else
1487#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
1488
1489 {
1490 char upordown = 0;
1491
1492 if (scrollBar.style == R_SB_NEXT)
1493 { 2024 {
1494 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
1495 upordown = -1; /* up */
1496 else if (scrollbarnext_dnButton (ev.y))
1497 upordown = 1; /* down */
1498 }
1499 else if (scrollBar.style == R_SB_RXVT)
1500 {
1501 if (scrollbarrxvt_upButton (ev.y))
1502 upordown = -1; /* up */
1503 else if (scrollbarrxvt_dnButton (ev.y))
1504 upordown = 1; /* down */
1505 }
1506 if (upordown)
1507 { 2026 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2028 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1510#endif 2030#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
1512 { 2032 {
1513 if (upordown < 0) 2033 if (direction == UP)
1514 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
1515 else 2035 else
1516 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
1517 } 2037 }
1518 } 2038 }
1519 else 2039 else
1520 switch (ev.button) 2040 switch (ev.button)
1521 { 2041 {
1522 case Button2: 2042 case Button2:
1523 switch (scrollbar_align) 2043 switch (scrollBar.align)
1524 { 2044 {
1525 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
1526 csrO = 0; 2046 csrO = 0;
1527 break; 2047 break;
1528 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
1530 break; 2050 break;
1531 case R_SB_ALIGN_BOTTOM: 2051 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2052 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2053 break;
1534 } 2054 }
2055
1535 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1539 scrollbar_size ()); 2060
1540 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
1541 break; 2062 break;
1542 2063
1543 case Button1: 2064 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1545 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
1546 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
1547 2068
1548 case Button3: 2069 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
1550 { 2071 {
1551 if (scrollbar_above_slider (ev.y)) 2072 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2074 scr_page (UP, nrow - 1);
1554# else 2075# else
1555 scr_page (UP, TermWin.nrow / 4); 2076 scr_page (UP, nrow / 4);
1556# endif 2077# endif
1557 else if (scrollbar_below_slider (ev.y)) 2078 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2080 scr_page (DN, nrow - 1);
1560# else 2081# else
1561 scr_page (DN, TermWin.nrow / 4); 2082 scr_page (DN, nrow / 4);
1562# endif 2083# endif
1563 else 2084 else
1564 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
1565 } 2086 }
1566 else 2087 else
1567 { 2088 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2090 (nrow
1570 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2092 / scrollBar.size ()));
1572 } 2093 }
2094
1573 break; 2095 break;
1574 } 2096 }
1575 } 2097 }
2098
1576 return; 2099 return;
1577 } 2100 }
1578#if MENUBAR
1579 /*
1580 * Menubar window processing of button press
1581 */
1582 if (isMenuBarWindow (ev.window))
1583 menubar_control (ev);
1584#endif
1585} 2101}
1586 2102
1587void 2103void
1588rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
1589{ 2105{
1590 int reportmode = 0; 2106 int reportmode = 0;
1591 2107
1592 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2109 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2111
1596 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1597 { 2113 {
1598 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
1599 scrollbar_show (0); 2115 scrollBar.show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH;
1602#endif
1603
1604 } 2116 }
2117
1605#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2119 sel_scroll_ev.stop();
1607#endif 2120#endif
2121
1608 if (ev.window == TermWin.vt) 2122 if (ev.window == vt)
1609 { 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
1610 if (reportmode) 2133 if (reportmode)
1611 { 2134 {
1612 /* mouse report from vt window */ 2135 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2136 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2137 if (ev.button >= 4)
… …
1625 mouse_report (ev); 2148 mouse_report (ev);
1626 } 2149 }
1627#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
1628 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
1629 mouse_report (ev); 2152 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2154 return;
1632 } 2155 }
2156
1633 /* 2157 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2159 * when overriding mouse reporting
1636 */ 2160 */
1637 if (PrivateModes & PrivMode_mouse_report 2161 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2162 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2163 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2164 selection_extend (ev.x, ev.y, 0);
1641 2165
1642 switch (ev.button) 2166 switch (ev.button)
1643 { 2167 {
1644 case Button1: 2168 case Button1:
1645 case Button3: 2169 case Button3:
1646 selection_make (ev.time); 2170 selection_make (ev.time);
1647 break; 2171 break;
2172
1648 case Button2: 2173 case Button2:
1649 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);
1650 break; 2176 break;
2177
1651#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
1652 case Button4: 2179 case Button4:
1653 case Button5: 2180 case Button5:
1654 { 2181 {
1655 int i; 2182 int i;
1656 page_dirn v; 2183 page_dirn v;
1657 2184
1658 v = (ev.button == Button4) ? UP : DN; 2185 v = ev.button == Button4 ? UP : DN;
2186
1659 if (ev.state & ShiftMask) 2187 if (ev.state & ShiftMask)
1660 i = 1; 2188 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2189 else if (option (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2190 i = nrow - 1;
1663 else 2191 else
1664 i = 5; 2192 i = 5;
2193
1665# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2195 if (ev.state & ControlMask)
1667 { 2196 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2197 mouse_slip_wheel_speed += v ? -1 : 1;
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 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 ())
2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1670 } 2203 }
2204 else
1671# endif 2205# endif
1672# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 { 2206 {
1679 scr_page (v, 1); 2207 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2208 scrollBar.show (1);
1682 } 2209 }
1683# endif
1684
1685 } 2210 }
1686 break; 2211 break;
1687#endif 2212#endif
1688
1689 }
1690 }
1691#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev);
1694#endif
1695}
1696
1697#ifdef TRANSPARENT
1698#if TINTING
1699/* shading taken from eterm-0.9.2 */
1700/* RGB 15 */
1701
1702static void
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1710 /* No saturation */
1711 for (y = h; --y >= 0;) {
1712 for (x = -w; x < 0; x++) {
1713 int r, g, b;
1714
1715 b = ((uint16_t *) ptr)[x];
1716 r = (b & 0x7c00) * rm;
1717 g = (b & 0x3e0) * gm;
1718 b = (b & 0x1f) * bm;
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1720 | ((g >> 8) & 0x3e0)
1721 | ((b >> 8) & 0x1f);
1722 }
1723 ptr += bpl;
1724 }
1725 } else {
1726 for (y = h; --y >= 0;) {
1727 for (x = -w; x < 0; x++) {
1728 int r, g, b;
1729
1730 b = ((uint16_t *) ptr)[x];
1731 r = (b & 0x7c00) * rm;
1732 g = (b & 0x3e0) * gm;
1733 b = (b & 0x1f) * bm;
1734 r |= (!(r >> 15) - 1);
1735 g |= (!(g >> 10) - 1);
1736 b |= (!(b >> 5) - 1);
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1738 | ((g >> 8) & 0x3e0)
1739 | ((b >> 8) & 0x1f);
1740 }
1741 ptr += bpl;
1742 }
1743 }
1744}
1745
1746/* RGB 16 */
1747static void
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1749{
1750 unsigned char *ptr;
1751 int x, y;
1752
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1755 /* No saturation */
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 }
1770 } else {
1771 for (y = h; --y >= 0;) {
1772 for (x = -w; x < 0; x++) {
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 }
1786 ptr += bpl;
1787 }
1788 }
1789}
1790
1791/* RGB 24 */
1792static void
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1794{
1795 unsigned char *ptr;
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 }
1823 } else {
1824 for (y = h; --y >= 0;) {
1825 for (x = -(w * 3); x < 0; x += 3) {
1826 int r, g, b;
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 }
1854 ptr += bpl;
1855 }
1856 }
1857}
1858
1859/* RGB 32 */
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929}
1930
1931#endif
1932
1933/*
1934 * Check our parents are still who we think they are.
1935 * Do transparency updates if required
1936 */
1937int
1938rxvt_term::check_our_parents ()
1939{
1940 int i, pchanged, aformat, have_pixmap, rootdepth;
1941 unsigned long nitems, bytes_after;
1942 Atom atype;
1943 unsigned char *prop = NULL;
1944 Window root, oldp, *list;
1945 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr;
1947
1948 pchanged = 0;
1949
1950 if (!(Options & Opt_transparent))
1951 return pchanged; /* Don't try any more */
1952
1953 XGetWindowAttributes (display->display, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth;
1955
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1957
1958 if (rootdepth != wattr.depth)
1959 {
1960 if (am_transparent)
1961 { 2213 }
1962 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0;
1965 }
1966
1967 return pchanged; /* Don't try any more */
1968 }
1969
1970 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False);
1972
1973 /*
1974 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that.
1977 */
1978 i = (xa[XA_XROOTPMAPID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success);
1982
1983 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success);
1988
1989 if (!i || prop == NULL)
1990 have_pixmap = 0;
1991 else
1992 { 2214 }
1993 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop;
1995 XFree (prop);
1996 }
1997
1998 if (have_pixmap)
1999 {
2000 /*
2001 * Copy display->root pixmap transparency
2002 */
2003 int sx, sy, nx, ny;
2004 unsigned int nw, nh;
2005 Window cr;
2006 XImage *image;
2007 GC gc;
2008 XGCValues gcvalue;
2009
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height;
2014 nx = ny = 0;
2015
2016 if (sx < 0)
2017 {
2018 nw += sx;
2019 nx = -sx;
2020 sx = 0;
2021 }
2022
2023 if (sy < 0)
2024 {
2025 nh += sy;
2026 ny = -sy;
2027 sy = 0;
2028 }
2029
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2032 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */
2037 allowedxerror = 0;
2038
2039 if (image == NULL)
2040 {
2041 if (am_transparent && am_pixmap_trans)
2042 {
2043 pchanged = 1;
2044 if (TermWin.pixmap != None)
2045 {
2046 XFreePixmap (display->display, TermWin.pixmap);
2047 TermWin.pixmap = None;
2048 }
2049 }
2050
2051 am_pixmap_trans = 0;
2052 }
2053 else
2054 {
2055 if (TermWin.pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap);
2057
2058#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint))
2060 {
2061 unsigned short shade, rm, gm, bm;
2062
2063 PixColors[Color_tint].get (display, rm, gm, bm);
2064
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 }
2076#endif
2077
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc);
2084 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2086 TermWin.pixmap);
2087
2088 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1;
2090
2091 am_transparent = am_pixmap_trans = 1;
2092 }
2093 }
2094
2095 if (!am_pixmap_trans)
2096 {
2097 unsigned int n;
2098 /*
2099 * InheritPixmap transparency
2100 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 {
2104 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n);
2107 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109
2110 if (TermWin.parent[i] == display->root)
2111 {
2112 if (oldp != None)
2113 pchanged = 1;
2114
2115 break;
2116 }
2117
2118 if (oldp != TermWin.parent[i])
2119 pchanged = 1;
2120 }
2121
2122 n = 0;
2123
2124 if (pchanged)
2125 {
2126 for (; n < (unsigned int)i; n++)
2127 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break;
2134 }
2135 }
2136 }
2137
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2143 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */
2145 }
2146 else
2147 {
2148#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1);
2152#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++)
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2156
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2158 am_transparent = 1;
2159 }
2160
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None;
2163 }
2164
2165 return pchanged;
2166} 2215}
2167#endif
2168 2216
2169/*}}} */ 2217/*}}} */
2170 2218
2171bool 2219void
2172rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2173{ 2221{
2174 bool flag = false;
2175 unicode_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2177 2224
2178 for (;;) 2225 for (;;)
2179 { 2226 {
2180 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2181 { 2228 {
2182 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2230 ch = next_char ();
2184 }
2185 2231
2186 if (ch == NOCHAR) // TODO: improve 2232 if (ch == NOCHAR)
2187 break; 2233 break;
2234 }
2188 2235
2189 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))
2190 { 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
2191 /* Read a text string from the input buffer */ 2252 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2253 wchar_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2254 bool refreshnow = false;
2194 int nlines = 0; 2255 int nlines = 0;
2195 unicode_t *str = buf; 2256 wchar_t *str = buf;
2196 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2258
2199 for (;;) 2259 for (;;)
2200 { 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
2201 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2311 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break;
2206
2207 *str++ = ch;
2208
2209 if (ch == C0_LF)
2210 {
2211 nlines++;
2212 refresh_count++;
2213
2214 if (! (Options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2216 {
2217 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR;
2220 break;
2221 }
2222
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1)
2225 {
2226 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0;
2228 str = buf;
2229 }
2230 }
2231
2232 if (str >= buf + UBUFSIZ)
2233 {
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2312 }
2238 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2239 scr_add_lines (buf, nlines, str - buf); 2316 scr_add_lines (buf, str - buf, nlines);
2240 2317
2241 /* 2318 /*
2242 * 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
2243 * 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.
2244 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2245 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2322 */
2250 if (refreshnow) 2323 if (refreshnow)
2251 { 2324 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++;
2254 else
2255 scr_refresh (refresh_type); 2325 scr_refresh ();
2326 want_refresh = 1;
2256 } 2327 }
2257
2258 } 2328 }
2259 else 2329 else
2260 { 2330 {
2261 try 2331 try
2262 { 2332 {
… …
2270 } 2340 }
2271 2341
2272 ch = NOCHAR; 2342 ch = NOCHAR;
2273 } 2343 }
2274 } 2344 }
2275
2276 return flag;
2277} 2345}
2278 2346
2279// read the next character 2347// read the next character
2280unicode_t 2348wchar_t
2281rxvt_term::next_char () 2349rxvt_term::next_char () NOTHROW
2282{ 2350{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 2352 {
2285 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2287 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2288 2356
2289 wchar_t wc; 2357 wchar_t wc;
2290 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);
2291 2359
2292 if (len == (size_t)-2) 2360 if (len == (size_t)-2)
2293 { 2361 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 2362 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2296 break; 2364 break;
2297 } 2365 }
2298 2366
2299 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2300 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 }
2301 2372
2302 // assume wchar == unicode 2373 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2304 return wc; 2375 return wc & UNICODE_MASK;
2305 } 2376 }
2306 2377
2307 return NOCHAR; 2378 return NOCHAR;
2308} 2379}
2309 2380
2310/* rxvt_cmd_getc () - Return next input character */ 2381// read the next octet
2311/* 2382uint32_t
2312 * Return the next input character after first passing any keyboard input 2383rxvt_term::next_octet () NOTHROW
2313 * to the command.
2314 */
2315unicode_t
2316rxvt_term::cmd_getc ()
2317{ 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{
2318 unicode_t c = next_char (); 2395 wchar_t c = next_char ();
2396
2397 if (c == NOCHAR)
2398 throw out_of_input;
2399
2400 return c;
2401}
2402
2403uint32_t
2404rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405{
2406 uint32_t c = next_octet ();
2319 2407
2320 if (c == NOCHAR) 2408 if (c == NOCHAR)
2321 throw out_of_input; 2409 throw out_of_input;
2322 2410
2323 return c; 2411 return c;
… …
2327/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2328#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2329FILE * 2417FILE *
2330rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2331{ 2419{
2332 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2333 2421
2334 if (stream == NULL) 2422 if (stream == NULL)
2335 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2336 2424
2337 return stream; 2425 return stream;
… …
2348 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2349 */ 2437 */
2350void 2438void
2351rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2352{ 2440{
2353 int done; 2441 FILE *fd = popen_printer ();
2354 FILE *fd;
2355 2442
2356 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2357 return; 2444 return;
2358 2445
2359 /* 2446 /*
2360 * 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
2361 * is received. 2448 * is received.
2362 */ 2449 */
2363 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2364 { 2451 {
2365 unsigned char buf[8]; 2452 unsigned char buf[8];
2366 unicode_t ch; 2453 unicode_t ch;
2367 unsigned int i, len; 2454 unsigned int i, len;
2368 2455
… …
2387 { 2474 {
2388 if ((buf[len++] = cmd_getc ()) == 'i') 2475 if ((buf[len++] = cmd_getc ()) == 'i')
2389 break; /* done = 1 */ 2476 break; /* done = 1 */
2390 } 2477 }
2391 } 2478 }
2392 2479
2393 for (i = 0; i < len; i++) 2480 for (i = 0; i < len; i++)
2394 if (putc (buf[i], fd) == EOF) 2481 if (putc (buf[i], fd) == EOF)
2395 { 2482 {
2396 done = 1; 2483 done = 1;
2397 break; 2484 break;
… …
2399 } 2486 }
2400 } 2487 }
2401 2488
2402 pclose_printer (fd); 2489 pclose_printer (fd);
2403} 2490}
2404#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2405/*}}} */ 2492/*}}} */
2406 2493
2407/* *INDENT-OFF* */
2408enum { 2494enum {
2409 C1_40 = 0x40, 2495 C1_40 = 0x40,
2410 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2411 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2412 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2413 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2414}; 2500};
2415/* *INDENT-ON* */
2416 2501
2417/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2418void 2503void
2419rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2420{ 2505{
… …
2423 case C0_ESC: 2508 case C0_ESC:
2424 process_escape_seq (); 2509 process_escape_seq ();
2425 break; 2510 break;
2426 case C0_ENQ: /* terminal Status */ 2511 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2512 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2513 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 2514 else
2431 tt_write ((unsigned char *)VT100_ANS, 2515 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 2516 break;
2434 case C0_BEL: /* bell */ 2517 case C0_BEL: /* bell */
2435 scr_bell (); 2518 scr_bell ();
2436 break; 2519 break;
2437 case C0_BS: /* backspace */ 2520 case C0_BS: /* backspace */
… …
2453 break; 2536 break;
2454 case C0_SI: /* shift in - acs */ 2537 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2538 scr_charset_choose (0);
2456 break; 2539 break;
2457 2540
2541#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2542 // 8-bit controls
2459 case 0x90: /* DCS */ 2543 case 0x90: /* DCS */
2460 process_dcs_seq (); 2544 process_dcs_seq ();
2461 break; 2545 break;
2462 case 0x9b: /* CSI */ 2546 case 0x9b: /* CSI */
2463 process_csi_seq (); 2547 process_csi_seq ();
2464 break; 2548 break;
2465 case 0x9d: /* CSI */ 2549 case 0x9d: /* OSC */
2466 process_osc_seq (); 2550 process_osc_seq ();
2467 break; 2551 break;
2552#endif
2468 } 2553 }
2469} 2554}
2470/*}}} */ 2555/*}}} */
2471 2556
2472 2557
… …
2513 break; 2598 break;
2514 case 'Z': /* identify the terminal type */ 2599 case 'Z': /* identify the terminal type */
2515 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2516 break; 2601 break;
2517 case '<': /* turn off VT52 mode */ 2602 case '<': /* turn off VT52 mode */
2518 PrivMode (0, PrivMode_vt52); 2603 set_privmode (PrivMode_vt52, 0);
2519 break; 2604 break;
2520 case 'F': /* use special graphics character set */ 2605 case 'F': /* use special graphics character set */
2521 case 'G': /* use regular character set */ 2606 case 'G': /* use regular character set */
2522 /* unimplemented */ 2607 /* unimplemented */
2523 break; 2608 break;
… …
2534void 2619void
2535rxvt_term::process_escape_seq () 2620rxvt_term::process_escape_seq ()
2536{ 2621{
2537 unicode_t ch = cmd_getc (); 2622 unicode_t ch = cmd_getc ();
2538 2623
2539 if (PrivateModes & PrivMode_vt52) 2624 if (priv_modes & PrivMode_vt52)
2540 { 2625 {
2541 process_escape_vt52 (ch); 2626 process_escape_vt52 (ch);
2542 return; 2627 return;
2543 } 2628 }
2544 2629
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 2644 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 2645 break;
2561 case '+': 2646 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 2647 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 2648 break;
2564#ifndef NO_FRILLS 2649#if !ENABLE_MINIMAL
2565 case '6': 2650 case '6':
2566 scr_backindex (); 2651 scr_backindex ();
2567 break; 2652 break;
2568#endif 2653#endif
2569 case '7': 2654 case '7':
2570 scr_cursor (SAVE); 2655 scr_cursor (SAVE);
2571 break; 2656 break;
2572 case '8': 2657 case '8':
2573 scr_cursor (RESTORE); 2658 scr_cursor (RESTORE);
2574 break; 2659 break;
2575#ifndef NO_FRILLS 2660#if !ENABLE_MINIMAL
2576 case '9': 2661 case '9':
2577 scr_forwardindex (); 2662 scr_forwardindex ();
2578 break; 2663 break;
2579#endif 2664#endif
2580 case '=': 2665 case '=':
2581 case '>': 2666 case '>':
2582 PrivMode ((ch == '='), PrivMode_aplKP); 2667 set_privmode (PrivMode_aplKP, ch == '=');
2583 break; 2668 break;
2584 2669
2585 case C1_40: 2670 case C1_40:
2586 cmd_getc (); 2671 cmd_getc ();
2587 break; 2672 break;
… …
2590 break; 2675 break;
2591 2676
2592 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2593 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2594 { 2679 {
2595 unicode_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2596 scr_add_lines (nlcr, 1, 2); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2597 } 2682 }
2598 break; 2683 break;
2599 2684
2600 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2601 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2602 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2603 break; 2690 break;
2604 2691
2605 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2606 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2607 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2623 process_dcs_seq (); 2710 process_dcs_seq ();
2624 break; 2711 break;
2625 2712
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2713 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 2714 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 2715 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 2716 break; /* steal obsolete ESC [ c */
2631 2717
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2718 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2633 case C1_CSI: /* ESC [ */ 2719 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 2720 process_csi_seq ();
2635 break; 2721 break;
2636 2722
2637 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2723 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2638 case C1_OSC: /* ESC ] */ 2724 case C1_OSC: /* ESC ] */
2639 process_osc_seq (); 2725 process_osc_seq ();
2640 break; 2726 break;
2641 2727
2642 /* 8.3.106: RESET TO INITIAL STATE */ 2728 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2643 case 'c': 2729 case 'c':
2644 mbstate.reset (); 2730 mbstate.reset ();
2645 scr_poweron (); 2731 scr_poweron ();
2646 scrollbar_show (1); 2732 scrollBar.show (1);
2647 break; 2733 break;
2648 2734
2649 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2735 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2650 case 'n': 2736 case 'n':
2651 scr_charset_choose (2); 2737 scr_charset_choose (2);
… …
2658 } 2744 }
2659} 2745}
2660/*}}} */ 2746/*}}} */
2661 2747
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */
2664enum { 2749enum {
2665 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2754 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2755 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2672 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2673 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2674}; 2759};
2675 2760
2676#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2677 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2678 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2679#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2680 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2681 2766
2682const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2683 { 2768 {
2684 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2685 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2686 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2687 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2688 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2689 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2690 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2691 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2692 }; 2777 };
2693/* *INDENT-ON* */
2694 2778
2695void 2779void
2696rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2697{ 2781{
2698 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
2699 unsigned int nargs, p; 2783 unsigned int nargs, p;
2700 int n, ndef; 2784 int n, ndef;
2701 int arg[ESC_ARGS]; 2785 int arg[ESC_ARGS] = { };
2702 2786
2703 for (nargs = ESC_ARGS; nargs > 0;) 2787 nargs = 0;
2704 arg[--nargs] = 0;
2705 2788
2706 priv = 0; 2789 priv = 0;
2707 ch = cmd_getc (); 2790 ch = cmd_getc ();
2708 if (ch >= '<' && ch <= '?') 2791 if ((ch >= '<' && ch <= '?') || ch == '!')
2792 {
2709 { /* '<' '=' '>' '?' */ 2793 /* '<' '=' '>' '?' '!' */
2710 priv = ch; 2794 priv = ch;
2711 ch = cmd_getc (); 2795 ch = cmd_getc ();
2712 } 2796 }
2713 2797
2714 /* read any numerical arguments */ 2798 /* read any numerical arguments */
… …
2743 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
2744 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
2745 if (arg[p] == -1) 2829 if (arg[p] == -1)
2746 arg[p] = ndef; 2830 arg[p] = ndef;
2747 2831
2748#ifdef DEBUG_CMD
2749 fprintf (stderr, "CSI ");
2750 for (p = 0; p < nargs; p++)
2751 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2752 fprintf (stderr, "%c\n", ch);
2753#endif
2754
2755 /* 2832 /*
2756 * private mode handling 2833 * private mode handling
2757 */ 2834 */
2758 if (priv) 2835 if (priv)
2759 { 2836 {
2760 switch (priv) 2837 switch (priv)
2761 { 2838 {
2762 case '>': 2839 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // versions.
2848 //
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2849 tt_printf ("\033[>%d;95;0c", 'U');
2850 }
2765 break; 2851 break;
2852
2766 case '?': 2853 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 2856 break;
2857
2858 case '!':
2859 if (ch == CSI_70)
2860 {
2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2862 scr_soft_reset ();
2863
2864 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2770 } 2869 }
2870 break;
2871 }
2872
2771 return; 2873 return;
2772 } 2874 }
2773 2875
2774 switch (ch) 2876 switch (ch)
2775 { 2877 {
… …
2874 2976
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2977 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 2978 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 2979 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2980 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2981 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 2982 break;
2881 2983
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2984 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 2985 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 2986 break;
2886 2987
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2988 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 2989 process_sgr_mode (nargs, arg);
2889 break; 2990 break;
… …
2896 break; 2997 break;
2897 case 6: /* CPR requested */ 2998 case 6: /* CPR requested */
2898 scr_report_position (); 2999 scr_report_position ();
2899 break; 3000 break;
2900 case 7: /* unofficial extension */ 3001 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3002 if (option (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3003 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3004 break;
2904 case 8: /* unofficial extension */ 3005 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3006 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3007 break;
2907 } 3008 }
… …
2943 break; 3044 break;
2944 3045
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3046 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3047 if (arg[0] == 4)
2947 scr_insert_mode (0); 3048 scr_insert_mode (0);
3049 else if (arg[0] == 20)
3050 priv_modes &= ~PrivMode_LFNL;
2948 break; 3051 break;
2949 3052
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3053 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3054 if (arg[0] == 4)
2952 scr_insert_mode (1); 3055 scr_insert_mode (1);
3056 else if (arg[0] == 20)
3057 priv_modes |= PrivMode_LFNL;
2953 break; 3058 break;
2954 3059
2955 /* 3060 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3061 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3062 */
… …
2969 break; 3074 break;
2970 case CSI_75: 3075 case CSI_75:
2971 scr_cursor (RESTORE); 3076 scr_cursor (RESTORE);
2972 break; 3077 break;
2973 3078
2974#ifndef NO_FRILLS 3079#if !ENABLE_MINIMAL
2975 case CSI_74: 3080 case CSI_74:
2976 process_window_ops (arg, nargs); 3081 process_window_ops (arg, nargs);
2977 break; 3082 break;
2978#endif 3083#endif
2979 3084
… …
2986 break; 3091 break;
2987 } 3092 }
2988} 3093}
2989/*}}} */ 3094/*}}} */
2990 3095
2991#ifndef NO_FRILLS 3096#if !ENABLE_MINIMAL
2992/* ARGSUSED */
2993void 3097void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3099{
2996 int x, y; 3100 int x, y;
2997 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
2998 Window wdummy; 3102 Window wdummy;
3103
3104 dLocal (Display *, dpy);
2999 3105
3000 if (nargs == 0) 3106 if (nargs == 0)
3001 return; 3107 return;
3002 3108
3003 switch (args[0]) 3109 switch (args[0])
3004 { 3110 {
3005 /* 3111 /*
3006 * commands 3112 * commands
3007 */ 3113 */
3008 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3115 XMapWindow (dpy, parent);
3010 break; 3116 break;
3011 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3118 XIconifyWindow (dpy, parent, display->screen);
3013 DefaultScreen (display->display));
3014 break; 3119 break;
3015 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3017 break; 3122 break;
3018 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3125 break;
3021 case 5: /* raise window */ 3126 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3127 XRaiseWindow (dpy, parent);
3023 break; 3128 break;
3024 case 6: /* lower window */ 3129 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3130 XLowerWindow (dpy, parent);
3026 break; 3131 break;
3027 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3028 scr_touch (true); 3133 scr_touch (true);
3029 break; 3134 break;
3030 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3136 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3137 (unsigned int) (args[1] * fheight));
3033 break; 3138 break;
3034 3139
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3140 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3141 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3143 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * fheight));
3040 break; 3145 break;
3041
3042 3146
3043 /* 3147 /*
3044 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3045 */ 3149 */
3046 case 11: /* report window state */ 3150 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3153 break;
3050 case 13: /* report window position */ 3154 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3160 break;
3057 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3164 break;
3061 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3167 break;
3064 case 19: /* report window size (chars) */ 3168 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3170 break;
3067 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3172 {
3070 char *s; 3173 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3176 XFree (s);
3073 } 3177 }
3074 break; 3178 break;
3075 case 21: /* report window title */ 3179 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3180 {
3078 char *s; 3181 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3184 XFree (s);
3081 } 3185 }
3082 break; 3186 break;
3083 } 3187 }
3084} 3188}
3085#endif 3189#endif
3086 3190
3087/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3088/* 3192/*
3089 * get input up until STRING TERMINATOR (or BEL) 3193 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3194 * ends_how is terminator used. returned input must be free()'d
3091 */ 3195 */
3092unsigned char * 3196char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3197rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3198{
3095 int seen_esc = 0; /* seen escape? */ 3199 unicode_t ch;
3200 bool seen_esc = false;
3096 unsigned int n = 0; 3201 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3202 wchar_t string[STRING_MAX];
3100 3203
3101 while ((ch = cmd_getc ())) 3204 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3205 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3206 if (seen_esc)
3207 {
3107 if (ch == 0x5c) /* 7bit ST */ 3208 if (ch == 0x5c) /* 7bit ST */
3108 break; 3209 break;
3109 else 3210 else
3110 return NULL; 3211 return NULL;
3111 3212 }
3112 if (ch == C0_ESC) 3213 else if (ch == C0_ESC)
3113 { 3214 {
3114 seen_esc = 1; 3215 seen_esc = true;
3115 continue; 3216 continue;
3116 } 3217 }
3218 else if (ch == C0_BEL || ch == CHAR_ST)
3219 break;
3117 else if (ch == C0_HT) 3220 else if (ch == C0_SYN)
3118 ch = ' '; /* translate '\t' to space */ 3221 ch = cmd_get8 ();
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) 3222 else if (ch < 0x20)
3120 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3121 3224
3122 if (n >= sizeof (string) - 1) 3225 seen_esc = false;
3226
3227 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3228 // stop at some sane length
3124 return NULL; 3229 return NULL;
3125 3230
3126 string[n++] = ch; 3231 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3232 }
3129 3233
3130 string[n++] = '\0'; 3234 string[n++] = '\0';
3131 3235
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3237
3137 return s; 3238 return rxvt_wcstombs (string);
3138} 3239}
3139 3240
3140/*----------------------------------------------------------------------*/ 3241/*----------------------------------------------------------------------*/
3141/* 3242/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3143 */ 3244 */
3144void 3245void
3145rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3146{ 3247{
3147 unsigned char *s;
3148 unicode_t eh;
3149
3150 /* 3248 /*
3151 * Not handled yet 3249 * Not handled yet
3152 */ 3250 */
3251
3252 unicode_t eh;
3153 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3154 if (s) 3254 if (s)
3155 free (s); 3255 free (s);
3156 3256
3157 return; 3257 return;
3158} 3258}
… …
3162 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3163 */ 3263 */
3164void 3264void
3165rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3166{ 3266{
3167 unicode_t ch, eh;
3168 int arg; 3267 int arg;
3169 3268
3170 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3173 3272
3174 if (ch == ';') 3273 if (ch == ';')
3175 { 3274 {
3275 unicode_t eh;
3176 unsigned char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3177 3277
3178 if (s) 3278 if (s)
3179 { 3279 {
3180 process_xterm_seq (arg, (char *)s, eh); 3280 process_xterm_seq (arg, s, eh);
3181 free (s); 3281 free (s);
3182 } 3282 }
3183 } 3283 }
3184} 3284}
3185 3285
3186void 3286void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3188{ 3288{
3189 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3190 { 3290 {
3191 if (Options & Opt_insecure) 3291 rgba c;
3192 { 3292 pix_colors_focused[color].get (c);
3193 unsigned short r, g, b; 3293
3194 PixColors[color].get (display, r, g, b); 3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3196 }
3197 } 3300 }
3198 else 3301 else
3199 set_window_color (color, str); 3302 set_window_color (color, str);
3200} 3303}
3201 3304
3202/* 3305/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3307 */
3227void 3308void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3309rxvt_term::process_xterm_seq (int op, char *str, char resp)
3229{ 3310{
3230 int changed = 0;
3231 int color; 3311 int color;
3232 char *buf, *name; 3312 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3314 int saveop = op;
3315
3316 dLocal (Display *, dpy);
3234 3317
3235 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3236 switch (op) 3323 switch (op)
3237 { 3324 {
3238 case XTerm_name: 3325 case XTerm_name:
3239 set_title (str); 3326 set_title (str);
3240 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3245 set_title (str); 3332 set_title (str);
3246 break; 3333 break;
3247 case XTerm_property: 3334 case XTerm_property:
3248 if (str[0] == '?') 3335 if (str[0] == '?')
3249 { 3336 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3337 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3338 Atom actual_type;
3252 int actual_format; 3339 int actual_format;
3253 unsigned long nitems; 3340 unsigned long nitems;
3254 unsigned long bytes_after; 3341 unsigned long bytes_after;
3255 unsigned char *value = 0; 3342 unsigned char *value = 0;
3256 const char *str = ""; 3343 const char *str = "";
3257 3344
3258 if (prop 3345 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3346 && XGetWindowProperty (dpy, parent,
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3350 && actual_type != None
3264 && actual_format == 8) 3351 && actual_format == 8)
3265 str = (const char *)(value); 3352 str = (const char *)(value);
3266 3353
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3268 3355
3269 XFree (value); 3356 XFree (value);
3270 } 3357 }
3271 else 3358 else
3272 { 3359 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '=');
3274 3361
3275 if (eq) 3362 if (eq)
3276 { 3363 {
3277 *eq = 0; 3364 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3365 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3366 }
3283 else 3367 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3368 XDeleteProperty (dpy, parent,
3285 display->atom (str)); 3369 display->atom (str));
3286 } 3370 }
3287 break; 3371 break;
3288 3372
3289 case XTerm_Color: 3373 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3374 for (buf = (char *)str; buf && *buf;)
3291 { 3375 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3377 break;
3294 3378
3295 *name++ = '\0'; 3379 *name++ = '\0';
3296 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3297 3381
3298 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3299 break; 3383 break;
3300 3384
3301 if ((buf = STRCHR (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3386 *buf++ = '\0';
3303 3387
3304 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3389 }
3390 break;
3391 case Rxvt_restoreFG:
3392 case XTerm_Color00:
3393 process_color_seq (op, Color_fg, str, resp);
3394 break;
3395 case Rxvt_restoreBG:
3396 case XTerm_Color01:
3397 process_color_seq (op, Color_bg, str, resp);
3398 break;
3399#ifndef NO_CURSORCOLOR
3400 case XTerm_Color_cursor:
3401 process_color_seq (op, Color_cursor, str, resp);
3402 break;
3403#endif
3404 case XTerm_Color_pointer_fg:
3405 process_color_seq (op, Color_pointer_fg, str, resp);
3406 break;
3407 case XTerm_Color_pointer_bg:
3408 process_color_seq (op, Color_pointer_bg, str, resp);
3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3419 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp);
3421 break;
3422 case URxvt_Color_UL:
3423 process_color_seq (op, Color_UL, str, resp);
3424 break;
3425 case URxvt_Color_IT:
3426 process_color_seq (op, Color_IT, str, resp);
3427 break;
3428#endif
3429 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp);
3431 break;
3432#if ENABLE_TRANSPARENCY
3433 case URxvt_Color_tint:
3434 process_color_seq (op, Color_tint, str, resp);
3435 {
3436 bool changed = false;
3437
3438 if (ISSET_PIXCOLOR (Color_tint))
3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3440
3441 if (changed)
3442 update_background ();
3443 }
3444
3445 break;
3446#endif
3447
3448#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap:
3450 if (!strcmp (str, "?"))
3451 {
3452 char str[256];
3453
3454 sprintf (str, "[%dx%d+%d+%d]",
3455 min (h_scale, 32767), min (v_scale, 32767),
3456 min (h_align, 32767), min (v_align, 32767));
3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3458 }
3459 else
3460 {
3461 int changed = 0;
3462
3463 if (*str != ';')
3305 { 3464 {
3306 if (Options & Opt_insecure) 3465 if (bg_set_file (str)) /* change pixmap */
3307 { 3466 {
3308 unsigned short r, g, b; 3467 changed++;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3468 str = strchr (str, ';');
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3469 if (str == NULL)
3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3311 } 3473 }
3312 } 3474 }
3313 else 3475 else
3314 set_window_color (color + minCOLOR, name); 3476 {
3477 str++;
3478 if (bg_set_geometry (str, true))
3479 changed++;
3480 }
3481
3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3490 update_background ();
3491 }
3315 } 3492 }
3316 break; 3493 break;
3317 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3319 break;
3320 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3322 break;
3323#ifndef NO_CURSORCOLOR
3324 case XTerm_Color_cursor:
3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3326 break;
3327#endif 3494#endif
3328 case XTerm_Color_pointer_fg:
3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3330 break;
3331 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3333 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break;
3338 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break;
3341 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3343 break;
3344#endif
3345
3346 case XTerm_Pixmap:
3347 if (*str != ';')
3348 {
3349#if XPM_BACKGROUND
3350 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */
3352#endif
3353 scr_touch (true);
3354 }
3355 while ((str = STRCHR (str, ';')) != NULL)
3356 {
3357 str++;
3358#if XPM_BACKGROUND
3359 changed += scale_pixmap (str);
3360#endif
3361
3362 }
3363 if (changed)
3364 {
3365#ifdef XPM_BACKGROUND
3366 resize_pixmap ();
3367#endif
3368 scr_touch (true);
3369 }
3370 break;
3371
3372 case XTerm_restoreFG:
3373 set_window_color (Color_fg, str);
3374 break;
3375 case XTerm_restoreBG:
3376 set_window_color (Color_bg, str);
3377 break;
3378 3495
3379 case XTerm_logfile: 3496 case XTerm_logfile:
3380 // TODO, when secure mode? 3497 // TODO, when secure mode?
3381 break; 3498 break;
3382 3499
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break;
3428#endif
3429#if 0 3500#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3501 case Rxvt_dumpscreen: /* no error notices */
3431 { 3502 {
3432 int fd; 3503 int fd;
3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3504 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3434 { 3505 {
3435 scr_dump (fd); 3506 scr_dump (fd);
3436 close (fd); 3507 close (fd);
3437 } 3508 }
3438 } 3509 }
3510 break;
3511#endif
3512 case XTerm_font:
3513 op = URxvt_font;
3514 case URxvt_font:
3515#if ENABLE_STYLES
3516 case URxvt_boldFont:
3517 case URxvt_italicFont:
3518 case URxvt_boldItalicFont:
3519#endif
3520 if (query)
3521 tt_printf ("\33]%d;%-.250s%c", saveop,
3522 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3523 ? fontset[op - URxvt_font]->fontdesc : "",
3524 resp);
3525 else
3526 {
3527 const char *&res = rs[Rs_font + (op - URxvt_font)];
3528
3529 res = strdup (str);
3530 allocated.push_back ((void *)res);
3531 set_fonts ();
3532 }
3533 break;
3534
3535 case URxvt_version:
3536 if (query)
3537 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3538 op,
3539 rs[Rs_name], VERSION[0], VERSION[2],
3540 resp);
3541 break;
3542
3543#if !ENABLE_MINIMAL
3544 case URxvt_locale:
3545 if (query)
3546 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3547 else
3548 {
3549 set_locale (str);
3550 pty->set_utf8_mode (enc_utf8);
3551 init_xlocale ();
3552 }
3553 break;
3554
3555 case URxvt_view_up:
3556 case URxvt_view_down:
3557 {
3558 int lines = atoi (str);
3559
3560 if (lines)
3561 scr_page (op == URxvt_view_up ? UP : DN, lines);
3562 else
3563 scr_erase_savelines ();
3564 }
3565
3566 break;
3567#endif
3568
3569#if ENABLE_PERL
3570 case URxvt_perl:
3571 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3439 break; 3572 break;
3440#endif 3573#endif
3441 } 3574 }
3442} 3575}
3443/*----------------------------------------------------------------------*/ 3576/*----------------------------------------------------------------------*/
… …
3457{ 3590{
3458 int state; 3591 int state;
3459 3592
3460 if (mode == 's') 3593 if (mode == 's')
3461 { 3594 {
3462 SavedModes |= (PrivateModes & bit); 3595 SavedModes |= (priv_modes & bit);
3463 return -1; 3596 return -1;
3464 } 3597 }
3465 else 3598 else
3466 { 3599 {
3467 if (mode == 'r') 3600 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3602 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3604
3605 set_privmode (bit, state);
3472 } 3606 }
3473 3607
3474 return state; 3608 return state;
3475} 3609}
3476 3610
3477/* we're not using priv _yet_ */ 3611/* we're not using priv _yet_ */
3478void 3612void
3479rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3613rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3480{ 3614{
3481 unsigned int i, j; 3615 unsigned int i, j;
3482 int state; 3616 int state;
3483 3617
3484 static const struct 3618 static const struct
3485 { 3619 {
3486 const int argval; 3620 const int argval;
3487 const unsigned long bit; 3621 const unsigned long bit;
3488 }
3489
3490 argtopriv[] = { 3622 } argtopriv[] = {
3491 { 1, PrivMode_aplCUR }, 3623 { 1, PrivMode_aplCUR }, // DECCKM
3492 { 2, PrivMode_vt52 }, 3624 { 2, PrivMode_vt52 },
3493 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 }, // DECCOLM
3494 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll }, // DECSCLM
3495 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo }, // DECSCNM
3496 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin }, // DECOM
3497 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, auto-repeat keys // DECARM
3498 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3632 // 18 end FF to printer after print screen
3500 { menuBar_esc, PrivMode_menuBar }, 3633 // 19 Print screen prints full screen/scroll region
3501#endif 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3502#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3637#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK
3509 { 40, PrivMode_132OK }, 3640 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3641 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3642 // 45 margin bell NYI
3512 // 46 start logging 3643 // 46 start logging
3513 { 47, PrivMode_Screen }, 3644 { 47, PrivMode_Screen },
3514 { 66, PrivMode_aplKP }, 3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3515#ifndef NO_BACKSPACE_KEY 3646#ifndef NO_BACKSPACE_KEY
3516 { 67, PrivMode_BackSpace }, 3647 { 67, PrivMode_BackSpace }, // DECBKM
3517#endif 3648#endif
3518 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3519 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3650 { 1002, PrivMode_MouseBtnEvent },
3520 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3651 { 1003, PrivMode_MouseAnyEvent },
3521 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3522 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3523 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
3524 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3525 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3526 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3527 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3528 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3529 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3530 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3667 { 2004, PrivMode_BracketPaste },
3531 }; 3668 };
3532 3669
3533 if (nargs == 0) 3670 if (nargs == 0)
3534 return; 3671 return;
3535 3672
… …
3542 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3543 { 3680 {
3544 state = -1; 3681 state = -1;
3545 3682
3546 /* basic handling */ 3683 /* basic handling */
3547 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3548 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3549 { 3686 {
3550 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3551 break; 3688 break;
3552 } 3689 }
3553 3690
3554 /* extra handling for values with state unkept */ 3691 /* extra handling for values with state unkept */
3555 switch (arg[i]) 3692 switch (arg[i])
3556 { 3693 {
3694#if ENABLE_STYLES
3695 case 1021:
3696 set_option (Opt_intensityStyles, mode);
3697
3698 scr_touch (true);
3699 break;
3700#endif
3557 case 1048: /* alternative cursor save */ 3701 case 1048: /* alternative cursor save */
3558 if (Options & Opt_secondaryScreen) 3702 if (option (Opt_secondaryScreen))
3559 if (mode == 0) 3703 if (mode == 0)
3560 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
3561 else if (mode == 1) 3705 else if (mode == 1)
3562 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
3563 break; 3707 break;
… …
3571 case 2: /* VT52 mode */ 3715 case 2: /* VT52 mode */
3572 /* oddball mode. should be set regardless of set/reset 3716 /* oddball mode. should be set regardless of set/reset
3573 * parameter. Return from VT52 mode with an ESC < from 3717 * parameter. Return from VT52 mode with an ESC < from
3574 * within VT52 mode 3718 * within VT52 mode
3575 */ 3719 */
3576 PrivMode (1, PrivMode_vt52); 3720 set_privmode (PrivMode_vt52, 1);
3577 break; 3721 break;
3578 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3581 break; 3725 break;
3582 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
3583 if (state) 3727 set_option (Opt_jumpScroll, !state);
3584 Options &= ~Opt_jumpScroll;
3585 else
3586 Options |= Opt_jumpScroll;
3587 break; 3728 break;
3588 case 5: /* reverse video */ 3729 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
3590 break; 3731 break;
3591 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 3736 scr_autowrap (state);
3596 break; 3737 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3601 break; 3742 break;
3602#ifdef menuBar_esc
3603 case menuBar_esc:
3604#ifdef MENUBAR
3605 map_menuBar (state);
3606#endif
3607 break;
3608#endif
3609#ifdef scrollBar_esc 3743#ifdef scrollBar_esc
3610 case scrollBar_esc: 3744 case scrollBar_esc:
3611 if (scrollbar_mapping (state)) 3745 if (scrollBar.map (state))
3612 { 3746 {
3613 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
3614 scr_touch (true); 3748 scr_touch (true);
3615 } 3749 }
3616 break; 3750 break;
… …
3625 break; 3759 break;
3626 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3631 break; 3765 break;
3632#if 0
3633 case 1001: 3766 case 1002:
3634 break; /* X11 mouse highlighting */ 3767 case 1003:
3635#endif 3768 if (state)
3769 {
3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state)
3638 Options &= ~Opt_scrollTtyOutput;
3639 else
3640 Options |= Opt_scrollTtyOutput; 3781 set_option (Opt_scrollTtyOutput, !state);
3641 break; 3782 break;
3642 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3643 if (state)
3644 Options |= Opt_scrollTtyKeypress; 3784 set_option (Opt_scrollTtyKeypress, state);
3645 else
3646 Options &= ~Opt_scrollTtyKeypress;
3647 break; 3785 break;
3648 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 3787 if (option (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 3788 if (!state)
3651 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3652 scr_change_screen (state); 3791 scr_change_screen (state);
3653 break; 3792 break;
3654 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3655 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3656 if (Options & Opt_secondaryScreen) 3800 if (option (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 3801 if (state)
3658 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3659 break; 3805 break;
3660 default: 3806 default:
3661 break; 3807 break;
3662 } 3808 }
3663 } 3809 }
… …
3687 rendset = 0, rendstyle = ~RS_None; 3833 rendset = 0, rendstyle = ~RS_None;
3688 break; 3834 break;
3689 case 1: 3835 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 3836 rendset = 1, rendstyle = RS_Bold;
3691 break; 3837 break;
3838 //case 2: // low intensity
3839 case 3:
3840 rendset = 1, rendstyle = RS_Italic;
3841 break;
3692 case 4: 3842 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 3843 rendset = 1, rendstyle = RS_Uline;
3694 break; 3844 break;
3695 case 5: 3845 case 5: // slowly blinking
3846 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 3847 rendset = 1, rendstyle = RS_Blink;
3697 break; 3848 break;
3698 //case 6: // scoansi light background 3849 //case 6: // scoansi light background
3699 case 7: 3850 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 3851 rendset = 1, rendstyle = RS_RVid;
3701 break; 3852 break;
3702 case 8: 3853 case 8:
3703 // invisible. NYI 3854 // invisible. NYI
3704 break; 3855 break;
3856 //case 9: // crossed out
3705 //case 10: // scoansi acs off 3857 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 3858 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 3859 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 3860 //...
3861 //case 19: // ninth alt font
3862 //case 20: // gothic
3863 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3864 rendset = 0, rendstyle = RS_Bold;
3710 break; 3865 break;
3711 case 22: 3866 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 3867 rendset = 0, rendstyle = RS_Bold;
3868 break;
3869 case 23: // disable italic
3870 rendset = 0, rendstyle = RS_Italic;
3713 break; 3871 break;
3714 case 24: 3872 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 3873 rendset = 0, rendstyle = RS_Uline;
3716 break; 3874 break;
3717 case 25: 3875 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 3876 rendset = 0, rendstyle = RS_Blink;
3719 break; 3877 break;
3878 case 26: // variable spacing (iso 8613)
3879 rendset = 0, rendstyle = RS_Blink;
3880 break;
3720 case 27: 3881 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 3882 rendset = 0, rendstyle = RS_RVid;
3722 break; 3883 break;
3723 case 28:
3724 // visible. NYI 3884 //case 28: // visible. NYI
3725 break; 3885 //case 29: // not crossed-out
3726 } 3886 }
3727 3887
3728 if (rendset != -1) 3888 if (rendset != -1)
3729 { 3889 {
3730 scr_rendition (rendset, rendstyle); 3890 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 3901 case 35:
3742 case 36: 3902 case 36:
3743 case 37: 3903 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3904 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 3905 break;
3746#ifdef TTY_256COLOR 3906 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 3907 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 3908 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3909 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 3910 i += 2;
3752 } 3911 }
3753 break; 3912 break;
3754#endif
3755 case 39: /* default fg */ 3913 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 3914 scr_color (Color_fg, Color_fg);
3757 break; 3915 break;
3758 3916
3759 case 40: 3917 case 40:
… …
3764 case 45: 3922 case 45:
3765 case 46: 3923 case 46:
3766 case 47: 3924 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3925 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 3926 break;
3769#ifdef TTY_256COLOR 3927 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 3928 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 3929 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3930 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 3931 i += 2;
3775 } 3932 }
3776 break; 3933 break;
3777#endif
3778 case 49: /* default bg */ 3934 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 3935 scr_color (Color_bg, Color_bg);
3780 break; 3936 break;
3781 3937
3782#ifndef NO_BRIGHTCOLOR 3938 //case 50: // not variable spacing
3939
3940#if !ENABLE_MINIMAL
3783 case 90: 3941 case 90:
3784 case 91: /* set bright fg color */ 3942 case 91: /* set bright fg color */
3785 case 92: 3943 case 92:
3786 case 93: 3944 case 93:
3787 case 94: 3945 case 94:
3788 case 95: 3946 case 95:
3789 case 96: 3947 case 96:
3790 case 97: 3948 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3949 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 3950 break;
3794 case 100: 3951 case 100:
3795 case 101: /* set bright bg color */ 3952 case 101: /* set bright bg color */
3796 case 102: 3953 case 102:
3797 case 103: 3954 case 103:
3798 case 104: 3955 case 104:
3799 case 105: 3956 case 105:
3800 case 106: 3957 case 106:
3801 case 107: 3958 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3959 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 3960 break;
3805#endif 3961#endif
3806
3807 } 3962 }
3808 } 3963 }
3809}
3810/*}}} */
3811
3812/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void
3814rxvt_term::process_graphics ()
3815{
3816 unicode_t ch, cmd = cmd_getc ();
3817
3818 if (cmd == 'Q')
3819 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */
3821 return;
3822 }
3823 /* swallow other graphics sequences until terminating ':' */
3824 do
3825 ch = cmd_getc ();
3826 while (ch != ':');
3827} 3964}
3828/*}}} */ 3965/*}}} */
3829 3966
3830/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3831 3968
… …
3835 */ 3972 */
3836void 3973void
3837rxvt_term::tt_printf (const char *fmt,...) 3974rxvt_term::tt_printf (const char *fmt,...)
3838{ 3975{
3839 va_list arg_ptr; 3976 va_list arg_ptr;
3840 unsigned char buf[256]; 3977 char buf[256];
3841 3978
3842 va_start (arg_ptr, fmt); 3979 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 3981 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 3982 tt_write (buf, strlen (buf));
3846} 3983}
3847 3984
3848/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3851 */ 3988 */
3852void 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3856 3990
3857 if (len) 3991void
3992rxvt_term::tt_write (const char *data, unsigned int len)
3993{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return;
3996
3997 if (pty->pty < 0)
3998 return;
3999
4000 if (v_buflen == 0)
4001 {
4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4003
4004 max_it (written, 0);
4005
4006 if (written == len)
4007 return;
4008
4009 data += written;
4010 len -= written;
3858 { 4011 }
4012
4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4014
4015 memcpy (v_buffer + v_buflen, data, len);
4016 v_buflen += len;
4017
4018 pty_ev.set (ev::READ | ev::WRITE);
4019}
4020
4021void rxvt_term::pty_write ()
4022{
4023 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4024
4025 if (written > 0)
4026 {
4027 v_buflen -= written;
4028
3859 if (v_buflen == 0) 4029 if (v_buflen == 0)
3860 { 4030 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4031 free (v_buffer);
3888 v_buffer = 0; 4032 v_buffer = 0;
3889 v_buflen = 0;
3890 4033
3891 pty_ev.set (EVENT_READ); 4034 pty_ev.set (ev::READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4035 return;
3904 } 4036 }
4037
4038 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4039 }
4040 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4041 pty_ev.set (ev::READ);
3906} 4042}
3907 4043
3908/*----------------------- end-of-file (C source) -----------------------*/ 4044/*----------------------- end-of-file (C source) -----------------------*/
3909 4045

Diff Legend

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