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.293 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.578 by root, Thu Jun 30 17:02:22 2016 UTC

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

Diff Legend

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