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

Diff Legend

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