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.356 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.561 by sf-exg, Thu Nov 27 14:47:55 2014 UTC

… …
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 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>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 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",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 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);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 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
303rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
304{ 409{
305 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
306 unsigned int newlen; 411 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
310 414
311#if ISO_14755 415#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
313 return; 417 return;
314#endif 418#endif
… …
321 */ 425 */
322 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
325 429
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 430 kbuf[0] = 0;
333 431
334#ifdef USE_XIM 432#if USE_XIM
335 if (Input_Context) 433 if (Input_Context)
336 { 434 {
337 Status status_return; 435 Status status_return;
338 436
339#if 0 437#if 0
… …
377 } 475 }
378 } 476 }
379 else 477 else
380 len = 0; 478 len = 0;
381 } 479 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 480 }
386 else 481 else
387#endif 482#endif
388 { 483 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
391 } 488 {
489 KeySym orig_keysym = keysym;
392 490
393 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)
394 { 704 {
395#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 707 return;
398#endif 708#endif
399 709
400 if (saveLines) 710 if (saveLines)
401 { 711 {
… …
410#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 722#else
413 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
414#endif 724#endif
725 max_it (lnsppg, 1);
726
415 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
416 { 728 {
417 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
418 return; 730 return;
419 } 731 }
420 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
421 { 733 {
422 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
423 return; 735 return;
424 } 736 }
425 } 737 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
428 { 740 {
429 if (keysym == XK_Up) 741 if (keysym == XK_Up)
430 { 742 {
431 scr_page (UP, 1); 743 scr_page (1);
432 return; 744 return;
433 } 745 }
434 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
435 { 747 {
436 scr_page (DN, 1); 748 scr_page (-1);
437 return; 749 return;
438 } 750 }
439 } 751 }
440#endif 752#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
443 { 755 {
444 if (keysym == XK_Home) 756 if (keysym == XK_Home)
445 { 757 {
446 scr_move_to (0, 1); 758 scr_changeview (top_row);
447 return; 759 return;
448 } 760 }
449 else if (keysym == XK_End) 761 else if (keysym == XK_End)
450 { 762 {
451 scr_move_to (1, 1); 763 scr_changeview (0);
452 return; 764 return;
453 } 765 }
454 } 766 }
455#endif 767#endif
456 } 768 }
457 769
458 if (shft) 770 if (shft)
459 { 771 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 773 {
468 switch (keysym) 774 switch (keysym)
469 { 775 {
470 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 778 selection_request (ev.time);
473 return; 779 return;
474#if TODO 780#if TODO
475 /* rxvt extras */ 781 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 783 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 785 return;
482#endif 786#endif
483 } 787 }
484 } 788 }
485 } 789 }
486 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
487#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 807 // ISO 14755 support
489 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 809 {
491 int hv; 810 int hv;
492 811
493 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 843 scr_overlay_off ();
525# endif 844# endif
526 iso14755buf = 0; 845 iso14755buf = 0;
527 } 846 }
528 } 847 }
848 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
532 { 852 {
533 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 854# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 863 {
544 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
545 return; 865 return;
546 } 866 }
547#endif 867#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554 switch (keysym)
555 {
556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace)
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0;
840 break;
841 }
842
843 if (newlen)
844 len = strlen (kbuf);
845 }
846
847 /*
848 * Pass meta for all function keys, if 'meta' option set
849 */
850#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0)
852 kbuf[len - 1] |= 0x80;
853#endif
854
855 }
856 else if (ctrl && keysym == XK_minus)
857 {
858 len = 1;
859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
866 else
867 {
868#ifdef META8_OPTION
869 /* set 8-bit on */
870 if (meta && (meta_char == 0x80))
871 {
872 char *ch;
873
874 for (ch = kbuf; ch < kbuf + len; ch++)
875 *ch |= 0x80;
876
877 meta = 0;
878 }
879#endif
880 /* nil */ ;
881 }
882 } 868 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886 869
887 if (len <= 0) 870 if (len <= 0)
888 return; /* not mapped */ 871 return; /* not mapped */
889 872
890 if (option (Opt_scrollTtyKeypress))
891 if (view_start)
892 {
893 view_start = 0;
894 want_refresh = 1;
895 }
896
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */
912 if (meta
913#ifdef META8_OPTION
914 && meta_char == C0_ESC
915#endif
916 )
917 {
918 const char ch = C0_ESC;
919 tt_write (&ch, 1);
920 }
921
922 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
923} 874}
924 875
925void 876void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
927{ 878{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 880 KeySym keysym;
930 881
… …
950 commit_iso14755 (); 901 commit_iso14755 ();
951 902
952 return; 903 return;
953 } 904 }
954 905
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 907 if (i[0] == keysym)
957 { 908 {
958 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 910 commit_iso14755 ();
960 911
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
999#endif 950#endif
1000} 951}
1001 952
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 953void
1036rxvt_term::flush () 954rxvt_term::flush ()
1037{ 955{
1038 flush_ev.stop (); 956 flush_ev.stop ();
957
958#ifdef HAVE_IMG
959 if (bg_flags & BG_NEEDS_REFRESH)
960 {
961 bg_flags &= ~BG_NEEDS_REFRESH;
962 scr_touch (false);
963 }
964#endif
1039 965
1040 if (want_refresh) 966 if (want_refresh)
1041 { 967 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 968 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 969 {
… …
1076 } 1002 }
1077 while (row < end_row); 1003 while (row < end_row);
1078 } 1004 }
1079 1005
1080 scr_refresh (); 1006 scr_refresh ();
1081 scrollbar_show (1); 1007 scrollBar.show (1);
1082#ifdef USE_XIM 1008#if USE_XIM
1083 IMSendSpot (); 1009 im_send_spot ();
1084#endif 1010#endif
1085 } 1011 }
1086 1012
1087 display->flush (); 1013 display->flush ();
1088} 1014}
1089 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1090void 1017void
1091rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1092{ 1019{
1093 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1022
1095 display->flush (); 1023 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1024}
1100 1025
1101void 1026void
1102rxvt_term::flush_cb (time_watcher &w) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1028{
1104 make_current (); 1029 make_current ();
1105 1030
1106 refresh_count = 0; 1031 refresh_count = 0;
1107 flush (); 1032 flush ();
1108} 1033}
1109 1034
1110#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1111void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1053{
1114 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1055 want_refresh = 1;
1116 1056 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1057}
1119#endif 1058#endif
1120 1059
1121#ifdef TEXT_BLINK 1060#ifdef TEXT_BLINK
1122void 1061void
1123rxvt_term::text_blink_cb (time_watcher &w) 1062rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1063{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1064 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1065 {
1127 hidden_text = !hidden_text; 1066 hidden_text = !hidden_text;
1128 want_refresh = 1; 1067 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1068 refresh_check ();
1130 } 1069 }
1070 else
1071 w.stop ();
1131} 1072}
1132#endif 1073#endif
1133 1074
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1076void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1078{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1140 { 1081 {
1141 want_refresh = 1; 1082 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1143 } 1084 }
1085 else
1086 w.stop ();
1144} 1087}
1145#endif 1088#endif
1146 1089
1147#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1148void 1091void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1093{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1152 { 1095 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1097 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1156 } 1099 }
1100 else
1101 w.stop ();
1157} 1102}
1158#endif 1103#endif
1159 1104
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1106void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1108{
1164 if (mouse_slip_wheel_speed == 0 1109 if (scr_page (mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1110 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1111 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 refresh_check ();
1113 }
1114
1115 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1116 {
1117 mouse_slip_wheel_speed = 0;
1118 w.stop ();
1173 } 1119 }
1174} 1120}
1175#endif 1121#endif
1176 1122
1177#if LINUX_YIELD_HACK 1123#if LINUX_YIELD_HACK
1178static struct event_handler 1124static struct event_handler
1179{ 1125{
1180 check_watcher yield_ev; 1126 ev::prepare yield_ev;
1181 1127
1182 void yield_cb (check_watcher &w) 1128 void yield_cb (ev::prepare &w, int revents)
1183 { 1129 {
1184 // this should really be sched_yield(), but the linux guys thought 1130 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1131 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1132 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1133 // allowed by the sus... as is returning ENOSYS.
1134 // since the linux guys additionally thought that breaking the only
1135 // known workaround against their unusable sched_yield hack is cool,
1136 // we just nanosleep a bit and hope for the best.
1188 1137
1189 struct timespec ts = { 0, 0 }; 1138 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1139 nanosleep (&ts, 0);
1191 1140
1192 w.stop (); 1141 w.stop ();
1193 } 1142 }
1194 1143
… …
1197 { 1146 {
1198 } 1147 }
1199} event_handler; 1148} event_handler;
1200#endif 1149#endif
1201 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1202bool 1184bool
1203rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1204{ 1186{
1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1206 1188
1207 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1208 { 1190
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1210 n = 0;
1211 } 1192 {
1212 1193 // normally this indicates a "too long" command sequence - just drop the data we have
1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1214 cmdbuf_ptr = cmdbuf_base; 1194 cmdbuf_ptr = cmdbuf_base;
1215 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1216 1198
1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1218 1200
1219 if (r > 0) 1201 if (r > 0)
1220 { 1202 {
1221 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1222 return true; 1204 return true;
… …
1238 1220
1239 return false; 1221 return false;
1240} 1222}
1241 1223
1242void 1224void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1225rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1226{
1245 make_current (); 1227 make_current ();
1246 1228
1247 if (revents & EVENT_READ) 1229 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1230 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1231 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1232 cmd_parse ();
1251 break;
1252 1233
1253 if (revents & EVENT_WRITE) 1234 if (revents & ev::WRITE)
1254 pty_write (); 1235 pty_write ();
1255}
1256 1236
1257void 1237 refresh_check ();
1238}
1239
1240void ecb_cold
1258rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1259{ 1242{
1260 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1261 recolour_cursor (); 1244 recolour_cursor ();
1262 1245
1263#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1247 hidden_pointer = 0;
1265 1248
1266 if (option (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1268#endif 1251#endif
1269} 1252}
1270 1253
1271#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1272void 1255void ecb_cold
1273rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1274{ 1257{
1275 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1276 return; 1259 return;
1277 1260
… …
1279 XFlush (dpy); 1262 XFlush (dpy);
1280 1263
1281 hidden_pointer = 1; 1264 hidden_pointer = 1;
1282} 1265}
1283 1266
1284void 1267void ecb_cold
1285rxvt_term::pointer_cb (time_watcher &w) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1269{
1287 make_current (); 1270 make_current ();
1288 1271
1289 pointer_blank (); 1272 pointer_blank ();
1290} 1273}
… …
1293void 1276void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1277rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1278{
1296 int button_number, key_state = 0; 1279 int button_number, key_state = 0;
1297 int x, y; 1280 int x, y;
1281 int code = 32;
1298 1282
1299 x = ev.x; 1283 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1284 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1285
1286 if (ev.type == MotionNotify)
1287 {
1288 if (x == mouse_row && y == mouse_col)
1289 return;
1290
1291 mouse_row = x;
1292 mouse_col = y;
1293 code += 32;
1294 }
1302 1295
1303 if (MEvent.button == AnyButton) 1296 if (MEvent.button == AnyButton)
1304 button_number = 3; 1297 button_number = 3;
1305 else 1298 else
1306 { 1299 {
1307 button_number = MEvent.button - Button1; 1300 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1301 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1302 if (button_number >= 3)
1310 button_number += (64 - 3); 1303 button_number += 64 - 3;
1311 } 1304 }
1312 1305
1313 if (priv_modes & PrivMode_MouseX10) 1306 if (priv_modes & PrivMode_MouseX10)
1314 { 1307 {
1315 /* 1308 /*
… …
1347 fputc ('A', stderr); 1340 fputc ('A', stderr);
1348 if (key_state & 32) 1341 if (key_state & 32)
1349 fputc ('2', stderr); 1342 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1343 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1344 button_number,
1352 x + 1, 1345 x,
1353 y + 1); 1346 y);
1354#endif 1347#endif
1355 1348
1349#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight)
1351 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state,
1353 x,
1354 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse)
1356 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state,
1358 wint_t (32 + x),
1359 wint_t (32 + y));
1360 else
1361#endif
1356 tt_printf ("\033[M%c%c%c", 1362 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1363 code + button_number + key_state,
1358 (32 + x + 1), 1364 32 + x,
1359 (32 + y + 1)); 1365 32 + y);
1360} 1366}
1361 1367
1362/*{{{ process an X event */ 1368/*{{{ process an X event */
1363void 1369void ecb_hot
1364rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1365{ 1371{
1366 make_current (); 1372 make_current ();
1367 1373
1368 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1466 && ev.xfocus.mode != NotifyGrab) 1472 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1473 focus_out ();
1468 break; 1474 break;
1469 1475
1470 case ConfigureNotify: 1476 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1475 { 1478 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1480 ;
1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1496 int x, y;
1497
1498 if (ev.xconfigure.send_event)
1499 {
1500 x = ev.xconfigure.x;
1501 y = ev.xconfigure.y;
1502 }
1503 else
1504 get_window_origin (x, y);
1505
1506 if (x != parent_x || y != parent_y)
1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 }
1513 }
1478 1514
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1516 {
1481 seen_resize = 1; 1517 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1519 }
1484 else 1520 else
1485 { 1521 {
1486#ifdef HAVE_BG_PIXMAP 1522#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1523 if (moved)
1488 update_background (); 1524 update_background ();
1489#endif 1525#endif
1490 } 1526 }
1527
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1529 }
1493 break; 1530 break;
1494 1531
1495 case PropertyNotify: 1532 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1533 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1534 break;
1502 1535
1503 case SelectionClear: 1536 case SelectionClear:
1504 selection_clear (); 1537 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1538 break;
1511 1539
1512 case SelectionRequest: 1540 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1514 break; 1542 break;
1515 1543
1516 case MapNotify: 1544 case MapNotify:
1545#ifdef HAVE_BG_PIXMAP
1546 // This is needed at startup for the case of no window manager
1547 // or a non-reparenting window manager and also because we
1548 // defer bg image updates if the window is not mapped. The
1549 // short delay is to optimize for multiple ConfigureNotify
1550 // events at startup when the window manager reparents the
1551 // window, so as to perform the computation after we have
1552 // received all of them.
1553 if (bg_img == 0)
1554 update_background_ev.start (0.025);
1555#endif
1517 mapped = 1; 1556 mapped = 1;
1518#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1558 text_blink_ev.start ();
1520#endif 1559#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1561 break;
1523 1562
1524 case UnmapNotify: 1563 case UnmapNotify:
… …
1532 case GraphicsExpose: 1571 case GraphicsExpose:
1533 case Expose: 1572 case Expose:
1534 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1535 { 1574 {
1536 do 1575 do
1576 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, false);
1579 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1580 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1581
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1582 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1583
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1584 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1585 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1546 1589
1547 want_refresh = 1; 1590 want_refresh = 1;
1548 } 1591 }
1549 else 1592 else
1550 { 1593 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1596 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1597 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1599 ;
1557 1600
1558 if (isScrollbarWindow (ev.xany.window)) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1602 {
1560 scrollBar.setIdle (); 1603 scrollBar.state = SB_STATE_IDLE;
1561 scrollbar_show (0); 1604 scrollBar.show (0);
1562 } 1605 }
1563 } 1606 }
1564 break; 1607 break;
1565 1608
1566 case MotionNotify: 1609 case MotionNotify:
1567#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1611 if (hidden_pointer)
1569 pointer_unblank (); 1612 pointer_unblank ();
1570#endif 1613#endif
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent)
1616 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1618 break;
1573 1619
1574 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1575 { 1621 {
… …
1604 1650
1605#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1606 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1607 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1608 { 1654 {
1655 page_dirn scroll_selection_dir;
1609 int dist; 1656 int dist;
1610 1657
1611 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1613 */ 1660 */
1614 if (!sel_scroll_ev.active) 1661 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1662 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1663
1617 /* save the event params so we can highlight 1664 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1665 * the selection in the pending-scroll loop
1619 */ 1666 */
1620 selection_save_x = ev.xbutton.x; 1667 selection_save_x = ev.xbutton.x;
… …
1628 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1629 } 1676 }
1630 else 1677 else
1631 { 1678 {
1632 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1633 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1634 } 1681 }
1635 1682
1636 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1637 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1; 1685 + 1;
1639 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1640 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1641 } 1689 }
1642 else 1690 else
1643 { 1691 {
1644 /* we are within the text window, so we 1692 /* we are within the text window, so we
1645 * shouldn't be scrolling 1693 * shouldn't be scrolling
1646 */ 1694 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1695 sel_scroll_ev.stop();
1649 } 1696 }
1650#endif 1697#endif
1651#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1652 } 1699 }
1653#endif 1700#endif
1654 } 1701 }
1655 } 1702 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1704 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1660 ; 1707 ;
1661 1708
1662 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1713 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1715 scrollBar.size ());
1669 want_refresh = 1; 1716 want_refresh = 1;
1670 scrollbar_show (1); 1717 scrollBar.show (1);
1671 } 1718 }
1672 break; 1719 break;
1673 } 1720 }
1674 1721
1675#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1677 { 1724 cursor_blink_reset ();
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif 1725#endif
1687 1726
1688#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1729 {
… …
1696 1735
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1736 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1737 pointer_blank ();
1699 } 1738 }
1700#endif 1739#endif
1701}
1702 1740
1703void 1741 refresh_check ();
1742}
1743
1744#if ENABLE_FRILLS
1745void ecb_cold
1746rxvt_term::set_urgency (bool enable)
1747{
1748 if (enable == urgency_hint)
1749 return;
1750
1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1752 {
1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1754 XSetWMHints (dpy, parent, h);
1755 urgency_hint = enable;
1756 XFree (h);
1757 }
1758}
1759#endif
1760
1761void ecb_cold
1704rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1705{ 1763{
1706 if (!focus) 1764 if (!focus)
1707 { 1765 {
1708 focus = 1; 1766 focus = 1;
1709 want_refresh = 1; 1767 want_refresh = 1;
1710 1768
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1769#if USE_XIM
1714 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1715 { 1771 {
1716 IMSetPosition (); 1772 im_set_position ();
1717 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1718 } 1774 }
1719#endif 1775#endif
1720#if CURSOR_BLINK 1776#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1778 cursor_blink_ev.again ();
1723#endif 1779#endif
1724#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1726 { 1782 {
1727 pix_colors = pix_colors_focused; 1783 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1784 scr_recolour ();
1729 } 1785 }
1730#endif 1786#endif
1731#if ENABLE_FRILLS 1787#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1788 if (option (Opt_urgentOnBell))
1733 { 1789 set_urgency (0);
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif 1790#endif
1741 }
1742}
1743 1791
1744void 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 }
1794}
1795
1796void ecb_cold
1745rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1746{ 1798{
1747 if (focus) 1799 if (focus)
1748 { 1800 {
1749 focus = 0; 1801 focus = 0;
1750 want_refresh = 1; 1802 want_refresh = 1;
1751 1803
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1804#if ENABLE_FRILLS
1753 1805 if (option (Opt_urgentOnBell))
1806 set_urgency (0);
1807#endif
1754#if ENABLE_FRILLS || ISO_14755 1808#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1809 if (iso14755buf)
1756 { 1810 {
1757 iso14755buf = 0; 1811 iso14755buf = 0;
1758# if ISO_14755 1812# if ISO_14755
… …
1765 XUnsetICFocus (Input_Context); 1819 XUnsetICFocus (Input_Context);
1766#endif 1820#endif
1767#if CURSOR_BLINK 1821#if CURSOR_BLINK
1768 if (option (Opt_cursorBlink)) 1822 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1823 cursor_blink_ev.stop ();
1824
1770 hidden_cursor = 0; 1825 hidden_cursor = 0;
1771#endif 1826#endif
1772#if OFF_FOCUS_FADING 1827#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1828 if (rs[Rs_fade])
1774 { 1829 {
1775 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1831 scr_recolour ();
1777 } 1832 }
1778#endif 1833#endif
1779 }
1780}
1781 1834
1782void 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 }
1837}
1838
1839void ecb_cold
1783rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx)
1784{ 1841{
1785#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1787 { 1844 {
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1848 }
1792#endif 1849#endif
1793} 1850}
1794 1851
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1796void 1853void ecb_hot
1797rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1855{
1799 make_current (); 1856 make_current ();
1800 1857
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1860 return;
1804 1861
1805# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1862 switch (ev.type)
1807 { 1863 {
1808 case PropertyNotify: 1864 case PropertyNotify:
1809 /* 1865 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1812 */ 1868 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1871 {
1816 bgPixmap.set_root_pixmap (); 1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1817 update_background (); 1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1818 } 1880 }
1881
1819 break; 1882 break;
1820 } 1883 }
1821# endif 1884
1885 refresh_check ();
1822} 1886}
1823#endif 1887#endif
1824 1888
1825void 1889void
1826rxvt_term::button_press (XButtonEvent &ev) 1890rxvt_term::button_press (XButtonEvent &ev)
… …
1847 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1848 return; 1912 return;
1849 } 1913 }
1850#endif 1914#endif
1851 1915
1852 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1853 1917
1854 if (reportmode) 1918 if (reportmode)
1855 { 1919 {
1856 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1857 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1922 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1923#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1924 if (ev.button == MEvent.button && clickintime)
1861 { 1925 {
1862 /* same button, within alloted time */ 1926 /* same button, within allowed time */
1863 MEvent.clicks++; 1927 MEvent.clicks++;
1864 1928
1865 if (MEvent.clicks > 1) 1929 if (MEvent.clicks > 1)
1866 { 1930 {
1867 /* only report double clicks */ 1931 /* only report double clicks */
… …
1881 mouse_report (ev); 1945 mouse_report (ev);
1882 } 1946 }
1883#else 1947#else
1884 MEvent.button = ev.button; 1948 MEvent.button = ev.button;
1885 mouse_report (ev); 1949 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1950#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1951
1888 } 1952 }
1889 else 1953 else
1890 { 1954 {
1891 if (ev.button != MEvent.button) 1955 if (ev.button != MEvent.button)
… …
1939 } 2003 }
1940 2004
1941 /* 2005 /*
1942 * Scrollbar window processing of button press 2006 * Scrollbar window processing of button press
1943 */ 2007 */
1944 if (isScrollbarWindow (ev.window)) 2008 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 2009 {
1946 scrollBar.setIdle (); 2010 page_dirn direction = NO_DIR;
2011
2012 if (scrollBar.upButton (ev.y))
2013 direction = UP; /* up */
2014 else if (scrollBar.dnButton (ev.y))
2015 direction = DN; /* down */
2016
2017 scrollBar.state = SB_STATE_IDLE;
1947 /* 2018 /*
1948 * Rxvt-style scrollbar: 2019 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 2020 * move up if mouse is above slider
1950 * move dn if mouse is below slider 2021 * move dn if mouse is below slider
1951 * 2022 *
… …
1960 /* 2031 /*
1961 * Mouse report disabled scrollbar: 2032 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 2033 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 2034 * click on scrollbar - send pageup/down
1964 */ 2035 */
1965 if ((scrollBar.style == R_SB_NEXT 2036 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 2037 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 2038 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 2039 tt_printf ("\033[B");
1975 else 2040 else
1976 switch (ev.button) 2041 switch (ev.button)
1977 { 2042 {
1978 case Button2: 2043 case Button2:
… …
1985 tt_printf ("\033[5~"); 2050 tt_printf ("\033[5~");
1986 break; 2051 break;
1987 } 2052 }
1988 } 2053 }
1989 else 2054 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2055#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2056 {
1997 if (scrollbarnext_upButton (ev.y)) 2057 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2058 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2060 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2061 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2062#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2063 if (scr_page (direction, 1))
2015 { 2064 {
2016 if (upordown < 0) 2065 if (direction == UP)
2017 scrollBar.setUp (); 2066 scrollBar.state = SB_STATE_UP;
2018 else 2067 else
2019 scrollBar.setDn (); 2068 scrollBar.state = SB_STATE_DOWN;
2020 } 2069 }
2021 } 2070 }
2022 else 2071 else
2023 switch (ev.button) 2072 switch (ev.button)
2024 { 2073 {
2025 case Button2: 2074 case Button2:
2026 switch (scrollbar_align) 2075 switch (scrollBar.align)
2027 { 2076 {
2028 case R_SB_ALIGN_TOP: 2077 case SB_ALIGN_TOP:
2029 csrO = 0; 2078 csrO = 0;
2030 break; 2079 break;
2031 case R_SB_ALIGN_CENTRE: 2080 case SB_ALIGN_CENTRE:
2032 csrO = (scrollBar.bot - scrollBar.top) / 2; 2081 csrO = (scrollBar.bot - scrollBar.top) / 2;
2033 break; 2082 break;
2034 case R_SB_ALIGN_BOTTOM: 2083 case SB_ALIGN_BOTTOM:
2035 csrO = scrollBar.bot - scrollBar.top; 2084 csrO = scrollBar.bot - scrollBar.top;
2036 break; 2085 break;
2037 } 2086 }
2038 2087
2039 if (scrollBar.style == R_SB_XTERM 2088 if (scrollBar.style == SB_STYLE_XTERM
2040 || scrollbar_above_slider (ev.y) 2089 || scrollBar.above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2090 || scrollBar.below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2091 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2043 2092
2044 scrollBar.setMotion (); 2093 scrollBar.state = SB_STATE_MOTION;
2045 break; 2094 break;
2046 2095
2047 case Button1: 2096 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2097 if (scrollBar.align == SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2098 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2099 /* FALLTHROUGH */
2051 2100
2052 case Button3: 2101 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2102 if (scrollBar.style != SB_STYLE_XTERM)
2054 { 2103 {
2055 if (scrollbar_above_slider (ev.y)) 2104 if (scrollBar.above_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2057 scr_page (UP, nrow - 1); 2106 scr_page (UP, nrow - 1);
2058# else 2107# else
2059 scr_page (UP, nrow / 4); 2108 scr_page (UP, nrow / 4);
2060# endif 2109# endif
2061 else if (scrollbar_below_slider (ev.y)) 2110 else if (scrollBar.below_slider (ev.y))
2062# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2063 scr_page (DN, nrow - 1); 2112 scr_page (DN, nrow - 1);
2064# else 2113# else
2065 scr_page (DN, nrow / 4); 2114 scr_page (DN, nrow / 4);
2066# endif 2115# endif
2067 else 2116 else
2068 scrollBar.setMotion (); 2117 scrollBar.state = SB_STATE_MOTION;
2069 } 2118 }
2070 else 2119 else
2071 { 2120 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2121 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2122 (nrow
2074 * scrollbar_position (ev.y) 2123 * scrollBar.position (ev.y)
2075 / scrollbar_size ())); 2124 / scrollBar.size ()));
2076 } 2125 }
2077 2126
2078 break; 2127 break;
2079 } 2128 }
2080 } 2129 }
… …
2090 2139
2091 csrO = 0; /* reset csr Offset */ 2140 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2141 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2142 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2143
2095 if (scrollbar_isUpDn ()) 2144 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2096 { 2145 {
2097 scrollBar.setIdle (); 2146 scrollBar.state = SB_STATE_IDLE;
2098 scrollbar_show (0); 2147 scrollBar.show (0);
2099 } 2148 }
2100 2149
2101#ifdef SELECTION_SCROLLING 2150#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2151 sel_scroll_ev.stop();
2104#endif 2152#endif
2105 2153
2106 if (ev.window == vt) 2154 if (ev.window == vt)
2107 { 2155 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2156 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2123#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2124 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2125 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2126 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2127 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2128 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2129 { 2177 {
2130 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2131 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2132 mouse_report (ev); 2180 mouse_report (ev);
2133 } 2181 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2182#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2183 MEvent.button = AnyButton;
2136 mouse_report (ev); 2184 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2185#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2186 return;
2139 } 2187 }
2140 2188
2141 /* 2189 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2190 * dumb hack to compensate for the failure of click-and-drag
… …
2153 case Button3: 2201 case Button3:
2154 selection_make (ev.time); 2202 selection_make (ev.time);
2155 break; 2203 break;
2156 2204
2157 case Button2: 2205 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2208 break;
2161 2209
2162#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2163 case Button4: 2211 case Button4:
2164 case Button5: 2212 case Button5:
2165 { 2213 {
2166 int i; 2214 int lines;
2167 page_dirn v; 2215 page_dirn dirn;
2168 2216
2169 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2170 2218
2171 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2172 i = 1; 2220 lines = 1;
2173 else if (option (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2222 lines = nrow - 1;
2175 else 2223 else
2176 i = 5; 2224 lines = 5;
2177 2225
2178# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2179 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2180 { 2228 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2231
2185 if (slip_wheel_ev.at < NOW) 2232 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2234 }
2190 else 2235 else
2236# endif
2191 { 2237 {
2192# endif
2193 scr_page (v, i); 2238 scr_page (dirn, lines);
2194 scrollbar_show (1); 2239 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2240 }
2197# endif
2198 } 2241 }
2199 break; 2242 break;
2200#endif 2243#endif
2201 } 2244 }
2202 } 2245 }
2203} 2246}
2204 2247
2205/*}}} */ 2248/*}}} */
2206 2249
2207bool 2250void ecb_hot
2208rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2209{ 2252{
2210 bool flag = false;
2211 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2212 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2213 2255
2214 for (;;) 2256 for (;;)
2215 { 2257 {
2216 if (ch == NOCHAR) 2258 if (ecb_unlikely (ch == NOCHAR))
2217 { 2259 {
2218 seq_begin = cmdbuf_ptr; 2260 seq_begin = cmdbuf_ptr;
2219 ch = next_char (); 2261 ch = next_char ();
2220 2262
2221 if (ch == NOCHAR) 2263 if (ch == NOCHAR)
2222 break; 2264 break;
2223 } 2265 }
2224 2266
2225 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2267 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2226 { 2268 {
2227 if (!seen_input) 2269 if (ecb_unlikely (!seen_input))
2228 { 2270 {
2229 seen_input = 1; 2271 seen_input = 1;
2230 // many badly-written programs (e.g. jed) contain a race condition: 2272 // many badly-written programs (e.g. jed) contain a race condition:
2231 // they first read the screensize and then install a SIGWINCH handler. 2273 // they first read the screensize and then install a SIGWINCH handler.
2232 // some window managers resize the window early, and these programs 2274 // some window managers resize the window early, and these programs
… …
2245 wchar_t *str = buf; 2287 wchar_t *str = buf;
2246 wchar_t *eol = str + min (ncol, UBUFSIZ); 2288 wchar_t *eol = str + min (ncol, UBUFSIZ);
2247 2289
2248 for (;;) 2290 for (;;)
2249 { 2291 {
2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2292 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2251 break; 2293 break;
2252 2294
2253 *str++ = ch; 2295 *str++ = ch;
2254 2296
2255 if (ch == C0_LF || str >= eol) 2297 if (ecb_unlikely (ch == C0_LF || str >= eol))
2256 { 2298 {
2257 if (ch == C0_LF) 2299 if (ch == C0_LF)
2258 nlines++; 2300 nlines++;
2259 2301
2260 refresh_count++; 2302 refresh_count++;
2261 2303
2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2304 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2263 { 2305 {
2264 refresh_count = 0; 2306 refresh_count = 0;
2265 2307
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2308 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2267 { 2309 {
2268 refreshnow = true; 2310 refreshnow = true;
2269 ch = NOCHAR; 2311 ch = NOCHAR;
2270 break; 2312 break;
2271 } 2313 }
… …
2309 * What the heck we'll cheat and only refresh less than every page-full. 2351 * What the heck we'll cheat and only refresh less than every page-full.
2310 * if skipScroll is enabled. 2352 * if skipScroll is enabled.
2311 */ 2353 */
2312 if (refreshnow) 2354 if (refreshnow)
2313 { 2355 {
2314 flag = true;
2315 scr_refresh (); 2356 scr_refresh ();
2316 want_refresh = 1; 2357 want_refresh = 1;
2317 } 2358 }
2318
2319 } 2359 }
2320 else 2360 else
2321 { 2361 {
2322 try 2362 try
2323 { 2363 {
… …
2331 } 2371 }
2332 2372
2333 ch = NOCHAR; 2373 ch = NOCHAR;
2334 } 2374 }
2335 } 2375 }
2336
2337 return flag;
2338} 2376}
2339 2377
2340// read the next character 2378// read the next character
2341wchar_t 2379wchar_t ecb_hot
2342rxvt_term::next_char () NOTHROW 2380rxvt_term::next_char () NOTHROW
2343{ 2381{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2383 {
2346 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2348 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2349 2387
2350 wchar_t wc; 2388 wchar_t wc;
2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2352 2390
… …
2356 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2357 break; 2395 break;
2358 } 2396 }
2359 2397
2360 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2399 {
2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2404 }
2362 2405
2363 // assume wchar == unicode 2406 // assume wchar == unicode
2364 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
2365 return wc & UNICODE_MASK; 2408 return wc & UNICODE_MASK;
2366 } 2409 }
2367 2410
2368 return NOCHAR; 2411 return NOCHAR;
2369} 2412}
2370 2413
2371// read the next octet 2414// read the next octet
2372uint32_t 2415uint32_t ecb_hot
2373rxvt_term::next_octet () NOTHROW 2416rxvt_term::next_octet () NOTHROW
2374{ 2417{
2375 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2376 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2377 : NOCHAR; 2420 : NOCHAR;
2378} 2421}
2379 2422
2380static class out_of_input out_of_input; 2423static class out_of_input out_of_input;
2381 2424
2382/* rxvt_cmd_getc () - Return next input character */ 2425wchar_t ecb_hot
2383/*
2384 * Return the next input character after first passing any keyboard input
2385 * to the command.
2386 */
2387wchar_t
2388rxvt_term::cmd_getc () THROW ((class out_of_input)) 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2389{ 2427{
2390 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2391 2429
2392 if (c == NOCHAR) 2430 if (c == NOCHAR)
2393 throw out_of_input; 2431 throw out_of_input;
2394 2432
2395 return c; 2433 return c;
2396} 2434}
2397 2435
2398uint32_t 2436uint32_t ecb_hot
2399rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2400{ 2438{
2401 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2402 2440
2403 if (c == NOCHAR) 2441 if (c == NOCHAR)
… …
2407} 2445}
2408 2446
2409/*{{{ print pipe */ 2447/*{{{ print pipe */
2410/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2411#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2412FILE * 2450FILE * ecb_cold
2413rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2414{ 2452{
2415 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2416 2454
2417 if (stream == NULL) 2455 if (stream == NULL)
2418 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2419 2457
2420 return stream; 2458 return stream;
2421} 2459}
2422 2460
2423int 2461int ecb_cold
2424rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2425{ 2463{
2426 fflush (stream); 2464 fflush (stream);
2427 return pclose (stream); 2465 return pclose (stream);
2428} 2466}
2429 2467
2430/* 2468/*
2431 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2432 */ 2470 */
2433void 2471void ecb_cold
2434rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2435{ 2473{
2436 int done; 2474 FILE *fd = popen_printer ();
2437 FILE *fd;
2438 2475
2439 if ((fd = popen_printer ()) == NULL) 2476 if (!fd)
2440 return; 2477 return;
2441 2478
2442 /* 2479 /*
2443 * Send all input to the printer until either ESC[4i or ESC[?4i 2480 * Send all input to the printer until either ESC[4i or ESC[?4i
2444 * is received. 2481 * is received.
2445 */ 2482 */
2446 for (done = 0; !done;) 2483 for (int done = 0; !done; )
2447 { 2484 {
2448 unsigned char buf[8]; 2485 unsigned char buf[8];
2449 unicode_t ch; 2486 unicode_t ch;
2450 unsigned int i, len; 2487 unsigned int i, len;
2451 2488
… …
2482 } 2519 }
2483 } 2520 }
2484 2521
2485 pclose_printer (fd); 2522 pclose_printer (fd);
2486} 2523}
2487#endif /* PRINTPIPE */ 2524#endif /* PRINTPIPE */
2488/*}}} */ 2525/*}}} */
2489 2526
2490/* *INDENT-OFF* */
2491enum { 2527enum {
2492 C1_40 = 0x40, 2528 C1_40 = 0x40,
2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2529 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2530 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497}; 2533};
2498/* *INDENT-ON* */
2499 2534
2500/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
2501void 2536void ecb_hot
2502rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
2503{ 2538{
2504 switch (ch) 2539 switch (ch)
2505 { 2540 {
2506 case C0_ESC: 2541 case C0_ESC:
… …
2536 scr_charset_choose (0); 2571 scr_charset_choose (0);
2537 break; 2572 break;
2538 2573
2539#ifdef EIGHT_BIT_CONTROLS 2574#ifdef EIGHT_BIT_CONTROLS
2540 // 8-bit controls 2575 // 8-bit controls
2541 case 0x90: /* DCS */ 2576 case 0x90: /* DCS */
2542 process_dcs_seq (); 2577 process_dcs_seq ();
2543 break; 2578 break;
2544 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
2545 process_csi_seq (); 2580 process_csi_seq ();
2546 break; 2581 break;
2547 case 0x9d: /* OSC */ 2582 case 0x9d: /* OSC */
2548 process_osc_seq (); 2583 process_osc_seq ();
2549 break; 2584 break;
2550#endif 2585#endif
2551 } 2586 }
2552} 2587}
2553/*}}} */ 2588/*}}} */
2554 2589
2555 2590
2556/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
2557void 2592void ecb_cold
2558rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
2559{ 2594{
2560 int row, col; 2595 int row, col;
2561 2596
2562 switch (ch) 2597 switch (ch)
… …
2596 break; 2631 break;
2597 case 'Z': /* identify the terminal type */ 2632 case 'Z': /* identify the terminal type */
2598 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2633 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2599 break; 2634 break;
2600 case '<': /* turn off VT52 mode */ 2635 case '<': /* turn off VT52 mode */
2601 PrivMode (0, PrivMode_vt52); 2636 priv_modes &= ~PrivMode_vt52;
2602 break; 2637 break;
2603 case 'F': /* use special graphics character set */ 2638 case 'F': /* use special graphics character set */
2604 case 'G': /* use regular character set */ 2639 case 'G': /* use regular character set */
2605 /* unimplemented */ 2640 /* unimplemented */
2606 break; 2641 break;
… …
2612} 2647}
2613/*}}} */ 2648/*}}} */
2614 2649
2615 2650
2616/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
2617void 2652void ecb_hot
2618rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
2619{ 2654{
2620 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
2621 2656
2622 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
2625 return; 2660 return;
2626 } 2661 }
2627 2662
2628 switch (ch) 2663 switch (ch)
2629 { 2664 {
2630 /* case 1: do_tek_mode (); break; */
2631 case '#': 2665 case '#':
2632 if (cmd_getc () == '8') 2666 if (cmd_getc () == '8')
2633 scr_E (); 2667 scr_E ();
2634 break; 2668 break;
2635 case '(': 2669 case '(':
… …
2658#if !ENABLE_MINIMAL 2692#if !ENABLE_MINIMAL
2659 case '9': 2693 case '9':
2660 scr_forwardindex (); 2694 scr_forwardindex ();
2661 break; 2695 break;
2662#endif 2696#endif
2697 // DECPAM/DECPNM
2663 case '=': 2698 case '=':
2699 priv_modes |= PrivMode_aplKP;
2700 break;
2664 case '>': 2701 case '>':
2665 PrivMode ((ch == '='), PrivMode_aplKP); 2702 priv_modes &= ~PrivMode_aplKP;
2666 break; 2703 break;
2667 2704
2668 case C1_40: 2705 case C1_40:
2669 cmd_getc (); 2706 cmd_getc ();
2670 break; 2707 break;
… …
2674 2711
2675 /* 8.3.87: NEXT LINE */ 2712 /* 8.3.87: NEXT LINE */
2676 case C1_NEL: /* ESC E */ 2713 case C1_NEL: /* ESC E */
2677 { 2714 {
2678 wchar_t nlcr[] = { C0_LF, C0_CR }; 2715 wchar_t nlcr[] = { C0_LF, C0_CR };
2679 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2680 } 2717 }
2681 break; 2718 break;
2682 2719
2683 /* kidnapped escape sequence: Should be 8.3.48 */ 2720 /* kidnapped escape sequence: Should be 8.3.48 */
2684 case C1_ESA: /* ESC G */ 2721 case C1_ESA: /* ESC G */
2685 process_graphics (); 2722 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q')
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2686 break; 2725 break;
2687 2726
2688 /* 8.3.63: CHARACTER TABULATION SET */ 2727 /* 8.3.63: CHARACTER TABULATION SET */
2689 case C1_HTS: /* ESC H */ 2728 case C1_HTS: /* ESC H */
2690 scr_set_tab (1); 2729 scr_set_tab (1);
… …
2694 case C1_RI: /* ESC M */ 2733 case C1_RI: /* ESC M */
2695 scr_index (DN); 2734 scr_index (DN);
2696 break; 2735 break;
2697 2736
2698 /* 8.3.142: SINGLE-SHIFT TWO */ 2737 /* 8.3.142: SINGLE-SHIFT TWO */
2699 /*case C1_SS2: scr_single_shift (2); break; */ 2738 /* case C1_SS2: break; */
2700 2739
2701 /* 8.3.143: SINGLE-SHIFT THREE */ 2740 /* 8.3.143: SINGLE-SHIFT THREE */
2702 /*case C1_SS3: scr_single_shift (3); break; */ 2741 /* case C1_SS3: break; */
2703 2742
2704 /* 8.3.27: DEVICE CONTROL STRING */ 2743 /* 8.3.27: DEVICE CONTROL STRING */
2705 case C1_DCS: /* ESC P */ 2744 case C1_DCS: /* ESC P */
2706 process_dcs_seq (); 2745 process_dcs_seq ();
2707 break; 2746 break;
… …
2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2748 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2710 case C1_SCI: /* ESC Z */ 2749 case C1_SCI: /* ESC Z */
2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2750 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2712 break; /* steal obsolete ESC [ c */ 2751 break; /* steal obsolete ESC [ c */
2713 2752
2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2753 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2715 case C1_CSI: /* ESC [ */ 2754 case C1_CSI: /* ESC [ */
2716 process_csi_seq (); 2755 process_csi_seq ();
2717 break; 2756 break;
2718 2757
2719 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2758 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2720 case C1_OSC: /* ESC ] */ 2759 case C1_OSC: /* ESC ] */
2721 process_osc_seq (); 2760 process_osc_seq ();
2722 break; 2761 break;
2723 2762
2724 /* 8.3.106: RESET TO INITIAL STATE */ 2763 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2725 case 'c': 2764 case 'c':
2726 mbstate.reset (); 2765 mbstate.reset ();
2727 scr_poweron (); 2766 scr_poweron ();
2728 scrollbar_show (1); 2767 scrollBar.show (1);
2729 break; 2768 break;
2730 2769
2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2770 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2732 case 'n': 2771 case 'n':
2733 scr_charset_choose (2); 2772 scr_charset_choose (2);
… …
2740 } 2779 }
2741} 2780}
2742/*}}} */ 2781/*}}} */
2743 2782
2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2783/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2745/* *INDENT-OFF* */
2746enum { 2784enum {
2747 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2756}; 2794};
2757 2795
2758#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2796#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2761#define get_byte_array_bit(array, bit) \ 2799#define get_byte_array_bit(array, bit) \
2762 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2800 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2763 2801
2764const unsigned char csi_defaults[] = 2802static const unsigned char csi_defaults[] =
2765 { 2803 {
2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2774 }; 2812 };
2775/* *INDENT-ON* */
2776 2813
2777void 2814void ecb_hot
2778rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
2779{ 2816{
2780 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
2781 unsigned int nargs, p; 2818 unsigned int nargs, p;
2782 int n, ndef; 2819 int n, ndef;
2783 int arg[ESC_ARGS] = { }; 2820 int arg[ESC_ARGS] = { };
2784 2821
2785 nargs = 0; 2822 nargs = 0;
2786 2823
2787 priv = 0; 2824 priv = 0;
2788 ch = cmd_getc (); 2825 ch = cmd_getc ();
2789 if (ch >= '<' && ch <= '?') 2826 if ((ch >= '<' && ch <= '?') || ch == '!')
2827 {
2790 { /* '<' '=' '>' '?' */ 2828 /* '<' '=' '>' '?' '!' */
2791 priv = ch; 2829 priv = ch;
2792 ch = cmd_getc (); 2830 ch = cmd_getc ();
2793 } 2831 }
2794 2832
2833 prev_ch = 0;
2795 /* read any numerical arguments */ 2834 /* read any numerical arguments */
2796 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
2797 { 2836 {
2798 if (isdigit (ch)) 2837 if (isdigit (ch))
2799 { 2838 {
… …
2809 n = -1; 2848 n = -1;
2810 } 2849 }
2811 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
2812 process_nonprinting (ch); 2851 process_nonprinting (ch);
2813 2852
2853 prev_ch = ch;
2814 ch = cmd_getc (); 2854 ch = cmd_getc ();
2815 } 2855 }
2816 2856
2817 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
2818 return; 2858 return;
… …
2838 { 2878 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2879 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2880 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 // 2881 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2882 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2883 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844 // that we do not support xterm mouse reporting (should be 95 when we do). 2884 // versions.
2845 // 2885 //
2846 tt_printf ("\033[>%d;94;0c", 'U'); 2886 tt_printf ("\033[>%d;95;0c", 'U');
2847 } 2887 }
2848 break; 2888 break;
2889
2849 case '?': 2890 case '?':
2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2851 process_terminal_mode (ch, priv, nargs, arg); 2892 process_terminal_mode (ch, priv, nargs, arg);
2852 break; 2893 break;
2894
2895 case '!':
2896 if (ch == CSI_70)
2897 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset ();
2900
2901 static const int pm_h[] = { 7, 25 };
2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2903
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2906 }
2907 break;
2908 }
2909
2854 return; 2910 return;
2855 } 2911 }
2856 2912
2857 switch (ch) 2913 switch (ch)
2858 { 2914 {
… …
2872 } 2928 }
2873 break; 2929 break;
2874#endif 2930#endif
2875 2931
2876 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2932 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2877 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2933 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2878 arg[0] = -arg[0]; 2934 arg[0] = -arg[0];
2879 /* FALLTHROUGH */ 2935 /* FALLTHROUGH */
2880 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2936 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2881 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2882 scr_gotorc (arg[0], 0, RELATIVE); 2938 scr_gotorc (arg[0], 0, RELATIVE);
2883 break; 2939 break;
2884 2940
2885 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2886 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3036 scr_insert_mode (1); 3092 scr_insert_mode (1);
3037 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3038 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3039 break; 3095 break;
3040 3096
3097 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3041 /* 3102 /*
3042 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3043 */ 3104 */
3044 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3045 if (nargs == 1) 3106 if (nargs == 1)
… …
3073 } 3134 }
3074} 3135}
3075/*}}} */ 3136/*}}} */
3076 3137
3077#if !ENABLE_MINIMAL 3138#if !ENABLE_MINIMAL
3078/* ARGSUSED */
3079void 3139void
3080rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3140rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3081{ 3141{
3082 int x, y; 3142 int x, y;
3083 XWindowAttributes wattr; 3143 XWindowAttributes wattr;
… …
3092 { 3152 {
3093 /* 3153 /*
3094 * commands 3154 * commands
3095 */ 3155 */
3096 case 1: /* deiconify window */ 3156 case 1: /* deiconify window */
3097 XMapWindow (dpy, parent[0]); 3157 XMapWindow (dpy, parent);
3098 break; 3158 break;
3099 case 2: /* iconify window */ 3159 case 2: /* iconify window */
3100 XIconifyWindow (dpy, parent[0], display->screen); 3160 XIconifyWindow (dpy, parent, display->screen);
3101 break; 3161 break;
3102 case 3: /* set position (pixels) */ 3162 case 3: /* set position (pixels) */
3103 XMoveWindow (dpy, parent[0], args[1], args[2]); 3163 XMoveWindow (dpy, parent, args[1], args[2]);
3104 break; 3164 break;
3105 case 4: /* set size (pixels) */ 3165 case 4: /* set size (pixels) */
3106 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3166 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3107 break; 3167 break;
3108 case 5: /* raise window */ 3168 case 5: /* raise window */
3109 XRaiseWindow (dpy, parent[0]); 3169 XRaiseWindow (dpy, parent);
3110 break; 3170 break;
3111 case 6: /* lower window */ 3171 case 6: /* lower window */
3112 XLowerWindow (dpy, parent[0]); 3172 XLowerWindow (dpy, parent);
3113 break; 3173 break;
3114 case 7: /* refresh window */ 3174 case 7: /* refresh window */
3115 scr_touch (true); 3175 scr_touch (true);
3116 break; 3176 break;
3117 case 8: /* set size (chars) */ 3177 case 8: /* set size (chars) */
… …
3120 break; 3180 break;
3121 3181
3122 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3123 default: 3183 default:
3124 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3125 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3126 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3127 break; 3187 break;
3128 3188
3129 /* 3189 /*
3130 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
3131 */ 3191 */
3132 case 11: /* report window state */ 3192 case 11: /* report window state */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3134 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3194 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3135 break; 3195 break;
3136 case 13: /* report window position */ 3196 case 13: /* report window position */
3137 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3138 XTranslateCoordinates (dpy, parent[0], wattr.root, 3198 XTranslateCoordinates (dpy, parent, wattr.root,
3139 -wattr.border_width, -wattr.border_width, 3199 -wattr.border_width, -wattr.border_width,
3140 &x, &y, &wdummy); 3200 &x, &y, &wdummy);
3141 tt_printf ("\033[3;%d;%dt", x, y); 3201 tt_printf ("\033[3;%d;%dt", x, y);
3142 break; 3202 break;
3143 case 14: /* report window size (pixels) */ 3203 case 14: /* report window size (pixels) */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3145 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3205 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3146 break; 3206 break;
3147 case 18: /* report text area size (chars) */ 3207 case 18: /* report text area size (chars) */
3148 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3208 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3149 break; 3209 break;
… …
3151 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3152 break; 3212 break;
3153 case 20: /* report icon label */ 3213 case 20: /* report icon label */
3154 { 3214 {
3155 char *s; 3215 char *s;
3156 XGetIconName (dpy, parent[0], &s); 3216 XGetIconName (dpy, parent, &s);
3157 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3217 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158 XFree (s); 3218 XFree (s);
3159 } 3219 }
3160 break; 3220 break;
3161 case 21: /* report window title */ 3221 case 21: /* report window title */
3162 { 3222 {
3163 char *s; 3223 char *s;
3164 XFetchName (dpy, parent[0], &s); 3224 XFetchName (dpy, parent, &s);
3165 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3225 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166 XFree (s); 3226 XFree (s);
3167 } 3227 }
3168 break; 3228 break;
3169 } 3229 }
… …
3179rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3180{ 3240{
3181 unicode_t ch; 3241 unicode_t ch;
3182 bool seen_esc = false; 3242 bool seen_esc = false;
3183 unsigned int n = 0; 3243 unsigned int n = 0;
3184 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3185 3245
3186 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3187 { 3247 {
3188 if (seen_esc) 3248 if (seen_esc)
3189 { 3249 {
… …
3204 else if (ch < 0x20) 3264 else if (ch < 0x20)
3205 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3206 3266
3207 seen_esc = false; 3267 seen_esc = false;
3208 3268
3209 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3210 // stop at some sane length 3270 // stop at some sane length
3211 return NULL; 3271 return NULL;
3212 3272
3213 string[n++] = ch; 3273 string[n++] = ch;
3214 } 3274 }
… …
3225 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3226 */ 3286 */
3227void 3287void
3228rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3229{ 3289{
3230 char *s;
3231 unicode_t eh;
3232
3233 /* 3290 /*
3234 * Not handled yet 3291 * Not handled yet
3235 */ 3292 */
3293
3294 unicode_t eh;
3236 s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3237 if (s) 3296 if (s)
3238 free (s); 3297 free (s);
3239 3298
3240 return; 3299 return;
3241} 3300}
… …
3245 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3246 */ 3305 */
3247void 3306void
3248rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3249{ 3308{
3250 unicode_t ch, eh;
3251 int arg; 3309 int arg;
3252 3310
3253 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3254 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3255 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3256 3314
3257 if (ch == ';') 3315 if (ch == ';')
3258 { 3316 {
3317 unicode_t eh;
3259 char *s = get_to_st (eh); 3318 char *s = get_to_st (eh);
3260 3319
3261 if (s) 3320 if (s)
3262 { 3321 {
3263 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, eh);
… …
3287 3346
3288/* 3347/*
3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3348 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3290 */ 3349 */
3291void 3350void
3292rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3351rxvt_term::process_xterm_seq (int op, char *str, char resp)
3293{ 3352{
3294 int color; 3353 int color;
3295 char *buf, *name; 3354 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3355 bool query = str[0] == '?' && !str[1];
3297 int saveop = op; 3356 int saveop = op;
… …
3324 unsigned long bytes_after; 3383 unsigned long bytes_after;
3325 unsigned char *value = 0; 3384 unsigned char *value = 0;
3326 const char *str = ""; 3385 const char *str = "";
3327 3386
3328 if (prop 3387 if (prop
3329 && XGetWindowProperty (dpy, parent[0], 3388 && XGetWindowProperty (dpy, parent,
3330 prop, 0, 1<<16, 0, AnyPropertyType, 3389 prop, 0, 1<<16, 0, AnyPropertyType,
3331 &actual_type, &actual_format, 3390 &actual_type, &actual_format,
3332 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3333 && actual_type != None 3392 && actual_type != None
3334 && actual_format == 8) 3393 && actual_format == 8)
3335 str = (const char *)(value); 3394 str = (const char *)(value);
3336 3395
3337 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3338 3397
3339 XFree (value); 3398 XFree (value);
3340 } 3399 }
3341 else 3400 else
3342 { 3401 {
3343 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3402 char *eq = strchr (str, '=');
3344 3403
3345 if (eq) 3404 if (eq)
3346 { 3405 {
3347 *eq = 0; 3406 *eq = 0;
3348 set_utf8_property (display->atom (str), eq + 1); 3407 set_utf8_property (display->atom (str), eq + 1);
3349 } 3408 }
3350 else 3409 else
3351 XDeleteProperty (dpy, parent[0], 3410 XDeleteProperty (dpy, parent,
3352 display->atom (str)); 3411 display->atom (str));
3353 } 3412 }
3354 break; 3413 break;
3355 3414
3356 case XTerm_Color: 3415 case XTerm_Color:
… …
3369 *buf++ = '\0'; 3428 *buf++ = '\0';
3370 3429
3371 process_color_seq (op, color, name, resp); 3430 process_color_seq (op, color, name, resp);
3372 } 3431 }
3373 break; 3432 break;
3433 case Rxvt_restoreFG:
3374 case XTerm_Color00: 3434 case XTerm_Color00:
3375 process_color_seq (op, Color_fg, str, resp); 3435 process_color_seq (op, Color_fg, str, resp);
3376 break; 3436 break;
3437 case Rxvt_restoreBG:
3377 case XTerm_Color01: 3438 case XTerm_Color01:
3378 process_color_seq (op, Color_bg, str, resp); 3439 process_color_seq (op, Color_bg, str, resp);
3379 break; 3440 break;
3380#ifndef NO_CURSORCOLOR 3441#ifndef NO_CURSORCOLOR
3381 case XTerm_Color_cursor: 3442 case XTerm_Color_cursor:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3447 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3448 break;
3388 case XTerm_Color_pointer_bg: 3449 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3450 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3451 break;
3452#ifdef OPTION_HC
3453 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp);
3455 break;
3456 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp);
3458 break;
3459#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3460#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3461 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3462 process_color_seq (op, Color_BD, str, resp);
3398 break; 3463 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3464 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3465 process_color_seq (op, Color_UL, str, resp);
3402 break; 3466 break;
3403 case URxvt_Color_IT: 3467 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3468 process_color_seq (op, Color_IT, str, resp);
3405 break; 3469 break;
3406#endif 3470#endif
3407#if ENABLE_TRANSPARENCY 3471 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp);
3473 break;
3474
3475#if BG_IMAGE_FROM_ROOT
3408 case URxvt_Color_tint: 3476 case URxvt_Color_tint:
3409 process_color_seq (op, Color_tint, str, resp); 3477 process_color_seq (op, Color_tint, str, resp);
3410 { 3478 {
3411 bool changed = false; 3479 bool changed = false;
3480
3412 if (ISSET_PIXCOLOR (Color_tint)) 3481 if (ISSET_PIXCOLOR (Color_tint))
3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3414 else 3483
3415 changed = bgPixmap.unset_tint ();
3416 if (changed) 3484 if (changed)
3417 update_background (); 3485 update_background ();
3418 } 3486 }
3419 3487
3420 break; 3488 break;
… …
3423#if BG_IMAGE_FROM_FILE 3491#if BG_IMAGE_FROM_FILE
3424 case Rxvt_Pixmap: 3492 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3493 if (!strcmp (str, "?"))
3426 { 3494 {
3427 char str[256]; 3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3428 3500
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3501 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3502 h_scale, v_scale,
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3503 h_align, v_align);
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3505 }
3434 else 3506 else
3435 { 3507 {
3436 int changed = 0; 3508 bool changed = false;
3437 3509
3438 if (*str != ';') 3510 if (*str != ';')
3439 { 3511 {
3440 /* reset to default scaling :*/ 3512 try
3441 bgPixmap.unset_geometry (); 3513 {
3442 if (bgPixmap.set_file (str)) /* change pixmap */ 3514 fimage.set_file_geometry (this, str);
3443 changed++; 3515 changed = true;
3444 str = strchr (str, ';'); 3516 }
3445 if (str == NULL) 3517 catch (const class rxvt_failure_exception &e)
3446 bgPixmap.set_defaultGeometry (); 3518 {
3519 }
3447 } 3520 }
3448 while (str) 3521 else
3449 { 3522 {
3450 str++; 3523 str++;
3451 if (bgPixmap.set_geometry (str)) 3524 if (fimage.set_geometry (str, true))
3452 changed++; 3525 changed = true;
3453 str = strchr (str, ';');
3454 } 3526 }
3527
3455 if (changed) 3528 if (changed)
3529 {
3530 if (bg_window_position_sensitive ())
3531 {
3532 int x, y;
3533 get_window_origin (x, y);
3534 parent_x = x;
3535 parent_y = y;
3536 }
3456 update_background (); 3537 update_background ();
3538 }
3457 } 3539 }
3458 break; 3540 break;
3459#endif 3541#endif
3460
3461 case Rxvt_restoreFG:
3462 set_window_color (Color_fg, str);
3463 break;
3464 case Rxvt_restoreBG:
3465 set_window_color (Color_bg, str);
3466 break;
3467 3542
3468 case XTerm_logfile: 3543 case XTerm_logfile:
3469 // TODO, when secure mode? 3544 // TODO, when secure mode?
3470 break; 3545 break;
3471 3546
… …
3538 break; 3613 break;
3539#endif 3614#endif
3540 3615
3541#if ENABLE_PERL 3616#if ENABLE_PERL
3542 case URxvt_perl: 3617 case URxvt_perl:
3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3618 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3544 ; // no responses yet
3545 break; 3619 break;
3546#endif 3620#endif
3547 } 3621 }
3548} 3622}
3549/*----------------------------------------------------------------------*/ 3623/*----------------------------------------------------------------------*/
… …
3556 * 's' = save 3630 * 's' = save
3557 * 'r' = restore 3631 * 'r' = restore
3558 * 't' = toggle 3632 * 't' = toggle
3559 * so no need for fancy checking 3633 * so no need for fancy checking
3560 */ 3634 */
3561int 3635int ecb_cold
3562rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
3563{ 3637{
3564 int state; 3638 int state;
3565 3639
3566 if (mode == 's') 3640 if (mode == 's')
3567 { 3641 {
3568 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
3569 return -1; 3646 return -1;
3570 } 3647 }
3571 else 3648 else
3572 { 3649 {
3573 if (mode == 'r') 3650 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3651 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3652 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3653 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577 PrivMode (state, bit); 3654
3655 if (state)
3656 priv_modes |= bit;
3657 else
3658 priv_modes &= ~bit;
3578 } 3659 }
3579 3660
3580 return state; 3661 return state;
3581} 3662}
3582 3663
3583/* we're not using priv _yet_ */ 3664/* we're not using priv _yet_ */
3584void 3665void
3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3666rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3586{ 3667{
3587 unsigned int i, j; 3668 unsigned int i, j;
3588 int state; 3669 int state;
3589 3670
3590 static const struct 3671 static const struct
3591 { 3672 {
3592 const int argval; 3673 const int argval;
3593 const unsigned long bit; 3674 const unsigned long bit;
3594 } argtopriv[] = { 3675 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, 3676 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3677 { 2, PrivMode_vt52 }, // DECANM
3597 { 3, PrivMode_132 }, 3678 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, 3679 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, 3680 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, 3681 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, 3682 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, bi-directional support mode 3683 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3604 // 18, 19 printing-related
3605 { 25, PrivMode_VisibleCursor }, 3685 { 12, PrivMode_BlinkingCursor },
3686 // 18 end FF to printer after print screen
3687 // 19 Print screen prints full screen/scroll region
3688 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3690 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3691#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3692 { 35, PrivMode_ShiftKeys }, // rxvt extension
3693 // 38, tektronix mode // DECTEK
3610 { 40, PrivMode_132OK }, 3694 { 40, PrivMode_132OK },
3611 // 41 xterm more fixes NYI 3695 // 41 xterm more fixes NYI
3612 // 45 margin bell NYI 3696 // 45 margin bell NYI
3613 // 46 start logging 3697 // 46 start logging
3614 { 47, PrivMode_Screen }, 3698 { 47, PrivMode_Screen },
3615 { 66, PrivMode_aplKP }, 3699 { 66, PrivMode_aplKP }, // DECNKM
3616#ifndef NO_BACKSPACE_KEY 3700#ifndef NO_BACKSPACE_KEY
3617 { 67, PrivMode_BackSpace }, 3701 { 67, PrivMode_BackSpace }, // DECBKM
3618#endif 3702#endif
3619 { 1000, PrivMode_MouseX11 }, 3703 { 1000, PrivMode_MouseX11 },
3620 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3704 { 1002, PrivMode_MouseBtnEvent },
3621 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3705 { 1003, PrivMode_MouseAnyEvent },
3622 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3706#if ENABLE_FRILLS
3707 { 1005, PrivMode_ExtModeMouse },
3708#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3709 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3710 { 1011, PrivMode_Keypress }, // rxvt extension
3711#if ENABLE_FRILLS
3712 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3713#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3714 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3715 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3716 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3717 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3718 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3719 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3720 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3721 { 2004, PrivMode_BracketPaste },
3632 }; 3722 };
3633 3723
3634 if (nargs == 0) 3724 if (nargs == 0)
3635 return; 3725 return;
3636 3726
… …
3643 for (i = 0; i < nargs; i++) 3733 for (i = 0; i < nargs; i++)
3644 { 3734 {
3645 state = -1; 3735 state = -1;
3646 3736
3647 /* basic handling */ 3737 /* basic handling */
3648 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3738 for (j = 0; j < ecb_array_length (argtopriv); j++)
3649 if (argtopriv[j].argval == arg[i]) 3739 if (argtopriv[j].argval == arg[i])
3650 { 3740 {
3651 state = privcases (mode, argtopriv[j].bit); 3741 state = privcases (mode, argtopriv[j].bit);
3652 break; 3742 break;
3653 } 3743 }
… …
3661 3751
3662 scr_touch (true); 3752 scr_touch (true);
3663 break; 3753 break;
3664#endif 3754#endif
3665 case 1048: /* alternative cursor save */ 3755 case 1048: /* alternative cursor save */
3666 case 1049:
3667 if (option (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 3757 if (mode == 0)
3669 scr_cursor (RESTORE); 3758 scr_cursor (RESTORE);
3670 else if (mode == 1) 3759 else if (mode == 1)
3671 scr_cursor (SAVE); 3760 scr_cursor (SAVE);
… …
3680 case 2: /* VT52 mode */ 3769 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3770 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3771 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3772 * within VT52 mode
3684 */ 3773 */
3685 PrivMode (1, PrivMode_vt52); 3774 priv_modes |= PrivMode_vt52;
3686 break; 3775 break;
3687 case 3: /* 80/132 */ 3776 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3777 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * fwidth), height); 3778 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3779 break;
3691 case 4: /* smooth scrolling */ 3780 case 4: /* smooth scrolling */
3692 set_option (Opt_jumpScroll, !state); 3781 set_option (Opt_jumpScroll, !state);
3693 break; 3782 break;
3694 case 5: /* reverse video */ 3783 case 5: /* reverse video */
… …
3701 scr_autowrap (state); 3790 scr_autowrap (state);
3702 break; 3791 break;
3703 /* case 8: - auto repeat, can't do on a per window basis */ 3792 /* case 8: - auto repeat, can't do on a per window basis */
3704 case 9: /* X10 mouse reporting */ 3793 case 9: /* X10 mouse reporting */
3705 if (state) /* orthogonal */ 3794 if (state) /* orthogonal */
3706 priv_modes &= ~PrivMode_MouseX11; 3795 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3796 break;
3708#ifdef scrollBar_esc 3797#ifdef scrollBar_esc
3709 case scrollBar_esc: 3798 case scrollBar_esc:
3710 if (scrollbar_mapping (state)) 3799 scrollBar.map (state);
3711 {
3712 resize_all_windows (0, 0, 0); 3800 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3801 scr_touch (true);
3714 } 3802 break;
3803#endif
3804#ifdef CURSOR_BLINK
3805 case 12:
3806 cursor_blink_reset ();
3715 break; 3807 break;
3716#endif 3808#endif
3717 case 25: /* visible/invisible cursor */ 3809 case 25: /* visible/invisible cursor */
3718 scr_cursor_visible (state); 3810 scr_cursor_visible (state);
3719 break; 3811 break;
… …
3724 break; 3816 break;
3725 /* case 66: - application key pad */ 3817 /* case 66: - application key pad */
3726 /* case 67: - backspace key */ 3818 /* case 67: - backspace key */
3727 case 1000: /* X11 mouse reporting */ 3819 case 1000: /* X11 mouse reporting */
3728 if (state) /* orthogonal */ 3820 if (state) /* orthogonal */
3729 priv_modes &= ~PrivMode_MouseX10; 3821 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3730 break; 3822 break;
3731#if 0
3732 case 1001: 3823 case 1002:
3733 break; /* X11 mouse highlighting */ 3824 case 1003:
3734#endif 3825 if (state)
3826 {
3827 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3828 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3829 mouse_row = mouse_col = 0;
3830 vt_emask_mouse = PointerMotionMask;
3831 }
3832 else
3833 vt_emask_mouse = NoEventMask;
3834
3835 vt_select_input ();
3836 break;
3735 case 1010: /* scroll to bottom on TTY output inhibit */ 3837 case 1010: /* scroll to bottom on TTY output inhibit */
3736 set_option (Opt_scrollTtyOutput, !state); 3838 set_option (Opt_scrollTtyOutput, !state);
3737 break; 3839 break;
3738 case 1011: /* scroll to bottom on key press */ 3840 case 1011: /* scroll to bottom on key press */
3739 set_option (Opt_scrollTtyKeypress, state); 3841 set_option (Opt_scrollTtyKeypress, state);
3740 break; 3842 break;
3741 case 1047: /* secondary screen w/ clearing last */ 3843 case 1047: /* secondary screen w/ clearing last */
3742 if (option (Opt_secondaryScreen)) 3844 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3845 if (!state)
3744 scr_erase_screen (2); 3846 scr_erase_screen (2);
3847
3745 scr_change_screen (state); 3848 scr_change_screen (state);
3746 break; 3849 break;
3747 case 1049: /* secondary screen w/ clearing first */ 3850 case 1049: /* secondary screen w/ clearing first */
3851 if (option (Opt_secondaryScreen))
3852 if (state)
3853 scr_cursor (SAVE);
3854
3748 scr_change_screen (state); 3855 scr_change_screen (state);
3856
3749 if (option (Opt_secondaryScreen)) 3857 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 3858 if (state)
3751 scr_erase_screen (2); 3859 scr_erase_screen (2);
3860 else
3861 scr_cursor (RESTORE);
3752 break; 3862 break;
3753 default: 3863 default:
3754 break; 3864 break;
3755 } 3865 }
3756 } 3866 }
3757} 3867}
3758/*}}} */ 3868/*}}} */
3759 3869
3760/*{{{ process sgr sequences */ 3870/*{{{ process sgr sequences */
3761void 3871void ecb_hot
3762rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3872rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3763{ 3873{
3764 unsigned int i; 3874 unsigned int i;
3765 short rendset; 3875 short rendset;
3766 int rendstyle; 3876 int rendstyle;
… …
3907 break; 4017 break;
3908#endif 4018#endif
3909 } 4019 }
3910 } 4020 }
3911} 4021}
4022
4023void
4024rxvt_term::set_cursor_style (int style)
4025{
4026 if (!IN_RANGE_INC (style, 0, 6))
4027 return;
4028
4029 if (style == 0)
4030 style = 1;
4031
4032 cursor_type = (style - 1) / 2;
4033 set_option (Opt_cursorUnderline, cursor_type == 1);
4034
4035#ifdef CURSOR_BLINK
4036 set_option (Opt_cursorBlink, style & 1);
4037 cursor_blink_reset ();
4038#endif
4039
4040 want_refresh = 1;
4041}
3912/*}}} */ 4042/*}}} */
3913 4043
3914/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3915void
3916rxvt_term::process_graphics ()
3917{
3918 unicode_t ch, cmd = cmd_getc ();
3919
3920 if (cmd == 'Q')
3921 { /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */
3923 return;
3924 }
3925 /* swallow other graphics sequences until terminating ':' */
3926 do
3927 ch = cmd_getc ();
3928 while (ch != ':');
3929}
3930/*}}} */
3931
3932/* ------------------------------------------------------------------------- */ 4044/* ---------------------------------------------------------------------- */
4045/* Write data to the pty as typed by the user, pasted with the mouse,
4046 * or generated by us in response to a query ESC sequence.
4047 */
3933 4048
3934/* 4049/*
3935 * Send printf () formatted output to the command. 4050 * Send printf () formatted output to the command.
3936 * Only use for small amounts of data. 4051 * Only use for small amounts of data.
3937 */ 4052 */
… …
3945 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4060 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3946 va_end (arg_ptr); 4061 va_end (arg_ptr);
3947 tt_write (buf, strlen (buf)); 4062 tt_write (buf, strlen (buf));
3948} 4063}
3949 4064
3950/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 4065/* Write data to the pty as typed by the user. */
3952 * or generated by us in response to a query ESC sequence. 4066void
3953 */ 4067rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4068{
4069 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4070 return;
4071
4072 if (option (Opt_scrollTtyKeypress))
4073 if (view_start)
4074 {
4075 view_start = 0;
4076 want_refresh = 1;
4077 }
4078
4079 tt_write_ (data, len);
4080}
3955 4081
3956void 4082void
3957rxvt_term::tt_write (const char *data, unsigned int len) 4083rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 4084{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4085 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3960 return; 4086 return;
3961 4087
4088 tt_write_ (data, len);
4089}
4090
4091static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4092
4093void
4094rxvt_term::tt_write_ (const char *data, unsigned int len)
4095{
3962 if (pty->pty < 0) 4096 if (pty->pty < 0)
3963 return; 4097 return;
3964 4098
3965 if (v_buflen == 0) 4099 if (v_buflen == 0)
3966 { 4100 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4101 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968 4102
4103 max_it (written, 0);
4104
3969 if ((unsigned int)written == len) 4105 if (written == len)
3970 return; 4106 return;
3971 4107
3972 data += written; 4108 data += written;
3973 len -= written; 4109 len -= written;
3974 } 4110 }
3975 4111
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4112 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 4113
3978 memcpy (v_buffer + v_buflen, data, len); 4114 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4115 v_buflen += len;
3980 4116
3981 pty_ev.set (EVENT_READ | EVENT_WRITE); 4117 pty_ev.set (ev::READ | ev::WRITE);
3982} 4118}
3983 4119
3984void rxvt_term::pty_write () 4120void rxvt_term::pty_write ()
3985{ 4121{
3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4122 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3992 if (v_buflen == 0) 4128 if (v_buflen == 0)
3993 { 4129 {
3994 free (v_buffer); 4130 free (v_buffer);
3995 v_buffer = 0; 4131 v_buffer = 0;
3996 4132
3997 pty_ev.set (EVENT_READ); 4133 pty_ev.set (ev::READ);
3998 return; 4134 return;
3999 } 4135 }
4000 4136
4001 memmove (v_buffer, v_buffer + written, v_buflen); 4137 memmove (v_buffer, v_buffer + written, v_buflen);
4002 } 4138 }
4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4139 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4004 pty_ev.set (EVENT_READ); 4140 pty_ev.set (ev::READ);
4005} 4141}
4006 4142
4007/*----------------------- end-of-file (C source) -----------------------*/ 4143/*----------------------- end-of-file (C source) -----------------------*/
4008 4144

Diff Legend

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