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

Diff Legend

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