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

Diff Legend

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