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

Diff Legend

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