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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.575 by root, Thu Jun 30 16:56:41 2016 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,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
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)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 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",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 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);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 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
304rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
305{ 409{
306 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
307 unsigned int newlen; 411 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
311 414
312#if ISO_14755 415#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
314 return; 417 return;
315#endif 418#endif
… …
322 */ 425 */
323 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
326 429
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 430 kbuf[0] = 0;
334 431
335#ifdef USE_XIM 432#if USE_XIM
336 if (Input_Context) 433 if (Input_Context)
337 { 434 {
338 Status status_return; 435 Status status_return;
339 436
340#if 0 437#if 0
… …
378 } 475 }
379 } 476 }
380 else 477 else
381 len = 0; 478 len = 0;
382 } 479 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 480 }
387 else 481 else
388#endif 482#endif
389 { 483 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
392 } 488 {
489 KeySym orig_keysym = keysym;
393 490
394 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)
395 { 704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
458 769
459 if (shft) 770 if (shft)
460 { 771 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 773 {
469 switch (keysym) 774 switch (keysym)
470 { 775 {
471 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 778 selection_request (ev.time);
474 return; 779 return;
475#if TODO 780#if TODO
476 /* rxvt extras */ 781 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 783 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 785 return;
483#endif 786#endif
484 } 787 }
485 } 788 }
486 } 789 }
487 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
488#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 807 // ISO 14755 support
490 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 809 {
492 int hv; 810 int hv;
493 811
494 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 837# endif
520 return; 838 return;
521 } 839 }
522 else 840 else
523 { 841 {
524# if ENABLE_OVERLAY 842# if ISO_14755
525 scr_overlay_off (); 843 scr_overlay_off ();
526# endif 844# endif
527 iso14755buf = 0; 845 iso14755buf = 0;
528 } 846 }
529 } 847 }
848 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
533 { 852 {
534 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 854# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 856 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 857# endif
539 } 858 }
540#endif 859#endif
… …
544 { 863 {
545 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
546 return; 865 return;
547 } 866 }
548#endif 867#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
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, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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
… …
934#if ENABLE_FRILLS || ISO_14755 885#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 886 // ISO 14755 support
936 if (iso14755buf) 887 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 888 if (iso14755buf & ISO_14755_52)
938 { 889 {
939# if ENABLE_OVERLAY 890# if ISO_14755
940 scr_overlay_off (); 891 scr_overlay_off ();
941# endif 892# endif
942# if ISO_14755 893# if ISO_14755
943 // iso14755 part 5.2 handling: release time 894 // iso14755 part 5.2 handling: release time
944 // first: controls 895 // first: controls
… …
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
… …
967 918
968 return; 919 return;
969 } 920 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 921 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 922 {
972# if ENABLE_OVERLAY 923# if ISO_14755
973 scr_overlay_off (); 924 scr_overlay_off ();
974# endif 925# endif
975 if (iso14755buf & ISO_14755_51) 926 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 927 commit_iso14755 ();
977#if ISO_14755 928#if ISO_14755
… …
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 ();
1039 957
1040#ifdef TRANSPARENT 958#ifdef HAVE_IMG
1041 if (want_full_refresh) 959 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 960 {
1043 want_full_refresh = 0; 961 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 962 scr_touch (false);
1046 } 963 }
1047#endif 964#endif
1048 965
1049 if (want_refresh) 966 if (want_refresh)
… …
1085 } 1002 }
1086 while (row < end_row); 1003 while (row < end_row);
1087 } 1004 }
1088 1005
1089 scr_refresh (); 1006 scr_refresh ();
1090 scrollbar_show (1); 1007 scrollBar.show (1);
1091#ifdef USE_XIM 1008#if USE_XIM
1092 IMSendSpot (); 1009 im_send_spot ();
1093#endif 1010#endif
1094 } 1011 }
1095 1012
1096 display->flush (); 1013 display->flush ();
1097} 1014}
1098 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1099void 1017void
1100rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1019{
1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1022
1023 display->flush ();
1024}
1025
1026void
1027rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1028{
1102 make_current (); 1029 make_current ();
1103 1030
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1031 refresh_count = 0;
1117 flush (); 1032 flush ();
1118} 1033}
1119 1034
1120#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1121void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1056{
1124 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1058 want_refresh = 1;
1126 1059 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1060}
1129#endif 1061#endif
1130 1062
1131#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1132void 1064void
1133rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1066{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1068 {
1137 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1138 want_refresh = 1; 1070 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1140 } 1072 }
1073 else
1074 w.stop ();
1141} 1075}
1142#endif 1076#endif
1143 1077
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1079void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1081{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1150 { 1084 {
1151 want_refresh = 1; 1085 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1153 } 1087 }
1088 else
1089 w.stop ();
1154} 1090}
1155#endif 1091#endif
1156 1092
1157#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1158void 1094void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1096{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1162 { 1098 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1100 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1166 } 1102 }
1103 else
1104 w.stop ();
1167} 1105}
1168#endif 1106#endif
1169 1107
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1109void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1111{
1174 if (mouse_slip_wheel_speed == 0 1112 if (scr_page (mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1113 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1114 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1183 } 1122 }
1184} 1123}
1185#endif 1124#endif
1186 1125
1187#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1188static struct event_handler 1127static struct event_handler
1189{ 1128{
1190 check_watcher yield_ev; 1129 ev::prepare yield_ev;
1191 1130
1192 void yield_cb (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1193 { 1132 {
1194 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1198 1140
1199 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1201 1143
1202 w.stop (); 1144 w.stop ();
1203 } 1145 }
1204 1146
… …
1207 { 1149 {
1208 } 1150 }
1209} event_handler; 1151} event_handler;
1210#endif 1152#endif
1211 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1212bool 1187bool
1213rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1214{ 1189{
1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1216 1191
1217 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1218 { 1193
1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1220 n = 0;
1221 } 1195 {
1222 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1224 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1225 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1226 1201
1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1228 1203
1229 if (r > 0) 1204 if (r > 0)
1230 { 1205 {
1231 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1232 return true; 1207 return true;
… …
1248 1223
1249 return false; 1224 return false;
1250} 1225}
1251 1226
1252void 1227void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1228rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1229{
1255 make_current (); 1230 make_current ();
1256 1231
1257 if (revents & EVENT_READ) 1232 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1235 cmd_parse ();
1261 break;
1262 1236
1263 if (revents & EVENT_WRITE) 1237 if (revents & ev::WRITE)
1264 pty_write (); 1238 pty_write ();
1265}
1266 1239
1267void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1268rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1269{ 1245{
1270 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1271 recolour_cursor (); 1247 recolor_cursor ();
1272 1248
1273#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1250 hidden_pointer = 0;
1275 1251
1276 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1278#endif 1254#endif
1279} 1255}
1280 1256
1281#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1282void 1258void ecb_cold
1283rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1284{ 1260{
1285 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1286 return; 1262 return;
1287 1263
… …
1289 XFlush (dpy); 1265 XFlush (dpy);
1290 1266
1291 hidden_pointer = 1; 1267 hidden_pointer = 1;
1292} 1268}
1293 1269
1294void 1270void ecb_cold
1295rxvt_term::pointer_cb (time_watcher &w) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1272{
1297 make_current (); 1273 make_current ();
1298 1274
1299 pointer_blank (); 1275 pointer_blank ();
1300} 1276}
… …
1303void 1279void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1281{
1306 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1307 int x, y; 1283 int x, y;
1284 int code = 32;
1308 1285
1309 x = ev.x; 1286 x = Pixel2Col (ev.x) + 1;
1310 y = ev.y; 1287 y = Pixel2Row (ev.y) + 1;
1311 pixel_position (&x, &y); 1288
1289 if (ev.type == MotionNotify)
1290 {
1291 if (x == mouse_row && y == mouse_col)
1292 return;
1293
1294 mouse_row = x;
1295 mouse_col = y;
1296 code += 32;
1297 }
1312 1298
1313 if (MEvent.button == AnyButton) 1299 if (MEvent.button == AnyButton)
1314 button_number = 3; 1300 button_number = 3;
1315 else 1301 else
1316 { 1302 {
1317 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1318 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1319 if (button_number >= 3) 1305 if (button_number >= 3)
1320 button_number += (64 - 3); 1306 button_number += 64 - 3;
1321 } 1307 }
1322 1308
1323 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1324 { 1310 {
1325 /* 1311 /*
… …
1357 fputc ('A', stderr); 1343 fputc ('A', stderr);
1358 if (key_state & 32) 1344 if (key_state & 32)
1359 fputc ('2', stderr); 1345 fputc ('2', stderr);
1360 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1361 button_number, 1347 button_number,
1362 x + 1, 1348 x,
1363 y + 1); 1349 y);
1364#endif 1350#endif
1365 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1366 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1366 code + button_number + key_state,
1368 (32 + x + 1), 1367 32 + x,
1369 (32 + y + 1)); 1368 32 + y);
1370} 1369}
1371 1370
1372/*{{{ process an X event */ 1371/*{{{ process an X event */
1373void 1372void ecb_hot
1374rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1375{ 1374{
1376 make_current (); 1375 make_current ();
1377 1376
1378 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1434 focus_out ();
1436 } 1435 }
1437#endif 1436#endif
1438 } 1437 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1438 break;
1444 1439
1445 /* 1440 /*
1446 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1476 focus_out ();
1482 break; 1477 break;
1483 1478
1484 case ConfigureNotify: 1479 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1486 { 1481 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1489 1517
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1519 {
1492 seen_resize = 1; 1520 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1522 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1502 1530
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1532 }
1510 break; 1533 break;
1511 1534
1512 case PropertyNotify: 1535 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517
1518 break; 1537 break;
1519 1538
1520 case SelectionClear: 1539 case SelectionClear:
1521 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break;
1523
1524 case SelectionNotify:
1525 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1527 break; 1541 break;
1528 1542
1529 case SelectionRequest: 1543 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1531 break; 1545 break;
1532 1546
1533 case MapNotify: 1547 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1534 mapped = 1; 1559 mapped = 1;
1535#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1561 text_blink_ev.start ();
1537#endif 1562#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1564 break;
1540 1565
1541 case UnmapNotify: 1566 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1568#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1569 text_blink_ev.stop ();
1545#endif 1570#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1571 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1572 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1573
1555 case GraphicsExpose: 1574 case GraphicsExpose:
1556 case Expose: 1575 case Expose:
1557 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1558 { 1577 {
1559 do 1578 do
1579 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1582 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1584
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1586
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1588 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1591 }
1569 1592
1570 want_refresh = 1; 1593 want_refresh = 1;
1571 } 1594 }
1572 else 1595 else
1573 { 1596 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1600 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1602 ;
1580 1603
1581 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1605 {
1583 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1584 scrollbar_show (0); 1607 scrollBar.show (0);
1585 } 1608 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1609 }
1592 break; 1610 break;
1593 1611
1594 case MotionNotify: 1612 case MotionNotify:
1595#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1614 if (hidden_pointer)
1597 pointer_unblank (); 1615 pointer_unblank ();
1598#endif 1616#endif
1617 if (!bypass_keystate
1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1619 || priv_modes & PrivMode_MouseAnyEvent))
1620 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1622 break;
1601 1623
1602 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1603 { 1625 {
… …
1614 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1638 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1618 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1620 { 1643 {
1621#endif
1622#if ISO_14755 1644#if ISO_14755
1623 // 5.4 1645 // 5.4
1624 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1625 { 1647 {
1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1632 1654
1633#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1634 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1635 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1636 { 1658 {
1659 page_dirn scroll_selection_dir;
1637 int dist; 1660 int dist;
1638 1661
1639 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1641 */ 1664 */
1642 if (!sel_scroll_ev.active) 1665 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1666 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1667
1645 /* save the event params so we can highlight 1668 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1669 * the selection in the pending-scroll loop
1647 */ 1670 */
1648 selection_save_x = ev.xbutton.x; 1671 selection_save_x = ev.xbutton.x;
… …
1656 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1657 } 1680 }
1658 else 1681 else
1659 { 1682 {
1660 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1661 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1662 } 1685 }
1663 1686
1664 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1665 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1; 1689 + 1;
1667 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1668 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1669 } 1693 }
1670 else 1694 else
1671 { 1695 {
1672 /* we are within the text window, so we 1696 /* we are within the text window, so we
1673 * shouldn't be scrolling 1697 * shouldn't be scrolling
1674 */ 1698 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1677 } 1700 }
1678#endif 1701#endif
1679#ifdef MOUSE_THRESHOLD
1680 } 1702 }
1681#endif
1682 } 1703 }
1683 } 1704 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1706 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1688 ; 1709 ;
1689 1710
1690 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1715 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1717 scrollBar.size ());
1697 want_refresh = 1; 1718 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1719 scrollBar.show (1);
1700 } 1720 }
1701 break; 1721 break;
1702 } 1722 }
1703 1723
1704#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1706 { 1726 cursor_blink_reset ();
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif 1727#endif
1716 1728
1717#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 { 1731 {
… …
1725 1737
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1738 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1739 pointer_blank ();
1728 } 1740 }
1729#endif 1741#endif
1730}
1731 1742
1732void 1743 refresh_check ();
1744}
1745
1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1733rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1734{ 1765{
1735 if (!focus) 1766 if (!focus)
1736 { 1767 {
1737 focus = 1; 1768 focus = 1;
1738 want_refresh = 1; 1769 want_refresh = 1;
1739 1770
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1771#if USE_XIM
1743 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1744 { 1773 {
1745 IMSetPosition (); 1774 im_set_position ();
1746 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1747 } 1776 }
1748#endif 1777#endif
1749#if CURSOR_BLINK 1778#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1780 cursor_blink_ev.again ();
1752#endif 1781#endif
1753#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1755 { 1784 {
1756 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1786 scr_recolor ();
1758 } 1787 }
1759#endif 1788#endif
1760#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1762 { 1791 set_urgency (0);
1763 XWMHints *h;
1764 1792
1765 h = XGetWMHints(dpy, parent[0]); 1793 if (priv_modes & PrivMode_FocusEvent)
1766 if (h != NULL) 1794 tt_printf ("\x1b[I");
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1795#endif
1773 }
1774}
1775 1796
1776void 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1798 }
1799}
1800
1801void ecb_cold
1777rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1778{ 1803{
1779 if (focus) 1804 if (focus)
1780 { 1805 {
1781 focus = 0; 1806 focus = 0;
1782 want_refresh = 1; 1807 want_refresh = 1;
1783 1808
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1809#if ENABLE_FRILLS
1810 if (option (Opt_urgentOnBell))
1811 set_urgency (0);
1785 1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1815#endif
1786#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1817 if (iso14755buf)
1788 { 1818 {
1789 iso14755buf = 0; 1819 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1820# if ISO_14755
1791 scr_overlay_off (); 1821 scr_overlay_off ();
1792# endif 1822# endif
1793 } 1823 }
1794#endif 1824#endif
1795#if USE_XIM 1825#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1827 XUnsetICFocus (Input_Context);
1798#endif 1828#endif
1799#if CURSOR_BLINK 1829#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1830 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1831 cursor_blink_ev.stop ();
1832
1802 hidden_cursor = 0; 1833 hidden_cursor = 0;
1803#endif 1834#endif
1804#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1806 { 1837 {
1807 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1839 scr_recolor ();
1809 } 1840 }
1810#endif 1841#endif
1811 }
1812}
1813 1842
1814void 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1844 }
1845}
1846
1847void ecb_cold
1815rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1816{ 1849{
1817#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1819 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1820 rgba c; 1856 rgba c;
1821 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1859 }
1824#endif 1860#endif
1825} 1861}
1826 1862
1827#if TRANSPARENT || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1828void 1864void ecb_hot
1829rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1866{
1831 make_current (); 1867 make_current ();
1832 1868
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1871 return;
1836 1872
1837# if TRANSPARENT
1838 switch (ev.type) 1873 switch (ev.type)
1839 { 1874 {
1840 case PropertyNotify: 1875 case PropertyNotify:
1841 /* 1876 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1844 */ 1879 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1882 {
1848 1883#if BG_IMAGE_FROM_ROOT
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent)) 1884 if (option (Opt_transparent))
1852 check_our_parents (); 1885 {
1853 break; 1886 rxvt_img::new_from_root (this)->replace (root_img);
1854 } 1887 update_background ();
1888 }
1855# endif 1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 }
1892
1893 break;
1894 }
1895
1896 refresh_check ();
1856} 1897}
1857#endif 1898#endif
1858 1899
1859void 1900void
1860rxvt_term::button_press (XButtonEvent &ev) 1901rxvt_term::button_press (XButtonEvent &ev)
… …
1881 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1882 return; 1923 return;
1883 } 1924 }
1884#endif 1925#endif
1885 1926
1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1887 1928
1888 if (reportmode) 1929 if (reportmode)
1889 { 1930 {
1890 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1891 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
1892 MEvent.state = ev.state; 1933 MEvent.state = ev.state;
1893#ifdef MOUSE_REPORT_DOUBLECLICK 1934#ifdef MOUSE_REPORT_DOUBLECLICK
1894 if (ev.button == MEvent.button && clickintime) 1935 if (ev.button == MEvent.button && clickintime)
1895 { 1936 {
1896 /* same button, within alloted time */ 1937 /* same button, within allowed time */
1897 MEvent.clicks++; 1938 MEvent.clicks++;
1898 1939
1899 if (MEvent.clicks > 1) 1940 if (MEvent.clicks > 1)
1900 { 1941 {
1901 /* only report double clicks */ 1942 /* only report double clicks */
… …
1915 mouse_report (ev); 1956 mouse_report (ev);
1916 } 1957 }
1917#else 1958#else
1918 MEvent.button = ev.button; 1959 MEvent.button = ev.button;
1919 mouse_report (ev); 1960 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1961#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1962
1922 } 1963 }
1923 else 1964 else
1924 { 1965 {
1925 if (ev.button != MEvent.button) 1966 if (ev.button != MEvent.button)
… …
1973 } 2014 }
1974 2015
1975 /* 2016 /*
1976 * Scrollbar window processing of button press 2017 * Scrollbar window processing of button press
1977 */ 2018 */
1978 if (isScrollbarWindow (ev.window)) 2019 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 2020 {
1980 scrollBar.setIdle (); 2021 page_dirn direction = NO_DIR;
2022
2023 if (scrollBar.upButton (ev.y))
2024 direction = UP; /* up */
2025 else if (scrollBar.dnButton (ev.y))
2026 direction = DN; /* down */
2027
2028 scrollBar.state = SB_STATE_IDLE;
1981 /* 2029 /*
1982 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 2031 * move up if mouse is above slider
1984 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1985 * 2033 *
… …
1994 /* 2042 /*
1995 * Mouse report disabled scrollbar: 2043 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 2044 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 2045 * click on scrollbar - send pageup/down
1998 */ 2046 */
1999 if ((scrollBar.style == R_SB_NEXT 2047 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 2048 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 2049 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 2050 tt_printf ("\033[B");
2009 else 2051 else
2010 switch (ev.button) 2052 switch (ev.button)
2011 { 2053 {
2012 case Button2: 2054 case Button2:
… …
2019 tt_printf ("\033[5~"); 2061 tt_printf ("\033[5~");
2020 break; 2062 break;
2021 } 2063 }
2022 } 2064 }
2023 else 2065 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2066#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2067 {
2031 if (scrollbarnext_upButton (ev.y)) 2068 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2069 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2071 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2073#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2074 if (scr_page (direction, 1))
2049 { 2075 {
2050 if (upordown < 0) 2076 if (direction == UP)
2051 scrollBar.setUp (); 2077 scrollBar.state = SB_STATE_UP;
2052 else 2078 else
2053 scrollBar.setDn (); 2079 scrollBar.state = SB_STATE_DOWN;
2054 } 2080 }
2055 } 2081 }
2056 else 2082 else
2057 switch (ev.button) 2083 switch (ev.button)
2058 { 2084 {
2059 case Button2: 2085 case Button2:
2060 switch (scrollbar_align) 2086 switch (scrollBar.align)
2061 { 2087 {
2062 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2063 csrO = 0; 2089 csrO = 0;
2064 break; 2090 break;
2065 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2066 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2067 break; 2093 break;
2068 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2069 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2070 break; 2096 break;
2071 } 2097 }
2072 2098
2073 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2074 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2077 2103
2078 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2079 break; 2105 break;
2080 2106
2081 case Button1: 2107 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2085 2111
2086 case Button3: 2112 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2088 { 2114 {
2089 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2091 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2092# else 2118# else
2093 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2094# endif 2120# endif
2095 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2096# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2097 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2098# else 2124# else
2099 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2100# endif 2126# endif
2101 else 2127 else
2102 scrollBar.setMotion (); 2128 scrollBar.state = SB_STATE_MOTION;
2103 } 2129 }
2104 else 2130 else
2105 { 2131 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2133 (nrow
2108 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2109 / scrollbar_size ())); 2135 / scrollBar.size ()));
2110 } 2136 }
2111 2137
2112 break; 2138 break;
2113 } 2139 }
2114 } 2140 }
… …
2124 2150
2125 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2152 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2154
2129 if (scrollbar_isUpDn ()) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2130 { 2156 {
2131 scrollBar.setIdle (); 2157 scrollBar.state = SB_STATE_IDLE;
2132 scrollbar_show (0); 2158 scrollBar.show (0);
2133 } 2159 }
2134 2160
2135#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
2138#endif 2163#endif
2139 2164
2140 if (ev.window == vt) 2165 if (ev.window == vt)
2141 { 2166 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2167 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2157#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2158 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2159 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2160 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2161 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2162 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2163 { 2188 {
2164 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2165 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2166 mouse_report (ev); 2191 mouse_report (ev);
2167 } 2192 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2193#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2194 MEvent.button = AnyButton;
2170 mouse_report (ev); 2195 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2196#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2197 return;
2173 } 2198 }
2174 2199
2175 /* 2200 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2201 * dumb hack to compensate for the failure of click-and-drag
… …
2187 case Button3: 2212 case Button3:
2188 selection_make (ev.time); 2213 selection_make (ev.time);
2189 break; 2214 break;
2190 2215
2191 case Button2: 2216 case Button2:
2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2219 break;
2195 2220
2196#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2197 case Button4: 2222 case Button4:
2198 case Button5: 2223 case Button5:
2199 { 2224 {
2200 int i; 2225 int lines;
2201 page_dirn v; 2226 page_dirn dirn;
2202 2227
2203 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2204 2229
2205 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2206 i = 1; 2231 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2233 lines = nrow - 1;
2209 else 2234 else
2210 i = 5; 2235 lines = 5;
2211 2236
2212# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2214 { 2239 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2242
2219 if (slip_wheel_ev.at < NOW) 2243 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2245 }
2224 else 2246 else
2247# endif
2225 { 2248 {
2226# endif
2227 scr_page (v, i); 2249 scr_page (dirn, lines);
2228 scrollbar_show (1); 2250 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2251 }
2231# endif
2232 } 2252 }
2233 break; 2253 break;
2234#endif 2254#endif
2235 } 2255 }
2236 } 2256 }
2237} 2257}
2238 2258
2239/*}}} */ 2259/*}}} */
2240 2260
2241bool 2261void ecb_hot
2242rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2243{ 2263{
2244 bool flag = false;
2245 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2246 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2247 2266
2248 for (;;) 2267 for (;;)
2249 { 2268 {
2250 if (ch == NOCHAR) 2269 if (ecb_unlikely (ch == NOCHAR))
2251 { 2270 {
2252 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2253 ch = next_char (); 2272 ch = next_char ();
2254 2273
2255 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2256 break; 2275 break;
2257 } 2276 }
2258 2277
2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2260 { 2279 {
2261 if (!seen_input) 2280 if (ecb_unlikely (!seen_input))
2262 { 2281 {
2263 seen_input = 1; 2282 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2279 wchar_t *str = buf; 2298 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2281 2300
2282 for (;;) 2301 for (;;)
2283 { 2302 {
2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2285 break; 2304 break;
2286 2305
2287 *str++ = ch; 2306 *str++ = ch;
2288 2307
2289 if (ch == C0_LF || str >= eol) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2290 { 2309 {
2291 if (ch == C0_LF) 2310 if (ch == C0_LF)
2292 nlines++; 2311 nlines++;
2293 2312
2294 refresh_count++; 2313 refresh_count++;
2295 2314
2296 if (!option (Opt_jumpScroll) 2315 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2316 {
2299 refreshnow = true;
2300 refresh_count = 0; 2317 refresh_count = 0;
2318
2319 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2320 {
2321 refreshnow = true;
2301 ch = NOCHAR; 2322 ch = NOCHAR;
2302 break; 2323 break;
2324 }
2303 } 2325 }
2304 2326
2305 // scr_add_lines only works for nlines <= nrow - 1. 2327 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2328 if (nlines >= nrow - 1)
2307 { 2329 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2357 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2358 scr_add_lines (buf, str - buf, nlines);
2337 2359
2338 /* 2360 /*
2339 * If there have been a lot of new lines, then update the screen 2361 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2362 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2363 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2364 */
2344 if (refreshnow) 2365 if (refreshnow)
2345 { 2366 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2367 scr_refresh ();
2353 want_refresh = 1; 2368 want_refresh = 1;
2354 }
2355 } 2369 }
2356
2357 } 2370 }
2358 else 2371 else
2359 { 2372 {
2360 try 2373 try
2361 { 2374 {
… …
2369 } 2382 }
2370 2383
2371 ch = NOCHAR; 2384 ch = NOCHAR;
2372 } 2385 }
2373 } 2386 }
2374
2375 return flag;
2376} 2387}
2377 2388
2378// read the next character 2389// read the next character
2379wchar_t 2390wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2381{ 2392{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2394 {
2384 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2387 2398
2388 wchar_t wc; 2399 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2401
… …
2394 cmdbuf_ptr = cmdbuf_endp; 2405 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2406 break;
2396 } 2407 }
2397 2408
2398 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2410 {
2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2415 }
2400 2416
2401 // assume wchar == unicode 2417 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2403 return wc & UNICODE_MASK; 2419 return wc & UNICODE_MASK;
2404 } 2420 }
2405 2421
2406 return NOCHAR; 2422 return NOCHAR;
2407} 2423}
2408 2424
2409// read the next octet 2425// read the next octet
2410uint32_t 2426uint32_t ecb_hot
2411rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2412{ 2428{
2413 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR; 2431 : NOCHAR;
2416} 2432}
2417 2433
2418static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2419 2435
2420/* rxvt_cmd_getc () - Return next input character */ 2436wchar_t ecb_hot
2421/*
2422 * Return the next input character after first passing any keyboard input
2423 * to the command.
2424 */
2425wchar_t
2426rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2427{ 2438{
2428 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2429 2440
2430 if (c == NOCHAR) 2441 if (c == NOCHAR)
2431 throw out_of_input; 2442 throw out_of_input;
2432 2443
2433 return c; 2444 return c;
2434} 2445}
2435 2446
2436uint32_t 2447uint32_t ecb_hot
2437rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2438{ 2449{
2439 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2440 2451
2441 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2445} 2456}
2446 2457
2447/*{{{ print pipe */ 2458/*{{{ print pipe */
2448/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2449#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2450FILE * 2461FILE * ecb_cold
2451rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2452{ 2463{
2453 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2454 2465
2455 if (stream == NULL) 2466 if (stream == NULL)
2456 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2457 2468
2458 return stream; 2469 return stream;
2459} 2470}
2460 2471
2461int 2472int ecb_cold
2462rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2463{ 2474{
2464 fflush (stream); 2475 fflush (stream);
2465 return pclose (stream); 2476 return pclose (stream);
2466} 2477}
2467 2478
2468/* 2479/*
2469 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2470 */ 2481 */
2471void 2482void ecb_cold
2472rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2473{ 2484{
2474 int done; 2485 FILE *fd = popen_printer ();
2475 FILE *fd;
2476 2486
2477 if ((fd = popen_printer ()) == NULL) 2487 if (!fd)
2478 return; 2488 return;
2479 2489
2480 /* 2490 /*
2481 * Send all input to the printer until either ESC[4i or ESC[?4i 2491 * Send all input to the printer until either ESC[4i or ESC[?4i
2482 * is received. 2492 * is received.
2483 */ 2493 */
2484 for (done = 0; !done;) 2494 for (int done = 0; !done; )
2485 { 2495 {
2486 unsigned char buf[8]; 2496 unsigned char buf[8];
2487 unicode_t ch; 2497 unicode_t ch;
2488 unsigned int i, len; 2498 unsigned int i, len;
2489 2499
… …
2520 } 2530 }
2521 } 2531 }
2522 2532
2523 pclose_printer (fd); 2533 pclose_printer (fd);
2524} 2534}
2525#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2526/*}}} */ 2536/*}}} */
2527 2537
2528/* *INDENT-OFF* */
2529enum { 2538enum {
2530 C1_40 = 0x40, 2539 C1_40 = 0x40,
2531 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2532 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2533 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2535}; 2544};
2536/* *INDENT-ON* */
2537 2545
2538/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2539void 2547void ecb_hot
2540rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2541{ 2549{
2542 switch (ch) 2550 switch (ch)
2543 { 2551 {
2544 case C0_ESC: 2552 case C0_ESC:
… …
2574 scr_charset_choose (0); 2582 scr_charset_choose (0);
2575 break; 2583 break;
2576 2584
2577#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2578 // 8-bit controls 2586 // 8-bit controls
2579 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2580 process_dcs_seq (); 2588 process_dcs_seq ();
2581 break; 2589 break;
2582 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2583 process_csi_seq (); 2591 process_csi_seq ();
2584 break; 2592 break;
2585 case 0x9d: /* CSI */ 2593 case 0x9d: /* OSC */
2586 process_osc_seq (); 2594 process_osc_seq ();
2587 break; 2595 break;
2588#endif 2596#endif
2589 } 2597 }
2590} 2598}
2591/*}}} */ 2599/*}}} */
2592 2600
2593 2601
2594/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2595void 2603void ecb_cold
2596rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2597{ 2605{
2598 int row, col; 2606 int row, col;
2599 2607
2600 switch (ch) 2608 switch (ch)
… …
2634 break; 2642 break;
2635 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2637 break; 2645 break;
2638 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2639 PrivMode (0, PrivMode_vt52); 2647 priv_modes &= ~PrivMode_vt52;
2640 break; 2648 break;
2641 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2642 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2643 /* unimplemented */ 2651 /* unimplemented */
2644 break; 2652 break;
… …
2650} 2658}
2651/*}}} */ 2659/*}}} */
2652 2660
2653 2661
2654/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2655void 2663void ecb_hot
2656rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2657{ 2665{
2658 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2659 2667
2660 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2663 return; 2671 return;
2664 } 2672 }
2665 2673
2666 switch (ch) 2674 switch (ch)
2667 { 2675 {
2668 /* case 1: do_tek_mode (); break; */
2669 case '#': 2676 case '#':
2670 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2671 scr_E (); 2678 scr_E ();
2672 break; 2679 break;
2673 case '(': 2680 case '(':
… …
2696#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2697 case '9': 2704 case '9':
2698 scr_forwardindex (); 2705 scr_forwardindex ();
2699 break; 2706 break;
2700#endif 2707#endif
2708 // DECPAM/DECPNM
2701 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2702 case '>': 2712 case '>':
2703 PrivMode ((ch == '='), PrivMode_aplKP); 2713 priv_modes &= ~PrivMode_aplKP;
2704 break; 2714 break;
2705 2715
2706 case C1_40: 2716 case C1_40:
2707 cmd_getc (); 2717 cmd_getc ();
2708 break; 2718 break;
… …
2712 2722
2713 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2714 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2715 { 2725 {
2716 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2718 } 2728 }
2719 break; 2729 break;
2720 2730
2721 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2722 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
2723 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2724 break; 2736 break;
2725 2737
2726 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
2727 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
2728 scr_set_tab (1); 2740 scr_set_tab (1);
… …
2732 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2733 scr_index (DN); 2745 scr_index (DN);
2734 break; 2746 break;
2735 2747
2736 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2737 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2738 2750
2739 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2740 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2741 2753
2742 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2743 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2744 process_dcs_seq (); 2756 process_dcs_seq ();
2745 break; 2757 break;
… …
2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2759 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2748 case C1_SCI: /* ESC Z */ 2760 case C1_SCI: /* ESC Z */
2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2761 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2750 break; /* steal obsolete ESC [ c */ 2762 break; /* steal obsolete ESC [ c */
2751 2763
2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2764 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2753 case C1_CSI: /* ESC [ */ 2765 case C1_CSI: /* ESC [ */
2754 process_csi_seq (); 2766 process_csi_seq ();
2755 break; 2767 break;
2756 2768
2757 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2769 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2758 case C1_OSC: /* ESC ] */ 2770 case C1_OSC: /* ESC ] */
2759 process_osc_seq (); 2771 process_osc_seq ();
2760 break; 2772 break;
2761 2773
2762 /* 8.3.106: RESET TO INITIAL STATE */ 2774 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2763 case 'c': 2775 case 'c':
2764 mbstate.reset (); 2776 mbstate.reset ();
2765 scr_poweron (); 2777 scr_poweron ();
2766 scrollbar_show (1); 2778 scrollBar.show (1);
2767 break; 2779 break;
2768 2780
2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2781 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2770 case 'n': 2782 case 'n':
2771 scr_charset_choose (2); 2783 scr_charset_choose (2);
… …
2778 } 2790 }
2779} 2791}
2780/*}}} */ 2792/*}}} */
2781 2793
2782/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2783/* *INDENT-OFF* */
2784enum { 2795enum {
2785 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2802 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2803 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2794}; 2805};
2795 2806
2796#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2799#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
2800 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2801 2812
2802const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
2803 { 2814 {
2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2816 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2817 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2818 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2812 }; 2823 };
2813/* *INDENT-ON* */
2814 2824
2815void 2825void ecb_hot
2816rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2817{ 2827{
2818 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2819 unsigned int nargs, p; 2829 unsigned int nargs, p;
2820 int n, ndef; 2830 int n, ndef;
2821 int arg[ESC_ARGS]; 2831 int arg[ESC_ARGS] = { };
2822 2832
2823 for (nargs = ESC_ARGS; nargs > 0;) 2833 nargs = 0;
2824 arg[--nargs] = 0;
2825 2834
2826 priv = 0; 2835 priv = 0;
2827 ch = cmd_getc (); 2836 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2837 if ((ch >= '<' && ch <= '?') || ch == '!')
2838 {
2829 { /* '<' '=' '>' '?' */ 2839 /* '<' '=' '>' '?' '!' */
2830 priv = ch; 2840 priv = ch;
2831 ch = cmd_getc (); 2841 ch = cmd_getc ();
2832 } 2842 }
2833 2843
2844 prev_ch = 0;
2834 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2835 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2836 { 2847 {
2837 if (isdigit (ch)) 2848 if (isdigit (ch))
2838 { 2849 {
… …
2848 n = -1; 2859 n = -1;
2849 } 2860 }
2850 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2851 process_nonprinting (ch); 2862 process_nonprinting (ch);
2852 2863
2864 prev_ch = ch;
2853 ch = cmd_getc (); 2865 ch = cmd_getc ();
2854 } 2866 }
2855 2867
2856 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2857 return; 2869 return;
… …
2873 switch (priv) 2885 switch (priv)
2874 { 2886 {
2875 case '>': 2887 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2888 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2889 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2890 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2891 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2892 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2893 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2894 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2895 // versions.
2884 // 2896 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2897 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2898 }
2887 break; 2899 break;
2900
2888 case '?': 2901 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2903 process_terminal_mode (ch, priv, nargs, arg);
2891 break; 2904 break;
2905
2906 case '!':
2907 if (ch == CSI_70)
2908 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset ();
2911
2912 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2914
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2892 } 2917 }
2918 break;
2919 }
2920
2893 return; 2921 return;
2894 } 2922 }
2895 2923
2896 switch (ch) 2924 switch (ch)
2897 { 2925 {
… …
2911 } 2939 }
2912 break; 2940 break;
2913#endif 2941#endif
2914 2942
2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2917 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2918 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2921 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2922 break; 2950 break;
2923 2951
2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3075 scr_insert_mode (1); 3103 scr_insert_mode (1);
3076 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3077 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3078 break; 3106 break;
3079 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3080 /* 3113 /*
3081 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3082 */ 3115 */
3083 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3084 if (nargs == 1) 3117 if (nargs == 1)
… …
3112 } 3145 }
3113} 3146}
3114/*}}} */ 3147/*}}} */
3115 3148
3116#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3117/* ARGSUSED */
3118void 3150void
3119rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3120{ 3152{
3121 int x, y; 3153 int x, y;
3122 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3131 { 3163 {
3132 /* 3164 /*
3133 * commands 3165 * commands
3134 */ 3166 */
3135 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3136 XMapWindow (dpy, parent[0]); 3168 XMapWindow (dpy, parent);
3137 break; 3169 break;
3138 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3139 XIconifyWindow (dpy, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3140 break; 3172 break;
3141 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3142 XMoveWindow (dpy, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3143 break; 3175 break;
3144 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3146 break; 3178 break;
3147 case 5: /* raise window */ 3179 case 5: /* raise window */
3148 XRaiseWindow (dpy, parent[0]); 3180 XRaiseWindow (dpy, parent);
3149 break; 3181 break;
3150 case 6: /* lower window */ 3182 case 6: /* lower window */
3151 XLowerWindow (dpy, parent[0]); 3183 XLowerWindow (dpy, parent);
3152 break; 3184 break;
3153 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3154 scr_touch (true); 3186 scr_touch (true);
3155 break; 3187 break;
3156 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3159 break; 3191 break;
3160 3192
3161 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3162 default: 3194 default:
3163 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3164 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3165 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3166 break; 3198 break;
3167 3199
3168 /* 3200 /*
3169 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3170 */ 3202 */
3171 case 11: /* report window state */ 3203 case 11: /* report window state */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3174 break; 3206 break;
3175 case 13: /* report window position */ 3207 case 13: /* report window position */
3176 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3177 XTranslateCoordinates (dpy, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3178 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3179 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3180 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3181 break; 3213 break;
3182 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3183 XGetWindowAttributes (dpy, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3185 break; 3217 break;
3186 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3187 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3188 break; 3220 break;
… …
3190 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3191 break; 3223 break;
3192 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3193 { 3225 {
3194 char *s; 3226 char *s;
3195 XGetIconName (dpy, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3197 XFree (s); 3229 XFree (s);
3198 } 3230 }
3199 break; 3231 break;
3200 case 21: /* report window title */ 3232 case 21: /* report window title */
3201 { 3233 {
3202 char *s; 3234 char *s;
3203 XFetchName (dpy, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3205 XFree (s); 3237 XFree (s);
3206 } 3238 }
3207 break; 3239 break;
3208 } 3240 }
… …
3218rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3219{ 3251{
3220 unicode_t ch; 3252 unicode_t ch;
3221 bool seen_esc = false; 3253 bool seen_esc = false;
3222 unsigned int n = 0; 3254 unsigned int n = 0;
3223 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3224 3256
3225 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3226 { 3258 {
3227 if (seen_esc) 3259 if (seen_esc)
3228 { 3260 {
… …
3243 else if (ch < 0x20) 3275 else if (ch < 0x20)
3244 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3245 3277
3246 seen_esc = false; 3278 seen_esc = false;
3247 3279
3248 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3249 // stop at some sane length 3281 // stop at some sane length
3250 return NULL; 3282 return NULL;
3251 3283
3252 string[n++] = ch; 3284 string[n++] = ch;
3253 } 3285 }
… …
3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3296 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3265 */ 3297 */
3266void 3298void
3267rxvt_term::process_dcs_seq () 3299rxvt_term::process_dcs_seq ()
3268{ 3300{
3269 char *s;
3270 unicode_t eh;
3271
3272 /* 3301 /*
3273 * Not handled yet 3302 * Not handled yet
3274 */ 3303 */
3304
3305 unicode_t eh;
3275 s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3276 if (s) 3307 if (s)
3277 free (s); 3308 free (s);
3278 3309
3279 return; 3310 return;
3280} 3311}
… …
3284 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3315 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3285 */ 3316 */
3286void 3317void
3287rxvt_term::process_osc_seq () 3318rxvt_term::process_osc_seq ()
3288{ 3319{
3289 unicode_t ch, eh;
3290 int arg; 3320 int arg;
3291 3321
3292 ch = cmd_getc (); 3322 unicode_t ch = cmd_getc ();
3293 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3323 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3294 arg = arg * 10 + (ch - '0'); 3324 arg = arg * 10 + (ch - '0');
3295 3325
3296 if (ch == ';') 3326 if (ch == ';')
3297 { 3327 {
3328 unicode_t eh;
3298 char *s = get_to_st (eh); 3329 char *s = get_to_st (eh);
3299 3330
3300 if (s) 3331 if (s)
3301 { 3332 {
3302 process_xterm_seq (arg, s, eh); 3333 process_xterm_seq (arg, s, eh);
3303 free (s); 3334 free (s);
3304 } 3335 }
3305 } 3336 }
3306} 3337}
3307 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1));
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1));
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1));
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372
3373 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = {
3376 0, 0, 0,
3377 0, 0, +1,
3378 0, 0, -1,
3379 0, +1, 0,
3380 0, -1, 0,
3381 +1, 0, 0,
3382 -1, 0, 0,
3383 };
3384
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 {
3387 int r = idx_r + dxyz[n][0];
3388 int g = idx_r + dxyz[n][1];
3389 int b = idx_r + dxyz[n][2];
3390
3391 if (!IN_RANGE_EXC (r, 0, Red_levels))
3392 continue;
3393
3394 if (!IN_RANGE_EXC (g, 0, Green_levels))
3395 continue;
3396
3397 if (!IN_RANGE_EXC (b, 0, Blue_levels))
3398 continue;
3399
3400 unsigned int index = colorcube_index (r, g, b);
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3415 idx = index;
3416 }
3417
3418update:
3419 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence;
3421
3422 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3425 update_fade_color (idx, false);
3426
3427 return idx;
3428}
3429
3308void 3430void
3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3431rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3310{ 3432{
3311 if (str[0] == '?' && !str[1]) 3433 if (str[0] == '?' && !str[1])
3312 { 3434 {
3313 rgba c; 3435 rgba c;
3314 pix_colors_focused[color].get (c); 3436 pix_colors_focused[color].get (c);
3315 3437
3316#if XFT 3438#if XFT
3317 if (c.a != rgba::MAX_CC) 3439 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3319 else 3441 else
3320#endif 3442#endif
3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3443 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3322 } 3444 }
3323 else 3445 else
… …
3326 3448
3327/* 3449/*
3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3450 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3329 */ 3451 */
3330void 3452void
3331rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3453rxvt_term::process_xterm_seq (int op, char *str, char resp)
3332{ 3454{
3333 int color; 3455 int color;
3334 char *buf, *name; 3456 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1]; 3457 bool query = str[0] == '?' && !str[1];
3336 int saveop = op; 3458 int saveop = op;
… …
3363 unsigned long bytes_after; 3485 unsigned long bytes_after;
3364 unsigned char *value = 0; 3486 unsigned char *value = 0;
3365 const char *str = ""; 3487 const char *str = "";
3366 3488
3367 if (prop 3489 if (prop
3368 && XGetWindowProperty (dpy, parent[0], 3490 && XGetWindowProperty (dpy, parent,
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3491 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3492 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3493 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3494 && actual_type != None
3373 && actual_format == 8) 3495 && actual_format == 8)
3374 str = (const char *)(value); 3496 str = (const char *)(value);
3375 3497
3376 tt_printf ("\033]%d;%s%c", op, str, resp); 3498 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3377 3499
3378 XFree (value); 3500 XFree (value);
3379 } 3501 }
3380 else 3502 else
3381 { 3503 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3504 char *eq = strchr (str, '=');
3383 3505
3384 if (eq) 3506 if (eq)
3385 { 3507 {
3386 *eq = 0; 3508 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1); 3509 set_utf8_property (display->atom (str), eq + 1);
3388 } 3510 }
3389 else 3511 else
3390 XDeleteProperty (dpy, parent[0], 3512 XDeleteProperty (dpy, parent,
3391 display->atom (str)); 3513 display->atom (str));
3392 } 3514 }
3393 break; 3515 break;
3394 3516
3395 case XTerm_Color: 3517 case XTerm_Color:
… …
3408 *buf++ = '\0'; 3530 *buf++ = '\0';
3409 3531
3410 process_color_seq (op, color, name, resp); 3532 process_color_seq (op, color, name, resp);
3411 } 3533 }
3412 break; 3534 break;
3535 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3536 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3537 process_color_seq (op, Color_fg, str, resp);
3415 break; 3538 break;
3539 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3540 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3541 process_color_seq (op, Color_bg, str, resp);
3418 break; 3542 break;
3419#ifndef NO_CURSORCOLOR 3543#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3544 case XTerm_Color_cursor:
… …
3425 process_color_seq (op, Color_pointer_fg, str, resp); 3549 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break; 3550 break;
3427 case XTerm_Color_pointer_bg: 3551 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp); 3552 process_color_seq (op, Color_pointer_bg, str, resp);
3429 break; 3553 break;
3554#ifdef OPTION_HC
3555 case XTerm_Color_HC:
3556 process_color_seq (op, Color_HC, str, resp);
3557 break;
3558 case XTerm_Color_HTC:
3559 process_color_seq (op, Color_HTC, str, resp);
3560 break;
3561#endif
3430#ifndef NO_BOLD_UNDERLINE_REVERSE 3562#ifndef NO_BOLD_UNDERLINE_REVERSE
3431 case XTerm_Color_RV:
3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD: 3563 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp); 3564 process_color_seq (op, Color_BD, str, resp);
3437 break; 3565 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL: 3566 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp); 3567 process_color_seq (op, Color_UL, str, resp);
3441 break; 3568 break;
3442 case URxvt_Color_IT: 3569 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3570 process_color_seq (op, Color_IT, str, resp);
3444 break; 3571 break;
3445#endif 3572#endif
3446#if TRANSPARENT && TINTING 3573 case URxvt_Color_border:
3574 process_color_seq (op, Color_border, str, resp);
3575 break;
3576
3577#if BG_IMAGE_FROM_ROOT
3447 case URxvt_Color_tint: 3578 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3579 process_color_seq (op, Color_tint, str, resp);
3580 {
3581 bool changed = false;
3449 3582
3450 check_our_parents (); 3583 if (ISSET_PIXCOLOR (Color_tint))
3584 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3451 3585
3452 if (am_transparent) 3586 if (changed)
3453 want_full_refresh = want_refresh = 1; 3587 update_background ();
3588 }
3454 3589
3455 break; 3590 break;
3456#endif 3591#endif
3457 3592
3593#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3594 case Rxvt_Pixmap:
3595 if (!strcmp (str, "?"))
3459 { 3596 {
3597 char str[256];
3598 int h_scale = fimage.h_scale;
3599 int v_scale = fimage.v_scale;
3600 int h_align = fimage.h_align;
3601 int v_align = fimage.v_align;
3602
3603 sprintf (str, "[%dx%d+%d+%d]",
3604 h_scale, v_scale,
3605 h_align, v_align);
3606 process_xterm_seq (XTerm_title, str, CHAR_ST);
3607 }
3608 else
3609 {
3610 bool changed = false;
3611
3460 if (*str != ';') 3612 if (*str != ';')
3461 { 3613 {
3462#if XPM_BACKGROUND 3614 try
3463 scale_pixmap (""); /* reset to default scaling */ 3615 {
3464 set_bgPixmap (str); /* change pixmap */ 3616 fimage.set_file_geometry (this, str);
3465 scr_touch (true); 3617 changed = true;
3466#endif 3618 }
3619 catch (const class rxvt_failure_exception &e)
3620 {
3621 }
3467 } 3622 }
3468 3623 else
3469 int changed = 0;
3470
3471 while ((str = strchr (str, ';')) != NULL)
3472 { 3624 {
3473 str++; 3625 str++;
3474#if XPM_BACKGROUND 3626 if (fimage.set_geometry (str, true))
3475 changed += scale_pixmap (str); 3627 changed = true;
3476#endif
3477 } 3628 }
3478 3629
3479 if (changed) 3630 if (changed)
3480 { 3631 {
3481#ifdef XPM_BACKGROUND 3632 if (bg_window_position_sensitive ())
3482 resize_pixmap (); 3633 {
3483 scr_touch (true); 3634 int x, y;
3484#endif 3635 get_window_origin (x, y);
3636 parent_x = x;
3637 parent_y = y;
3638 }
3639 update_background ();
3485 } 3640 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 } 3641 }
3491 break; 3642 break;
3492 3643#endif
3493 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str);
3495 break;
3496 case Rxvt_restoreBG:
3497 set_window_color (Color_bg, str);
3498 break;
3499 3644
3500 case XTerm_logfile: 3645 case XTerm_logfile:
3501 // TODO, when secure mode? 3646 // TODO, when secure mode?
3502 break; 3647 break;
3503 3648
… …
3570 break; 3715 break;
3571#endif 3716#endif
3572 3717
3573#if ENABLE_PERL 3718#if ENABLE_PERL
3574 case URxvt_perl: 3719 case URxvt_perl:
3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3720 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3576 ; // no responses yet
3577 break; 3721 break;
3578#endif 3722#endif
3579 } 3723 }
3580} 3724}
3581/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
… …
3588 * 's' = save 3732 * 's' = save
3589 * 'r' = restore 3733 * 'r' = restore
3590 * 't' = toggle 3734 * 't' = toggle
3591 * so no need for fancy checking 3735 * so no need for fancy checking
3592 */ 3736 */
3593int 3737int ecb_cold
3594rxvt_term::privcases (int mode, unsigned long bit) 3738rxvt_term::privcases (int mode, unsigned long bit)
3595{ 3739{
3596 int state; 3740 int state;
3597 3741
3598 if (mode == 's') 3742 if (mode == 's')
3599 { 3743 {
3600 SavedModes |= (priv_modes & bit); 3744 if (priv_modes & bit)
3745 SavedModes |= bit;
3746 else
3747 SavedModes &= ~bit;
3601 return -1; 3748 return -1;
3602 } 3749 }
3603 else 3750 else
3604 { 3751 {
3605 if (mode == 'r') 3752 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3753 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3754 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3755 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 PrivMode (state, bit); 3756
3757 if (state)
3758 priv_modes |= bit;
3759 else
3760 priv_modes &= ~bit;
3610 } 3761 }
3611 3762
3612 return state; 3763 return state;
3613} 3764}
3614 3765
3615/* we're not using priv _yet_ */ 3766/* we're not using priv _yet_ */
3616void 3767void
3617rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3768rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3618{ 3769{
3619 unsigned int i, j; 3770 unsigned int i, j;
3620 int state; 3771 int state;
3621 3772
3622 static const struct 3773 static const struct
3623 { 3774 {
3624 const int argval; 3775 const int argval;
3625 const unsigned long bit; 3776 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3777 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3778 { 1, PrivMode_aplCUR }, // DECCKM
3630 { 2, PrivMode_vt52 }, 3779 { 2, PrivMode_vt52 }, // DECANM
3631 { 3, PrivMode_132 }, 3780 { 3, PrivMode_132 }, // DECCOLM
3632 { 4, PrivMode_smoothScroll }, 3781 { 4, PrivMode_smoothScroll }, // DECSCLM
3633 { 5, PrivMode_rVideo }, 3782 { 5, PrivMode_rVideo }, // DECSCNM
3634 { 6, PrivMode_relOrigin }, 3783 { 6, PrivMode_relOrigin }, // DECOM
3635 { 7, PrivMode_Autowrap }, 3784 { 7, PrivMode_Autowrap }, // DECAWM
3636 // 8, bi-directional support mode 3785 // 8, auto-repeat keys // DECARM
3637 { 9, PrivMode_MouseX10 }, 3786 { 9, PrivMode_MouseX10 },
3638 // 18, 19 printing-related
3639 { 25, PrivMode_VisibleCursor }, 3787 { 12, PrivMode_BlinkingCursor },
3788 // 18 end FF to printer after print screen
3789 // 19 Print screen prints full screen/scroll region
3790 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3791#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3792 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3793#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3794 { 35, PrivMode_ShiftKeys }, // rxvt extension
3795 // 38, tektronix mode // DECTEK
3644 { 40, PrivMode_132OK }, 3796 { 40, PrivMode_132OK },
3645 // 41 xterm more fixes NYI 3797 // 41 xterm more fixes NYI
3646 // 45 margin bell NYI 3798 // 45 margin bell NYI
3647 // 46 start logging 3799 // 46 start logging
3648 { 47, PrivMode_Screen }, 3800 { 47, PrivMode_Screen },
3649 { 66, PrivMode_aplKP }, 3801 { 66, PrivMode_aplKP }, // DECNKM
3650#ifndef NO_BACKSPACE_KEY 3802#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3803 { 67, PrivMode_BackSpace }, // DECBKM
3652#endif 3804#endif
3653 { 1000, PrivMode_MouseX11 }, 3805 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3806 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3807 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3808#if ENABLE_FRILLS
3809 { 1004, PrivMode_FocusEvent },
3810 { 1005, PrivMode_ExtModeMouse },
3811#endif
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3812 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3813 { 1011, PrivMode_Keypress }, // rxvt extension
3814#if ENABLE_FRILLS
3815 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3816#endif
3659 // 1035 enable modifiers for alt, numlock NYI 3817 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3818 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3819 // 1037 send DEL for keypad delete NYI
3662 { 1047, PrivMode_Screen }, 3820 { 1047, PrivMode_Screen },
3663 // 1048 save and restore cursor 3821 // 1048 save and restore cursor, implemented in code
3664 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3822 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3823 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3824 { 2004, PrivMode_BracketPaste },
3666 }; 3825 };
3667 3826
3668 if (nargs == 0) 3827 if (nargs == 0)
3669 return; 3828 return;
3670 3829
… …
3677 for (i = 0; i < nargs; i++) 3836 for (i = 0; i < nargs; i++)
3678 { 3837 {
3679 state = -1; 3838 state = -1;
3680 3839
3681 /* basic handling */ 3840 /* basic handling */
3682 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3841 for (j = 0; j < ecb_array_length (argtopriv); j++)
3683 if (argtopriv[j].argval == arg[i]) 3842 if (argtopriv[j].argval == arg[i])
3684 { 3843 {
3685 state = privcases (mode, argtopriv[j].bit); 3844 state = privcases (mode, argtopriv[j].bit);
3686 break; 3845 break;
3687 } 3846 }
… …
3695 3854
3696 scr_touch (true); 3855 scr_touch (true);
3697 break; 3856 break;
3698#endif 3857#endif
3699 case 1048: /* alternative cursor save */ 3858 case 1048: /* alternative cursor save */
3700 case 1049:
3701 if (option (Opt_secondaryScreen)) 3859 if (option (Opt_secondaryScreen))
3702 if (mode == 0) 3860 if (mode == 0)
3703 scr_cursor (RESTORE); 3861 scr_cursor (RESTORE);
3704 else if (mode == 1) 3862 else if (mode == 1)
3705 scr_cursor (SAVE); 3863 scr_cursor (SAVE);
… …
3714 case 2: /* VT52 mode */ 3872 case 2: /* VT52 mode */
3715 /* oddball mode. should be set regardless of set/reset 3873 /* oddball mode. should be set regardless of set/reset
3716 * parameter. Return from VT52 mode with an ESC < from 3874 * parameter. Return from VT52 mode with an ESC < from
3717 * within VT52 mode 3875 * within VT52 mode
3718 */ 3876 */
3719 PrivMode (1, PrivMode_vt52); 3877 priv_modes |= PrivMode_vt52;
3720 break; 3878 break;
3721 case 3: /* 80/132 */ 3879 case 3: /* 80/132 */
3722 if (priv_modes & PrivMode_132OK) 3880 if (priv_modes & PrivMode_132OK)
3723 set_widthheight (((state ? 132 : 80) * fwidth), height); 3881 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3724 break; 3882 break;
3725 case 4: /* smooth scrolling */ 3883 case 4: /* smooth scrolling */
3726 set_option (Opt_jumpScroll, !state); 3884 set_option (Opt_jumpScroll, !state);
3727 break; 3885 break;
3728 case 5: /* reverse video */ 3886 case 5: /* reverse video */
… …
3735 scr_autowrap (state); 3893 scr_autowrap (state);
3736 break; 3894 break;
3737 /* case 8: - auto repeat, can't do on a per window basis */ 3895 /* case 8: - auto repeat, can't do on a per window basis */
3738 case 9: /* X10 mouse reporting */ 3896 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3897 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3898 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3899 break;
3742#ifdef scrollBar_esc 3900#ifdef scrollBar_esc
3743 case scrollBar_esc: 3901 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3902 scrollBar.map (state);
3745 {
3746 resize_all_windows (0, 0, 0); 3903 resize_all_windows (0, 0, 0);
3747 scr_touch (true); 3904 scr_touch (true);
3748 } 3905 break;
3906#endif
3907#ifdef CURSOR_BLINK
3908 case 12:
3909 cursor_blink_reset ();
3749 break; 3910 break;
3750#endif 3911#endif
3751 case 25: /* visible/invisible cursor */ 3912 case 25: /* visible/invisible cursor */
3752 scr_cursor_visible (state); 3913 scr_cursor_visible (state);
3753 break; 3914 break;
… …
3758 break; 3919 break;
3759 /* case 66: - application key pad */ 3920 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3921 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3922 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3923 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3924 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3925 break;
3765#if 0
3766 case 1001: 3926 case 1002:
3767 break; /* X11 mouse highlighting */ 3927 case 1003:
3768#endif 3928 if (state)
3929 {
3930 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3931 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3932 mouse_row = mouse_col = 0;
3933 vt_emask_mouse = PointerMotionMask;
3934 }
3935 else
3936 vt_emask_mouse = NoEventMask;
3937
3938 vt_select_input ();
3939 break;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3940 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3941 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3942 break;
3772 case 1011: /* scroll to bottom on key press */ 3943 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3944 set_option (Opt_scrollTtyKeypress, state);
3774 break; 3945 break;
3775 case 1047: /* secondary screen w/ clearing last */ 3946 case 1047: /* secondary screen w/ clearing last */
3776 if (option (Opt_secondaryScreen)) 3947 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3948 if (!state)
3778 scr_erase_screen (2); 3949 scr_erase_screen (2);
3950
3779 scr_change_screen (state); 3951 scr_change_screen (state);
3780 break; 3952 break;
3781 case 1049: /* secondary screen w/ clearing first */ 3953 case 1049: /* secondary screen w/ clearing first */
3954 if (option (Opt_secondaryScreen))
3955 if (state)
3956 scr_cursor (SAVE);
3957
3782 scr_change_screen (state); 3958 scr_change_screen (state);
3959
3783 if (option (Opt_secondaryScreen)) 3960 if (option (Opt_secondaryScreen))
3784 if (current_screen != PRIMARY) 3961 if (state)
3785 scr_erase_screen (2); 3962 scr_erase_screen (2);
3963 else
3964 scr_cursor (RESTORE);
3786 break; 3965 break;
3787 default: 3966 default:
3788 break; 3967 break;
3789 } 3968 }
3790 } 3969 }
3791} 3970}
3792/*}}} */ 3971/*}}} */
3793 3972
3794/*{{{ process sgr sequences */ 3973/*{{{ process sgr sequences */
3795void 3974void ecb_hot
3796rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3975rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3797{ 3976{
3798 unsigned int i; 3977 unsigned int i;
3799 short rendset; 3978 short rendset;
3800 int rendstyle; 3979 int rendstyle;
… …
3842 //case 19: // ninth alt font 4021 //case 19: // ninth alt font
3843 //case 20: // gothic 4022 //case 20: // gothic
3844 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4023 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3845 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3846 break; 4025 break;
3847 case 22: // normal intensity 4026 case 22: // bold off (vt220)
3848 rendset = 0, rendstyle = RS_Bold; 4027 rendset = 0, rendstyle = RS_Bold;
3849 break; 4028 break;
3850 case 23: // disable italic 4029 case 23: // disable italic
3851 rendset = 0, rendstyle = RS_Italic; 4030 rendset = 0, rendstyle = RS_Italic;
3852 break; 4031 break;
3853 case 24: 4032 case 24: // underline off (vt220)
3854 rendset = 0, rendstyle = RS_Uline; 4033 rendset = 0, rendstyle = RS_Uline;
3855 break; 4034 break;
3856 case 25: 4035 case 25: // blink off (vt220)
3857 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3858 break; 4037 break;
3859 case 26: // variable spacing (iso 8613) 4038 case 26: // variable spacing (iso 8613)
3860 rendset = 0, rendstyle = RS_Blink; 4039 rendset = 0, rendstyle = RS_Blink;
3861 break; 4040 break;
3862 case 27: 4041 case 27: // reverse off (vt220)
3863 rendset = 0, rendstyle = RS_RVid; 4042 rendset = 0, rendstyle = RS_RVid;
3864 break; 4043 break;
3865 //case 28: // visible. NYI 4044 //case 28: // visible. NYI
3866 //case 29: // not crossed-out 4045 //case 29: // not crossed-out
3867 } 4046 }
… …
3888 if (nargs > i + 2 && arg[i + 1] == 5) 4067 if (nargs > i + 2 && arg[i + 1] == 5)
3889 { 4068 {
3890 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4069 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3891 i += 2; 4070 i += 2;
3892 } 4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int idx = map_rgb24_color (r, g, b);
4078 scr_color (idx, Color_fg);
4079 i += 4;
4080 }
3893 break; 4081 break;
3894 case 39: /* default fg */ 4082 case 39: /* default fg */
3895 scr_color (Color_fg, Color_fg); 4083 scr_color (Color_fg, Color_fg);
3896 break; 4084 break;
3897 4085
… …
3908 case 48: // set bg color, ISO 8613-6 4096 case 48: // set bg color, ISO 8613-6
3909 if (nargs > i + 2 && arg[i + 1] == 5) 4097 if (nargs > i + 2 && arg[i + 1] == 5)
3910 { 4098 {
3911 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4099 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3912 i += 2; 4100 i += 2;
4101 }
4102 else if (nargs > i + 4 && arg[i + 1] == 2)
4103 {
4104 unsigned int r = arg[i + 2];
4105 unsigned int g = arg[i + 3];
4106 unsigned int b = arg[i + 4];
4107 unsigned int idx = map_rgb24_color (r, g, b);
4108 scr_color (idx, Color_bg);
4109 i += 4;
3913 } 4110 }
3914 break; 4111 break;
3915 case 49: /* default bg */ 4112 case 49: /* default bg */
3916 scr_color (Color_bg, Color_bg); 4113 scr_color (Color_bg, Color_bg);
3917 break; 4114 break;
… …
3941 break; 4138 break;
3942#endif 4139#endif
3943 } 4140 }
3944 } 4141 }
3945} 4142}
4143
4144void
4145rxvt_term::set_cursor_style (int style)
4146{
4147 if (!IN_RANGE_INC (style, 0, 6))
4148 return;
4149
4150 if (style == 0)
4151 style = 1;
4152
4153 cursor_type = (style - 1) / 2;
4154 set_option (Opt_cursorUnderline, cursor_type == 1);
4155
4156#ifdef CURSOR_BLINK
4157 set_option (Opt_cursorBlink, style & 1);
4158 cursor_blink_reset ();
4159#endif
4160
4161 want_refresh = 1;
4162}
3946/*}}} */ 4163/*}}} */
3947 4164
3948/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3949void
3950rxvt_term::process_graphics ()
3951{
3952 unicode_t ch, cmd = cmd_getc ();
3953
3954 if (cmd == 'Q')
3955 { /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */
3957 return;
3958 }
3959 /* swallow other graphics sequences until terminating ':' */
3960 do
3961 ch = cmd_getc ();
3962 while (ch != ':');
3963}
3964/*}}} */
3965
3966/* ------------------------------------------------------------------------- */ 4165/* ---------------------------------------------------------------------- */
4166/* Write data to the pty as typed by the user, pasted with the mouse,
4167 * or generated by us in response to a query ESC sequence.
4168 */
3967 4169
3968/* 4170/*
3969 * Send printf () formatted output to the command. 4171 * Send printf () formatted output to the command.
3970 * Only use for small amounts of data. 4172 * Only use for small amounts of data.
3971 */ 4173 */
… …
3979 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4181 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3980 va_end (arg_ptr); 4182 va_end (arg_ptr);
3981 tt_write (buf, strlen (buf)); 4183 tt_write (buf, strlen (buf));
3982} 4184}
3983 4185
3984/* ---------------------------------------------------------------------- */
3985/* Write data to the pty as typed by the user, pasted with the mouse, 4186/* Write data to the pty as typed by the user. */
3986 * or generated by us in response to a query ESC sequence. 4187void
3987 */ 4188rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3988const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4189{
4190 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4191 return;
4192
4193 if (option (Opt_scrollTtyKeypress))
4194 if (view_start)
4195 {
4196 view_start = 0;
4197 want_refresh = 1;
4198 }
4199
4200 tt_write_ (data, len);
4201}
3989 4202
3990void 4203void
3991rxvt_term::tt_write (const char *data, unsigned int len) 4204rxvt_term::tt_write (const char *data, unsigned int len)
3992{ 4205{
3993 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4206 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3994 return; 4207 return;
3995 4208
4209 tt_write_ (data, len);
4210}
4211
4212static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4213
4214void
4215rxvt_term::tt_write_ (const char *data, unsigned int len)
4216{
3996 if (pty->pty < 0) 4217 if (pty->pty < 0)
3997 return; 4218 return;
3998 4219
3999 if (v_buflen == 0) 4220 if (v_buflen == 0)
4000 { 4221 {
4001 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4222 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4002 4223
4224 max_it (written, 0);
4225
4003 if ((unsigned int)written == len) 4226 if (written == len)
4004 return; 4227 return;
4005 4228
4006 data += written; 4229 data += written;
4007 len -= written; 4230 len -= written;
4008 } 4231 }
4009 4232
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4233 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4011 4234
4012 memcpy (v_buffer + v_buflen, data, len); 4235 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 4236 v_buflen += len;
4014 4237
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 4238 pty_ev.set (ev::READ | ev::WRITE);
4016} 4239}
4017 4240
4018void rxvt_term::pty_write () 4241void rxvt_term::pty_write ()
4019{ 4242{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4243 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4025 4248
4026 if (v_buflen == 0) 4249 if (v_buflen == 0)
4027 { 4250 {
4028 free (v_buffer); 4251 free (v_buffer);
4029 v_buffer = 0; 4252 v_buffer = 0;
4030 v_buflen = 0;
4031 4253
4032 pty_ev.set (EVENT_READ); 4254 pty_ev.set (ev::READ);
4033 return; 4255 return;
4034 } 4256 }
4035 4257
4036 memmove (v_buffer, v_buffer + written, v_buflen); 4258 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 4259 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4260 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 4261 pty_ev.set (ev::READ);
4040} 4262}
4041 4263
4042/*----------------------- end-of-file (C source) -----------------------*/ 4264/*----------------------- end-of-file (C source) -----------------------*/
4043 4265

Diff Legend

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