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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

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

Diff Legend

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