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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines