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

Diff Legend

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