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.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 - 4 && 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 meta = 0;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
361 { 706 {
362#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
364 return; 709 return;
365#endif 710#endif
366 711
367 if (TermWin.saveLines) 712 if (saveLines)
368 { 713 {
369#ifdef UNSHIFTED_SCROLLKEYS 714#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 715 if (!ctrl && !meta)
371#else 716#else
372 if (IS_SCROLL_MOD) 717 if (IS_SCROLL_MOD)
373#endif 718#endif
374 { 719 {
375 int lnsppg; 720 int lnsppg;
376 721
377#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 724#else
380 lnsppg = TermWin.nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
381#endif 726#endif
727 max_it (lnsppg, 1);
728
382 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
383 { 730 {
384 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
385 return; 732 return;
386 } 733 }
387 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
388 { 735 {
389 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
390 return; 737 return;
391 } 738 }
392 } 739 }
393#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
394 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
395 { 742 {
396 if (keysym == XK_Up) 743 if (keysym == XK_Up)
397 { 744 {
398 scr_page (UP, 1); 745 scr_page (1);
399 return; 746 return;
400 } 747 }
401 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
402 { 749 {
403 scr_page (DN, 1); 750 scr_page (-1);
404 return; 751 return;
405 } 752 }
406 } 753 }
407#endif 754#endif
408#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
409 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
410 { 757 {
411 if (keysym == XK_Home) 758 if (keysym == XK_Home)
412 { 759 {
413 scr_move_to (0, 1); 760 scr_changeview (top_row);
414 return; 761 return;
415 } 762 }
416 else if (keysym == XK_End) 763 else if (keysym == XK_End)
417 { 764 {
418 scr_move_to (1, 0); 765 scr_changeview (0);
419 return; 766 return;
420 } 767 }
421 } 768 }
422#endif 769#endif
423 } 770 }
424 771
425 if (shft) 772 if (shft)
426 { 773 {
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)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
434 { 775 {
435 switch (keysym) 776 switch (keysym)
436 { 777 {
437 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
438 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
439 selection_request (ev.time, 0, 0); 780 selection_request (ev.time);
440 return; 781 return;
441#if TODO 782#if TODO
442 /* rxvt extras */ 783 /* rxvt extras */
443 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
444 change_font (FONT_UP);
445 return; 785 return;
446 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
447 change_font (FONT_DN);
448 return; 787 return;
449#endif 788#endif
450 } 789 }
451 } 790 }
452 } 791 }
453 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
454#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
455 // ISO 14755 support 809 // ISO 14755 support
456 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
457 { 811 {
458 int hv; 812 int hv;
459 813
460 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
461 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
463 { 817 {
464 commit_iso14755 (); 818 commit_iso14755 ();
465 iso14755buf = ISO_14755_51; 819 iso14755buf = ISO_14755_51;
466# if ISO_14755 820# if ISO_14755
467 iso14755_51 (0); 821 iso14755_51 (0);
822# endif
823 return;
824 }
825 else if (keysym == XK_BackSpace)
826 {
827 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
828# if ISO_14755
829 iso14755_51 (iso14755buf & ISO_14755_MASK);
468# endif 830# endif
469 return; 831 return;
470 } 832 }
471 else if ((hv = hex_keyval (ev)) >= 0) 833 else if ((hv = hex_keyval (ev)) >= 0)
472 { 834 {
… …
477# endif 839# endif
478 return; 840 return;
479 } 841 }
480 else 842 else
481 { 843 {
482# if ENABLE_OVERLAY 844# if ISO_14755
483 scr_overlay_off (); 845 scr_overlay_off ();
484# endif 846# endif
485 iso14755buf = 0; 847 iso14755buf = 0;
486 } 848 }
487 } 849 }
850 else if (option (Opt_iso14755) &&
488 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
489 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
490 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
491 { 854 {
492 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
493# if ENABLE_OVERLAY 856# if ISO_14755
494 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
495 scr_overlay_set (0, 0, "ISO 14755 mode"); 858 scr_overlay_set (0, 0, "ISO 14755 mode");
496# endif 859# endif
497 } 860 }
498#endif 861#endif
499 862
500#ifdef PRINTPIPE 863#ifdef PRINTPIPE
501 if (keysym == XK_Print) 864 if (keysym == XK_Print)
502 { 865 {
503 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
504 return; 867 return;
505 } 868 }
506#endif 869#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 } 870 }
841 871
842 if (len <= 0) 872 if (len <= 0)
843 return; /* not mapped */ 873 return; /* not mapped */
844 874
845 if (options & Opt_scrollTtyKeypress) 875 tt_write_user_input (kbuf, (unsigned int)len);
846 if (TermWin.view_start) 876}
877
878void ecb_cold
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
847 { 891 {
848 TermWin.view_start = 0; 892# if ISO_14755
849 want_refresh = 1; 893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
850 } 922 }
851 923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
852 /* 924 {
853 * these modifications only affect the static keybuffer 925# if ISO_14755
854 * pass Shift/Control indicators for function keys ending with `~' 926 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 927# endif
871 ) 928 if (iso14755buf & ISO_14755_51)
872 { 929 commit_iso14755 ();
873 const unsigned char ch = C0_ESC; 930#if ISO_14755
874 tt_write (&ch, 1); 931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
875 } 932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
876 934
877#if defined(DEBUG_CMD) 935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
878 /* Display keyboard buffer contents */ 936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
879 unsigned char *p; 937 }
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 938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
925 954
926void 955void
927rxvt_term::flush () 956rxvt_term::flush ()
928{ 957{
929 flush_ev.stop (); 958 flush_ev.stop ();
930 959
931#ifdef TRANSPARENT 960#ifdef HAVE_IMG
932 if (want_full_refresh) 961 if (bg_flags & BG_NEEDS_REFRESH)
933 { 962 {
934 want_full_refresh = 0; 963 bg_flags &= ~BG_NEEDS_REFRESH;
935 scr_clear ();
936 scr_touch (false); 964 scr_touch (false);
937 } 965 }
938#endif 966#endif
939 967
940 if (want_refresh) 968 if (want_refresh)
941 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
942 scr_refresh (refresh_type); 1008 scr_refresh ();
943 scrollbar_show (1); 1009 scrollBar.show (1);
944#ifdef USE_XIM 1010#if USE_XIM
945 IMSendSpot (); 1011 im_send_spot ();
946#endif 1012#endif
947 } 1013 }
948 1014
949 display->flush (); 1015 display->flush ();
950} 1016}
951 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
952void 1019void
953rxvt_term::check_cb (check_watcher &w) 1020rxvt_term::refresh_check ()
954{ 1021{
955 SET_R (this); 1022 if (want_refresh && !flush_ev.is_active ())
956 SET_LOCALE (locale); 1023 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
957 1024
958 display->flush (); 1025 display->flush ();
959
960 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01);
962} 1026}
963 1027
964void 1028void
965rxvt_term::flush_cb (time_watcher &w) 1029rxvt_term::flush_cb (ev::timer &w, int revents)
966{ 1030{
967 SET_R (this); 1031 make_current ();
968 SET_LOCALE (locale);
969 1032
970 refresh_limit = 1;
971 refresh_count = 0; 1033 refresh_count = 0;
972 flush (); 1034 flush ();
973} 1035}
974 1036
975#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
976void 1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (hidden_cursor)
1042 {
1043 hidden_cursor = 0;
1044 want_refresh = 1;
1045 }
1046
1047 if (option (Opt_cursorBlink))
1048 cursor_blink_ev.again ();
1049 else
1050 cursor_blink_ev.stop ();
1051}
1052
1053void
977rxvt_term::cursor_blink_cb (time_watcher &w) 1054rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
978{ 1055{
979 hidden_cursor = !hidden_cursor; 1056 hidden_cursor = !hidden_cursor;
980 want_refresh = 1; 1057 want_refresh = 1;
981 1058 refresh_check ();
982 w.start (w.at + BLINK_INTERVAL);
983} 1059}
984#endif 1060#endif
985 1061
986#ifdef TEXT_BLINK 1062#ifdef TEXT_BLINK
987void 1063void
988rxvt_term::text_blink_cb (time_watcher &w) 1064rxvt_term::text_blink_cb (ev::timer &w, int revents)
989{ 1065{
990 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1066 if (scr_refresh_rend (RS_Blink, RS_Blink))
991 { 1067 {
992 hidden_text = !hidden_text; 1068 hidden_text = !hidden_text;
993 want_refresh = 1; 1069 want_refresh = 1;
994 w.start (w.at + TEXT_BLINK_INTERVAL); 1070 refresh_check ();
995 } 1071 }
1072 else
1073 w.stop ();
996} 1074}
997#endif 1075#endif
998 1076
999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1077#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1000void 1078void
1001rxvt_term::cont_scroll_cb (time_watcher &w) 1079rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1002{ 1080{
1003 if ((scrollbar_isUp() || scrollbar_isDn()) && 1081 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1004 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1082 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1005 { 1083 {
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1084 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1085 refresh_check ();
1009 } 1086 }
1087 else
1088 w.stop ();
1010} 1089}
1011#endif 1090#endif
1012 1091
1013#ifdef SELECTION_SCROLLING 1092#ifdef SELECTION_SCROLLING
1014void 1093void
1015rxvt_term::sel_scroll_cb (time_watcher &w) 1094rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1016{ 1095{
1017 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1096 if (scr_page (scroll_selection_lines))
1018 { 1097 {
1019 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1098 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1020 refresh_type |= SMOOTH_REFRESH;
1021 want_refresh = 1; 1099 want_refresh = 1;
1022 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1100 refresh_check ();
1023 } 1101 }
1102 else
1103 w.stop ();
1024} 1104}
1025#endif 1105#endif
1026 1106
1027#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1107#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1028void 1108void
1029rxvt_term::slip_wheel_cb (time_watcher &w) 1109rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1030{ 1110{
1031 if (mouse_slip_wheel_speed == 0 1111 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 { 1112 {
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; 1113 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1115 }
1116
1117 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1042 } 1118 {
1119 mouse_slip_wheel_speed = 0;
1120 w.stop ();
1121 }
1122}
1123#endif
1124
1125#if LINUX_YIELD_HACK
1126static struct event_handler
1127{
1128 ev::prepare yield_ev;
1129
1130 void yield_cb (ev::prepare &w, int revents)
1131 {
1132 // this should really be sched_yield(), but the linux guys thought
1133 // that giving a process calling sched_yield () less cpu time than
1134 // ones with high nice levels is a useful thing to do. It surely is is
1135 // allowed by the sus... as is returning ENOSYS.
1136 // since the linux guys additionally thought that breaking the only
1137 // known workaround against their unusable sched_yield hack is cool,
1138 // we just nanosleep a bit and hope for the best.
1139
1140 struct timespec ts = { 0, 1000 };
1141 nanosleep (&ts, 0);
1142
1143 w.stop ();
1144 }
1145
1146 event_handler ()
1147 : yield_ev (this, &event_handler::yield_cb)
1148 {
1149 }
1150} event_handler;
1151#endif
1152
1153/* make sure all the cmd data is at beginning of cmdbuf */
1154void
1155rxvt_term::cmdbuf_reify ()
1156{
1157 if (cmdbuf_ptr == cmdbuf_base)
1158 return;
1159
1160 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1161
1162 memmove (cmdbuf_base, cmdbuf_ptr, used);
1163 cmdbuf_ptr = cmdbuf_base;
1164 cmdbuf_endp = cmdbuf_ptr + used;
1165
1166}
1167
1168#if defined (KEYSYM_RESOURCE)
1169void
1170rxvt_term::cmdbuf_append (const char *str, size_t count)
1171{
1172 cmdbuf_reify ();
1173
1174 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1175
1176 if (count > avail)
1177 return;
1178
1179 memcpy (cmdbuf_endp, str, count);
1180 cmdbuf_endp += count;
1181
1182 cmd_parse ();
1043} 1183}
1044#endif 1184#endif
1045 1185
1046bool 1186bool
1047rxvt_term::pty_fill () 1187rxvt_term::pty_fill ()
1048{ 1188{
1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1189 cmdbuf_reify ();
1050 1190
1051 if (CBUFSIZ == n) 1191 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1052 { 1192
1053 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1193 if (!avail)
1054 n = 0;
1055 } 1194 {
1056 1195 // 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; 1196 cmdbuf_ptr = cmdbuf_base;
1059 cmdbuf_endp = cmdbuf_ptr + n; 1197 cmdbuf_endp = cmdbuf_ptr;
1198 avail = CBUFSIZ;
1199 }
1060 1200
1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1201 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1062 1202
1063 if (n > 0) 1203 if (r > 0)
1064 { 1204 {
1065 cmdbuf_endp += n; 1205 cmdbuf_endp += r;
1066 return true; 1206 return true;
1067 } 1207 }
1068 else if (n < 0 && errno != EAGAIN) 1208 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1209 {
1210#if LINUX_YIELD_HACK
1211 if (display->is_local)
1212 event_handler.yield_ev.start ();
1213#endif
1214 }
1215 else
1216 {
1217 pty_ev.stop ();
1218
1219 if (!option (Opt_hold))
1069 destroy (); 1220 destroy ();
1070 1221 }
1222
1071 return false; 1223 return false;
1072} 1224}
1073 1225
1074void 1226void
1075rxvt_term::pty_cb (io_watcher &w, short revents) 1227rxvt_term::pty_cb (ev::io &w, int revents)
1076{ 1228{
1077 SET_R (this); 1229 make_current ();
1078 SET_LOCALE (locale);
1079 1230
1080 if (revents & EVENT_READ) 1231 if (revents & ev::READ)
1081 // loop, but don't allow a single term to monopolize us 1232 // loop, but don't allow a single term to monopolize us
1082 while (pty_fill ()) 1233 for (int i = CBUFCNT; i-- && pty_fill (); )
1083 if (cmd_parse ()) 1234 cmd_parse ();
1084 break;
1085 1235
1086 if (revents & EVENT_WRITE) 1236 if (revents & ev::WRITE)
1087 pty_write (); 1237 pty_write ();
1088}
1089 1238
1090void 1239 refresh_check ();
1240}
1241
1242void ecb_cold
1091rxvt_term::pointer_unblank () 1243rxvt_term::pointer_unblank ()
1092{ 1244{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1245 XDefineCursor (dpy, vt, TermWin_cursor);
1094 recolour_cursor (); 1246 recolour_cursor ();
1095 1247
1096#ifdef POINTER_BLANK 1248#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1249 hidden_pointer = 0;
1098 1250
1099 if (options & Opt_pointerBlank) 1251 if (option (Opt_pointerBlank))
1100 pointer_ev.start (NOW + pointerBlankDelay); 1252 pointer_ev.start (pointerBlankDelay);
1101#endif 1253#endif
1102} 1254}
1103 1255
1104#ifdef POINTER_BLANK 1256#ifdef POINTER_BLANK
1105void 1257void ecb_cold
1106rxvt_term::pointer_blank () 1258rxvt_term::pointer_blank ()
1107{ 1259{
1108 if (! (options & Opt_pointerBlank)) 1260 if (!option (Opt_pointerBlank))
1109 return; 1261 return;
1110 1262
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1263 XDefineCursor (dpy, vt, display->blank_cursor);
1112 XFlush (display->display); 1264 XFlush (dpy);
1113 1265
1114 hidden_pointer = 1; 1266 hidden_pointer = 1;
1115} 1267}
1116 1268
1117void 1269void ecb_cold
1118rxvt_term::pointer_cb (time_watcher &w) 1270rxvt_term::pointer_cb (ev::timer &w, int revents)
1119{ 1271{
1120 SET_R (this); 1272 make_current ();
1121 SET_LOCALE (locale);
1122 1273
1123 pointer_blank (); 1274 pointer_blank ();
1124} 1275}
1125#endif 1276#endif
1126 1277
1127void 1278void
1128rxvt_term::mouse_report (XButtonEvent &ev) 1279rxvt_term::mouse_report (XButtonEvent &ev)
1129{ 1280{
1130 int button_number, key_state = 0; 1281 int button_number, key_state = 0;
1131 int x, y; 1282 int x, y;
1283 int code = 32;
1132 1284
1133 x = ev.x; 1285 x = Pixel2Col (ev.x) + 1;
1134 y = ev.y; 1286 y = Pixel2Row (ev.y) + 1;
1135 pixel_position (&x, &y); 1287
1288 if (ev.type == MotionNotify)
1289 {
1290 if (x == mouse_row && y == mouse_col)
1291 return;
1292
1293 mouse_row = x;
1294 mouse_col = y;
1295 code += 32;
1296 }
1136 1297
1137 if (MEvent.button == AnyButton) 1298 if (MEvent.button == AnyButton)
1138 button_number = 3; 1299 button_number = 3;
1139 else 1300 else
1140 { 1301 {
1141 button_number = MEvent.button - Button1; 1302 button_number = MEvent.button - Button1;
1142 /* add 0x3D for wheel events, like xterm does */ 1303 /* add 0x3D for wheel events, like xterm does */
1143 if (button_number >= 3) 1304 if (button_number >= 3)
1144 button_number += (64 - 3); 1305 button_number += 64 - 3;
1145 } 1306 }
1146 1307
1147 if (priv_modes & PrivMode_MouseX10) 1308 if (priv_modes & PrivMode_MouseX10)
1148 { 1309 {
1149 /* 1310 /*
… …
1181 fputc ('A', stderr); 1342 fputc ('A', stderr);
1182 if (key_state & 32) 1343 if (key_state & 32)
1183 fputc ('2', stderr); 1344 fputc ('2', stderr);
1184 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1185 button_number, 1346 button_number,
1186 x + 1, 1347 x,
1187 y + 1); 1348 y);
1188#endif 1349#endif
1189 1350
1351#if ENABLE_FRILLS
1352 if (priv_modes & PrivMode_ExtMouseRight)
1353 tt_printf ("\033[%d;%d;%dM",
1354 code + button_number + key_state,
1355 x,
1356 y);
1357 else if (priv_modes & PrivMode_ExtModeMouse)
1358 tt_printf ("\033[M%c%lc%lc",
1359 code + button_number + key_state,
1360 wint_t (32 + x),
1361 wint_t (32 + y));
1362 else
1363#endif
1190 tt_printf ("\033[M%c%c%c", 1364 tt_printf ("\033[M%c%c%c",
1191 (32 + button_number + key_state), 1365 code + button_number + key_state,
1192 (32 + x + 1), 1366 32 + x,
1193 (32 + y + 1)); 1367 32 + y);
1194} 1368}
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 1369
1206/*{{{ process an X event */ 1370/*{{{ process an X event */
1207void 1371void ecb_hot
1208rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1209{ 1373{
1210 dDisp; 1374 make_current ();
1211 1375
1212 SET_R (this); 1376 dLocal (Display *, dpy);
1213 SET_LOCALE (locale);
1214 1377
1215#if defined(CURSOR_BLINK) 1378 if (ev.xany.window == vt
1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1217 { 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1218 if (hidden_cursor) 1381 return;
1219 {
1220 hidden_cursor = 0;
1221 want_refresh = 1;
1222 }
1223 1382
1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1383 // 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; 1384 Window unused_root, unused_child;
1243 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1244 unsigned int unused_mask; 1386 unsigned int unused_mask;
1245 1387
1246 switch (ev.type) 1388 switch (ev.type)
1247 { 1389 {
1248 case KeyPress: 1390 case KeyPress:
1249#if ISO_14755 1391 key_press (ev.xkey);
1250 if (!(iso14755buf & ISO_14755_52))
1251#endif
1252 lookup_key (ev.xkey);
1253
1254 break; 1392 break;
1255 1393
1256 case KeyRelease: 1394 case KeyRelease:
1257 { 1395 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; 1396 break;
1325 }
1326 1397
1327 case ButtonPress: 1398 case ButtonPress:
1328 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1329 break; 1400 break;
1330 1401
… …
1332 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1333 break; 1404 break;
1334 1405
1335 case ClientMessage: 1406 case ClientMessage:
1336 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1338 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1340 destroy (); 1417 destroy ();
1418 }
1341#if ENABLE_EWMH 1419#if ENABLE_EWMH
1342 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1343 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1344 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1345 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1346#endif 1435#endif
1347 } 1436 }
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; 1437 break;
1388 1438
1389 /* 1439 /*
1390 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1391 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1410 break; 1460 break;
1411 } 1461 }
1412 break; 1462 break;
1413 1463
1414 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1415 focus_in (); 1468 focus_in ();
1416 break; 1469 break;
1417 1470
1418 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1419 focus_out (); 1475 focus_out ();
1420 break; 1476 break;
1421 1477
1422 case ConfigureNotify: 1478 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1479 if (ev.xconfigure.window == parent)
1424 { 1480 {
1425 int height, width; 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1426
1427 do 1482 ;
1428 { /* Wrap lots of configures into one */ 1483
1429 width = ev.xconfigure.width; 1484 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1430 height = ev.xconfigure.height; 1485
1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1486 bool moved = false;
1487#ifdef HAVE_BG_PIXMAP
1488 if (bg_window_position_sensitive ())
1489 {
1490 want_position_change = true;
1491 if (bg_img == 0)
1492 moved = true;
1432 } 1493 }
1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1494#endif
1434 1495
1496 if (want_position_change)
1497 {
1498 int x, y;
1499
1500 if (ev.xconfigure.send_event)
1501 {
1502 x = ev.xconfigure.x;
1503 y = ev.xconfigure.y;
1504 }
1505 else
1506 get_window_origin (x, y);
1507
1508 if (x != parent_x || y != parent_y)
1509 {
1510 parent_x = x;
1511 parent_y = y;
1512 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1513 moved = true;
1514 }
1515 }
1516
1435 if (szHint.width != width || szHint.height != height) 1517 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1518 {
1437 seen_resize = 1; 1519 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1520 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1521 }
1440 1522 else
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1523 {
1442 if (options & Opt_transparent) 1524#ifdef HAVE_BG_PIXMAP
1443 check_our_parents (); 1525 if (moved)
1526 update_background ();
1444#endif 1527#endif
1528 }
1529
1530 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1445 } 1531 }
1446 break; 1532 break;
1447 1533
1448 case PropertyNotify: 1534 case PropertyNotify:
1449 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1535 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; 1536 break;
1454 1537
1455 case SelectionClear: 1538 case SelectionClear:
1456 selection_clear (); 1539 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; 1540 break;
1463 1541
1464 case SelectionRequest: 1542 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1543 selection_send (ev.xselectionrequest);
1466 break; 1544 break;
1467 1545
1546 case MapNotify:
1547#ifdef HAVE_BG_PIXMAP
1548 // This is needed at startup for the case of no window manager
1549 // or a non-reparenting window manager and also because we
1550 // defer bg image updates if the window is not mapped. The
1551 // short delay is to optimize for multiple ConfigureNotify
1552 // events at startup when the window manager reparents the
1553 // window, so as to perform the computation after we have
1554 // received all of them.
1555 if (bg_img == 0)
1556 update_background_ev.start (0.025);
1557#endif
1558 mapped = 1;
1559#ifdef TEXT_BLINK
1560 text_blink_ev.start ();
1561#endif
1562 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1563 break;
1564
1468 case UnmapNotify: 1565 case UnmapNotify:
1469 TermWin.mapped = 0; 1566 mapped = 0;
1470#ifdef TEXT_BLINK 1567#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1568 text_blink_ev.stop ();
1472#endif 1569#endif
1570 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1473 break; 1571 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 1572
1488 case GraphicsExpose: 1573 case GraphicsExpose:
1489 case Expose: 1574 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == vt)
1491 { 1576 {
1492 do 1577 do
1578 {
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1581 }
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1582 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1496 1583
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1584 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1585
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1587 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1588 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1589 ev.xexpose.width, ev.xexpose.height, false);
1590 }
1502 1591
1503 scr_refresh (refresh_type); 1592 want_refresh = 1;
1504 } 1593 }
1505 else 1594 else
1506 { 1595 {
1507 XEvent unused_event; 1596 XEvent unused_event;
1508 1597
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1510 ; 1599 ;
1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1600 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1512 ; 1601 ;
1513 1602
1514 if (isScrollbarWindow (ev.xany.window)) 1603 if (scrollBar.state && ev.xany.window == scrollBar.win)
1515 { 1604 {
1516 scrollBar.setIdle (); 1605 scrollBar.state = SB_STATE_IDLE;
1517 scrollbar_show (0); 1606 scrollBar.show (0);
1518 } 1607 }
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 } 1608 }
1529 break; 1609 break;
1530 1610
1531 case MotionNotify: 1611 case MotionNotify:
1532#ifdef POINTER_BLANK 1612#ifdef POINTER_BLANK
1533 if (hidden_pointer) 1613 if (hidden_pointer)
1534 pointer_unblank (); 1614 pointer_unblank ();
1535#endif 1615#endif
1536#if MENUBAR 1616 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1537 if (isMenuBarWindow (ev.xany.window)) 1617 || priv_modes & PrivMode_MouseAnyEvent)
1538 {
1539 menubar_control (ev.xbutton); 1618 mouse_report (ev.xbutton);
1540 break;
1541 }
1542#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1619 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1620 break;
1545 1621
1546 if (ev.xany.window == TermWin.vt) 1622 if (ev.xany.window == vt)
1547 { 1623 {
1624 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1628 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1629 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1551 ; 1630 ;
1552 1631
1553 XQueryPointer (disp, TermWin.vt, 1632 XQueryPointer (dpy, vt,
1554 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1636 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1637#ifdef MOUSE_THRESHOLD
… …
1570#endif 1649#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1650 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1651 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1652
1574#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1656 {
1657 page_dirn scroll_selection_dir;
1578 int dist; 1658 int dist;
1579 1659
1580 /* don't clobber the current delay if we are 1660 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1661 * already in the middle of scrolling.
1582 */ 1662 */
1583 if (!sel_scroll_ev.active) 1663 if (!sel_scroll_ev.is_active ())
1584 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1664 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1585 1665
1586 /* save the event params so we can highlight 1666 /* save the event params so we can highlight
1587 * the selection in the pending-scroll loop 1667 * the selection in the pending-scroll loop
1588 */ 1668 */
1589 selection_save_x = ev.xbutton.x; 1669 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1670 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1671 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1672
1593 /* calc number of lines to scroll */ 1673 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1674 if (ev.xbutton.y < int_bwidth)
1595 { 1675 {
1596 scroll_selection_dir = UP; 1676 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1677 dist = int_bwidth - ev.xbutton.y;
1598 } 1678 }
1599 else 1679 else
1600 { 1680 {
1601 scroll_selection_dir = DN; 1681 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1682 dist = ev.xbutton.y - (int_bwidth + vt_height);
1603 } 1683 }
1604 1684
1605 scroll_selection_lines = Pixel2Height (dist) 1685 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1686 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1687 + 1;
1608 MIN_IT (scroll_selection_lines, 1688 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1689 SELECTION_SCROLL_MAX_LINES);
1690 scroll_selection_lines *= scroll_selection_dir;
1610 } 1691 }
1611 else 1692 else
1612 { 1693 {
1613 /* we are within the text window, so we 1694 /* we are within the text window, so we
1614 * shouldn't be scrolling 1695 * shouldn't be scrolling
1615 */ 1696 */
1616 if (sel_scroll_ev.active)
1617 sel_scroll_ev.stop(); 1697 sel_scroll_ev.stop();
1618 } 1698 }
1619#endif 1699#endif
1620#ifdef MOUSE_THRESHOLD 1700#ifdef MOUSE_THRESHOLD
1621 } 1701 }
1622#endif 1702#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_recolour ();
1669 } 1787 }
1670#endif 1788#endif
1671 } 1789#if ENABLE_FRILLS
1672} 1790 if (option (Opt_urgentOnBell))
1791 set_urgency (0);
1792#endif
1673 1793
1674void 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 }
1796}
1797
1798void ecb_cold
1675rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1676{ 1800{
1677 if (TermWin.focus) 1801 if (focus)
1678 { 1802 {
1679 TermWin.focus = 0; 1803 focus = 0;
1680 want_refresh = 1; 1804 want_refresh = 1;
1681 1805
1806#if ENABLE_FRILLS
1807 if (option (Opt_urgentOnBell))
1808 set_urgency (0);
1809#endif
1682#if ENABLE_FRILLS || ISO_14755 1810#if ENABLE_FRILLS || ISO_14755
1811 if (iso14755buf)
1812 {
1683 iso14755buf = 0; 1813 iso14755buf = 0;
1684#endif 1814# if ISO_14755
1685#if ENABLE_OVERLAY
1686 scr_overlay_off (); 1815 scr_overlay_off ();
1687#endif 1816# endif
1817 }
1818#endif
1688#ifdef USE_XIM 1819#if USE_XIM
1689 if (Input_Context != NULL) 1820 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1821 XUnsetICFocus (Input_Context);
1691#endif 1822#endif
1692#ifdef CURSOR_BLINK 1823#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1824 if (option (Opt_cursorBlink))
1694 cursor_blink_ev.stop (); 1825 cursor_blink_ev.stop ();
1826
1695 hidden_cursor = 0; 1827 hidden_cursor = 0;
1696#endif 1828#endif
1697#ifdef OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1699 { 1831 {
1700 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1833 scr_recolour ();
1702 } 1834 }
1703#endif 1835#endif
1836
1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1838 }
1839}
1840
1841void ecb_cold
1842rxvt_term::update_fade_color (unsigned int idx)
1843{
1844#if OFF_FOCUS_FADING
1845 if (rs[Rs_fade])
1704 } 1846 {
1847 rgba c;
1848 pix_colors [Color_fade].get (c);
1849 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1850 }
1851#endif
1705} 1852}
1706 1853
1707#if TRANSPARENT 1854#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1708void 1855void ecb_hot
1709rxvt_term::rootwin_cb (XEvent &ev) 1856rxvt_term::rootwin_cb (XEvent &ev)
1710{ 1857{
1711 SET_R (this); 1858 make_current ();
1712 SET_LOCALE (locale); 1859
1860 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1861 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1862 return;
1713 1863
1714 switch (ev.type) 1864 switch (ev.type)
1715 { 1865 {
1716 case PropertyNotify: 1866 case PropertyNotify:
1717 /* 1867 /*
1718 * if user used some Esetroot compatible prog to set the root bg, 1868 * 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. 1869 * use the property to determine the pixmap. We use it later on.
1720 */ 1870 */
1721 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1871 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1872 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1723 return; 1873 {
1874#if BG_IMAGE_FROM_ROOT
1875 if (option (Opt_transparent))
1876 {
1877 rxvt_img::new_from_root (this)->replace (root_img);
1878 update_background ();
1879 }
1880#endif
1881 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1882 }
1724 1883
1725 /* FALLTHROUGH */
1726 case ReparentNotify:
1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1728 want_refresh = want_full_refresh = 1;
1729 break; 1884 break;
1730 } 1885 }
1886
1887 refresh_check ();
1731} 1888}
1732#endif 1889#endif
1733 1890
1734void 1891void
1735rxvt_term::button_press (XButtonEvent &ev) 1892rxvt_term::button_press (XButtonEvent &ev)
1736{ 1893{
1737 int reportmode = 0, clickintime; 1894 int reportmode = 0, clickintime;
1738 1895
1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1896 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1897
1740 if (!bypass_keystate) 1898 if (!bypass_keystate)
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1899 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1900
1743 /* 1901 /*
1744 * VT window processing of button press 1902 * VT window processing of button press
1745 */ 1903 */
1746 if (ev.window == TermWin.vt) 1904 if (ev.window == vt)
1747 { 1905 {
1906 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1907 return;
1908
1748#if ISO_14755 1909#if ISO_14755
1749 // 5.4 1910 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1911 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1912 {
1752 iso14755_54 (ev.x, ev.y); 1913 iso14755_54 (ev.x, ev.y);
… …
1762 /* save the xbutton state (for ButtonRelease) */ 1923 /* save the xbutton state (for ButtonRelease) */
1763 MEvent.state = ev.state; 1924 MEvent.state = ev.state;
1764#ifdef MOUSE_REPORT_DOUBLECLICK 1925#ifdef MOUSE_REPORT_DOUBLECLICK
1765 if (ev.button == MEvent.button && clickintime) 1926 if (ev.button == MEvent.button && clickintime)
1766 { 1927 {
1767 /* same button, within alloted time */ 1928 /* same button, within allowed time */
1768 MEvent.clicks++; 1929 MEvent.clicks++;
1930
1769 if (MEvent.clicks > 1) 1931 if (MEvent.clicks > 1)
1770 { 1932 {
1771 /* only report double clicks */ 1933 /* only report double clicks */
1772 MEvent.clicks = 2; 1934 MEvent.clicks = 2;
1773 mouse_report (ev); 1935 mouse_report (ev);
… …
1785 mouse_report (ev); 1947 mouse_report (ev);
1786 } 1948 }
1787#else 1949#else
1788 MEvent.button = ev.button; 1950 MEvent.button = ev.button;
1789 mouse_report (ev); 1951 mouse_report (ev);
1790#endif /* MOUSE_REPORT_DOUBLECLICK */ 1952#endif /* MOUSE_REPORT_DOUBLECLICK */
1791 1953
1792 } 1954 }
1793 else 1955 else
1794 { 1956 {
1795 if (ev.button != MEvent.button) 1957 if (ev.button != MEvent.button)
… …
1805#else 1967#else
1806 selection.rect = false; 1968 selection.rect = false;
1807#endif 1969#endif
1808 1970
1809 /* allow shift+left click to extend selection */ 1971 /* allow shift+left click to extend selection */
1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1972 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1811 { 1973 {
1812 if (MEvent.button == Button1 && clickintime) 1974 if (MEvent.button == Button1 && clickintime)
1813 selection_rotate (ev.x, ev.y); 1975 selection_rotate (ev.x, ev.y);
1814 else 1976 else
1815 selection_extend (ev.x, ev.y, 1); 1977 selection_extend (ev.x, ev.y, 1);
… …
1843 } 2005 }
1844 2006
1845 /* 2007 /*
1846 * Scrollbar window processing of button press 2008 * Scrollbar window processing of button press
1847 */ 2009 */
1848 if (isScrollbarWindow (ev.window)) 2010 if (scrollBar.state && ev.window == scrollBar.win)
1849 { 2011 {
1850 scrollBar.setIdle (); 2012 page_dirn direction = NO_DIR;
2013
2014 if (scrollBar.upButton (ev.y))
2015 direction = UP; /* up */
2016 else if (scrollBar.dnButton (ev.y))
2017 direction = DN; /* down */
2018
2019 scrollBar.state = SB_STATE_IDLE;
1851 /* 2020 /*
1852 * Rxvt-style scrollbar: 2021 * Rxvt-style scrollbar:
1853 * move up if mouse is above slider 2022 * move up if mouse is above slider
1854 * move dn if mouse is below slider 2023 * move dn if mouse is below slider
1855 * 2024 *
… …
1864 /* 2033 /*
1865 * Mouse report disabled scrollbar: 2034 * Mouse report disabled scrollbar:
1866 * arrow buttons - send up/down 2035 * arrow buttons - send up/down
1867 * click on scrollbar - send pageup/down 2036 * click on scrollbar - send pageup/down
1868 */ 2037 */
1869 if ((scrollBar.style == R_SB_NEXT 2038 if (direction == UP)
1870 && scrollbarnext_upButton (ev.y))
1871 || (scrollBar.style == R_SB_RXVT
1872 && scrollbarrxvt_upButton (ev.y)))
1873 tt_printf ("\033[A"); 2039 tt_printf ("\033[A");
1874 else if ((scrollBar.style == R_SB_NEXT 2040 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"); 2041 tt_printf ("\033[B");
1879 else 2042 else
1880 switch (ev.button) 2043 switch (ev.button)
1881 { 2044 {
1882 case Button2: 2045 case Button2:
… …
1889 tt_printf ("\033[5~"); 2052 tt_printf ("\033[5~");
1890 break; 2053 break;
1891 } 2054 }
1892 } 2055 }
1893 else 2056 else
1894#endif /* NO_SCROLLBAR_REPORT */ 2057#endif /* NO_SCROLLBAR_REPORT */
1895
1896 {
1897 char upordown = 0;
1898
1899 if (scrollBar.style == R_SB_NEXT)
1900 { 2058 {
1901 if (scrollbarnext_upButton (ev.y)) 2059 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 { 2060 {
1915#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2061#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2062 if (!cont_scroll_ev.is_active ())
1916 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2063 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1917#endif 2064#endif
1918 if (scr_page (upordown < 0 ? UP : DN, 1)) 2065 if (scr_page (direction, 1))
1919 { 2066 {
1920 if (upordown < 0) 2067 if (direction == UP)
1921 scrollBar.setUp (); 2068 scrollBar.state = SB_STATE_UP;
1922 else 2069 else
1923 scrollBar.setDn (); 2070 scrollBar.state = SB_STATE_DOWN;
1924 } 2071 }
1925 } 2072 }
1926 else 2073 else
1927 switch (ev.button) 2074 switch (ev.button)
1928 { 2075 {
1929 case Button2: 2076 case Button2:
1930 switch (scrollbar_align) 2077 switch (scrollBar.align)
1931 { 2078 {
1932 case R_SB_ALIGN_TOP: 2079 case SB_ALIGN_TOP:
1933 csrO = 0; 2080 csrO = 0;
1934 break; 2081 break;
1935 case R_SB_ALIGN_CENTRE: 2082 case SB_ALIGN_CENTRE:
1936 csrO = (scrollBar.bot - scrollBar.top) / 2; 2083 csrO = (scrollBar.bot - scrollBar.top) / 2;
1937 break; 2084 break;
1938 case R_SB_ALIGN_BOTTOM: 2085 case SB_ALIGN_BOTTOM:
1939 csrO = scrollBar.bot - scrollBar.top; 2086 csrO = scrollBar.bot - scrollBar.top;
1940 break; 2087 break;
1941 } 2088 }
1942 2089
1943 if (scrollBar.style == R_SB_XTERM 2090 if (scrollBar.style == SB_STYLE_XTERM
1944 || scrollbar_above_slider (ev.y) 2091 || scrollBar.above_slider (ev.y)
1945 || scrollbar_below_slider (ev.y)) 2092 || scrollBar.below_slider (ev.y))
1946 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2093 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1947 2094
1948 scrollBar.setMotion (); 2095 scrollBar.state = SB_STATE_MOTION;
1949 break; 2096 break;
1950 2097
1951 case Button1: 2098 case Button1:
1952 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2099 if (scrollBar.align == SB_ALIGN_CENTRE)
1953 csrO = ev.y - scrollBar.top; 2100 csrO = ev.y - scrollBar.top;
1954 /* FALLTHROUGH */ 2101 /* FALLTHROUGH */
1955 2102
1956 case Button3: 2103 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 2104 if (scrollBar.style != SB_STYLE_XTERM)
1958 { 2105 {
1959 if (scrollbar_above_slider (ev.y)) 2106 if (scrollBar.above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 2107# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 2108 scr_page (UP, nrow - 1);
1962# else 2109# else
1963 scr_page (UP, TermWin.nrow / 4); 2110 scr_page (UP, nrow / 4);
1964# endif 2111# endif
1965 else if (scrollbar_below_slider (ev.y)) 2112 else if (scrollBar.below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 2113# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 2114 scr_page (DN, nrow - 1);
1968# else 2115# else
1969 scr_page (DN, TermWin.nrow / 4); 2116 scr_page (DN, nrow / 4);
1970# endif 2117# endif
1971 else 2118 else
1972 scrollBar.setMotion (); 2119 scrollBar.state = SB_STATE_MOTION;
1973 } 2120 }
1974 else 2121 else
1975 { 2122 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 2123 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 2124 (nrow
1978 * scrollbar_position (ev.y) 2125 * scrollBar.position (ev.y)
1979 / scrollbar_size ())); 2126 / scrollBar.size ()));
1980 } 2127 }
1981 2128
1982 break; 2129 break;
1983 } 2130 }
1984 } 2131 }
2132
1985 return; 2133 return;
1986 } 2134 }
1987#if MENUBAR
1988 /*
1989 * Menubar window processing of button press
1990 */
1991 if (isMenuBarWindow (ev.window))
1992 menubar_control (ev);
1993#endif
1994} 2135}
1995 2136
1996void 2137void
1997rxvt_term::button_release (XButtonEvent &ev) 2138rxvt_term::button_release (XButtonEvent &ev)
1998{ 2139{
… …
2000 2141
2001 csrO = 0; /* reset csr Offset */ 2142 csrO = 0; /* reset csr Offset */
2002 if (!bypass_keystate) 2143 if (!bypass_keystate)
2003 reportmode = !! (priv_modes & PrivMode_mouse_report); 2144 reportmode = !! (priv_modes & PrivMode_mouse_report);
2004 2145
2005 if (scrollbar_isUpDn ()) 2146 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2006 { 2147 {
2007 scrollBar.setIdle (); 2148 scrollBar.state = SB_STATE_IDLE;
2008 scrollbar_show (0); 2149 scrollBar.show (0);
2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2010 refresh_type &= ~SMOOTH_REFRESH;
2011#endif
2012 } 2150 }
2013 2151
2014#ifdef SELECTION_SCROLLING 2152#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2153 sel_scroll_ev.stop();
2017#endif 2154#endif
2018 2155
2019 if (ev.window == TermWin.vt) 2156 if (ev.window == vt)
2020 { 2157 {
2158 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2159 return;
2160
2021#if ISO_14755 2161#if ISO_14755
2022 // 5.4 2162 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2163 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2164 return;
2025#endif 2165#endif
2166
2026 if (reportmode) 2167 if (reportmode)
2027 { 2168 {
2028 /* mouse report from vt window */ 2169 /* mouse report from vt window */
2029 /* don't report release of wheel "buttons" */ 2170 /* don't report release of wheel "buttons" */
2030 if (ev.button >= 4) 2171 if (ev.button >= 4)
… …
2041 mouse_report (ev); 2182 mouse_report (ev);
2042 } 2183 }
2043#else /* MOUSE_REPORT_DOUBLECLICK */ 2184#else /* MOUSE_REPORT_DOUBLECLICK */
2044 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
2045 mouse_report (ev); 2186 mouse_report (ev);
2046#endif /* MOUSE_REPORT_DOUBLECLICK */ 2187#endif /* MOUSE_REPORT_DOUBLECLICK */
2047 return; 2188 return;
2048 } 2189 }
2049 2190
2050 /* 2191 /*
2051 * dumb hack to compensate for the failure of click-and-drag 2192 * dumb hack to compensate for the failure of click-and-drag
… …
2060 { 2201 {
2061 case Button1: 2202 case Button1:
2062 case Button3: 2203 case Button3:
2063 selection_make (ev.time); 2204 selection_make (ev.time);
2064 break; 2205 break;
2206
2065 case Button2: 2207 case Button2:
2066 selection_request (ev.time, ev.x, ev.y); 2208 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2209 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2067 break; 2210 break;
2211
2068#ifdef MOUSE_WHEEL 2212#ifdef MOUSE_WHEEL
2069 case Button4: 2213 case Button4:
2070 case Button5: 2214 case Button5:
2071 { 2215 {
2072 int i; 2216 int lines;
2073 page_dirn v; 2217 page_dirn dirn;
2074 2218
2075 v = ev.button == Button4 ? UP : DN; 2219 dirn = ev.button == Button4 ? UP : DN;
2076 2220
2077 if (ev.state & ShiftMask) 2221 if (ev.state & ShiftMask)
2078 i = 1; 2222 lines = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2223 else if (option (Opt_mouseWheelScrollPage))
2080 i = TermWin.nrow - 1; 2224 lines = nrow - 1;
2081 else 2225 else
2082 i = 5; 2226 lines = 5;
2083 2227
2084# ifdef MOUSE_SLIP_WHEELING 2228# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2229 if (ev.state & ControlMask)
2086 { 2230 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2231 mouse_slip_wheel_speed += dirn;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2232 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2089 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2090 2233
2091 if (slip_wheel_ev.at < NOW) 2234 if (!slip_wheel_ev.is_active ())
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2235 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2093
2094 slip_wheel_ev.start ();
2095 } 2236 }
2096 else 2237 else
2238# endif
2097 { 2239 {
2098# endif
2099# ifdef JUMP_MOUSE_WHEEL
2100 scr_page (v, i); 2240 scr_page (dirn, lines);
2101 scr_refresh (SMOOTH_REFRESH);
2102 scrollbar_show (1); 2241 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 } 2242 }
2113#endif
2114 } 2243 }
2115 break; 2244 break;
2116#endif 2245#endif
2117 } 2246 }
2118 } 2247 }
2119#ifdef MENUBAR
2120 else if (isMenuBarWindow (ev.window))
2121 menubar_control (ev);
2122#endif
2123} 2248}
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 2249
2606/*}}} */ 2250/*}}} */
2607 2251
2608bool 2252void ecb_hot
2609rxvt_term::cmd_parse () 2253rxvt_term::cmd_parse ()
2610{ 2254{
2611 bool flag = false;
2612 unicode_t ch = NOCHAR; 2255 wchar_t ch = NOCHAR;
2613 unsigned char *seq_begin; // remember start of esc-sequence here 2256 char *seq_begin; // remember start of esc-sequence here
2614 2257
2615 for (;;) 2258 for (;;)
2616 { 2259 {
2617 if (ch == NOCHAR) 2260 if (ecb_unlikely (ch == NOCHAR))
2618 { 2261 {
2619 seq_begin = cmdbuf_ptr; 2262 seq_begin = cmdbuf_ptr;
2620 ch = next_char (); 2263 ch = next_char ();
2621 }
2622 2264
2623 if (ch == NOCHAR) // TODO: improve 2265 if (ch == NOCHAR)
2624 break; 2266 break;
2267 }
2625 2268
2626 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2269 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2627 { 2270 {
2628 if (!seen_input) 2271 if (ecb_unlikely (!seen_input))
2629 { 2272 {
2630 seen_input = 1; 2273 seen_input = 1;
2631 // many badly-written programs (e.g. jed) contain a race condition: 2274 // many badly-written programs (e.g. jed) contain a race condition:
2632 // they first read the screensize and then install a SIGWINCH handler. 2275 // they first read the screensize and then install a SIGWINCH handler.
2633 // some window managers resize the window early, and these programs 2276 // some window managers resize the window early, and these programs
… …
2638 if (seen_resize && cmd_pid) 2281 if (seen_resize && cmd_pid)
2639 kill (-cmd_pid, SIGWINCH); 2282 kill (-cmd_pid, SIGWINCH);
2640 } 2283 }
2641 2284
2642 /* Read a text string from the input buffer */ 2285 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2286 wchar_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2287 bool refreshnow = false;
2645 int nlines = 0; 2288 int nlines = 0;
2646 unicode_t *str = buf; 2289 wchar_t *str = buf;
2290 wchar_t *eol = str + min (ncol, UBUFSIZ);
2647 2291
2648 for (;;) 2292 for (;;)
2649 { 2293 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2294 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2651 break; 2295 break;
2652 2296
2653 *str++ = ch; 2297 *str++ = ch;
2654 2298
2655 if (ch == C0_LF) 2299 if (ecb_unlikely (ch == C0_LF || str >= eol))
2656 { 2300 {
2301 if (ch == C0_LF)
2657 nlines++; 2302 nlines++;
2303
2658 refresh_count++; 2304 refresh_count++;
2659 2305
2660 if (!(options & Opt_jumpScroll) 2306 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2662 { 2307 {
2308 refresh_count = 0;
2309
2310 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2311 {
2663 refreshnow = true; 2312 refreshnow = true;
2664 ch = NOCHAR; 2313 ch = NOCHAR;
2665 break; 2314 break;
2315 }
2666 } 2316 }
2667 2317
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2318 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2319 if (nlines >= nrow - 1)
2670 { 2320 {
2321 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2322 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2323 scr_add_lines (buf, str - buf, nlines);
2324
2672 nlines = 0; 2325 nlines = 0;
2673 str = buf; 2326 str = buf;
2327 eol = str + min (ncol, UBUFSIZ);
2674 } 2328 }
2675 }
2676 2329
2677 if (str >= buf + UBUFSIZ) 2330 if (str >= eol)
2678 { 2331 {
2332 if (eol >= buf + UBUFSIZ)
2333 {
2679 ch = NOCHAR; 2334 ch = NOCHAR;
2680 break; 2335 break;
2336 }
2337 else
2338 eol = min (eol + ncol, buf + UBUFSIZ);
2339 }
2340
2681 } 2341 }
2682 2342
2683 seq_begin = cmdbuf_ptr; 2343 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2344 ch = next_char ();
2685 } 2345 }
2686 2346
2347 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2348 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2687 scr_add_lines (buf, nlines, str - buf); 2349 scr_add_lines (buf, str - buf, nlines);
2688 2350
2689 /* 2351 /*
2690 * If there have been a lot of new lines, then update the screen 2352 * 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. 2353 * 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 2354 * if skipScroll is enabled.
2693 * is incremented here because we must be doing flat-out scrolling.
2694 */ 2355 */
2695 if (refreshnow) 2356 if (refreshnow)
2696 { 2357 {
2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2698 refresh_limit++;
2699 else
2700 {
2701 flag = true;
2702 scr_refresh (refresh_type); 2358 scr_refresh ();
2703 } 2359 want_refresh = 1;
2704 } 2360 }
2705
2706 } 2361 }
2707 else 2362 else
2708 { 2363 {
2709 try 2364 try
2710 { 2365 {
… …
2718 } 2373 }
2719 2374
2720 ch = NOCHAR; 2375 ch = NOCHAR;
2721 } 2376 }
2722 } 2377 }
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} 2378}
2735 2379
2736// read the next character 2380// read the next character
2737unicode_t 2381wchar_t ecb_hot
2738rxvt_term::next_char () 2382rxvt_term::next_char () NOTHROW
2739{ 2383{
2740 while (cmdbuf_ptr < cmdbuf_endp) 2384 while (cmdbuf_ptr < cmdbuf_endp)
2741 { 2385 {
2742 // assume 7-bit to be ascii ALWAYS 2386 // assume 7-bit to be ascii ALWAYS
2743 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2387 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2744 return *cmdbuf_ptr++; 2388 return *cmdbuf_ptr++;
2745 2389
2746 wchar_t wc; 2390 wchar_t wc;
2747 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2391 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2748 2392
2749 if (len == (size_t)-2) 2393 if (len == (size_t)-2)
2750 { 2394 {
2751 // the mbstate stores incomplete sequences. didn't know this :/ 2395 // the mbstate stores incomplete sequences. didn't know this :/
2752 cmdbuf_ptr = cmdbuf_endp; 2396 cmdbuf_ptr = cmdbuf_endp;
2753 break; 2397 break;
2754 } 2398 }
2755 2399
2756 if (len == (size_t)-1) 2400 if (len == (size_t)-1)
2401 {
2402 mbstate.reset (); // reset now undefined conversion state
2403 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2404 // 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 2405 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2406 }
2758 2407
2759 // assume wchar == unicode 2408 // assume wchar == unicode
2760 cmdbuf_ptr += len; 2409 cmdbuf_ptr += len;
2761 return wc & UNICODE_MASK; 2410 return wc & UNICODE_MASK;
2762 } 2411 }
2763 2412
2764 return NOCHAR; 2413 return NOCHAR;
2765} 2414}
2766 2415
2767/* rxvt_cmd_getc () - Return next input character */ 2416// read the next octet
2768/* 2417uint32_t ecb_hot
2769 * Return the next input character after first passing any keyboard input 2418rxvt_term::next_octet () NOTHROW
2770 * to the command.
2771 */
2772unicode_t
2773rxvt_term::cmd_getc ()
2774{ 2419{
2420 return cmdbuf_ptr < cmdbuf_endp
2421 ? (unsigned char)*cmdbuf_ptr++
2422 : NOCHAR;
2423}
2424
2425static class out_of_input out_of_input;
2426
2427wchar_t ecb_hot
2428rxvt_term::cmd_getc () THROW ((class out_of_input))
2429{
2775 unicode_t c = next_char (); 2430 wchar_t c = next_char ();
2776 2431
2777 if (c == NOCHAR) 2432 if (c == NOCHAR)
2778 throw out_of_input; 2433 throw out_of_input;
2779 2434
2780 return c; 2435 return c;
2781} 2436}
2782 2437
2783unicode_t 2438uint32_t ecb_hot
2784rxvt_term::cmd_get8 () 2439rxvt_term::cmd_get8 () THROW ((class out_of_input))
2785{ 2440{
2786 unicode_t c = next_octet (); 2441 uint32_t c = next_octet ();
2787 2442
2788 if (c == NOCHAR) 2443 if (c == NOCHAR)
2789 throw out_of_input; 2444 throw out_of_input;
2790 2445
2791 return c; 2446 return c;
2792} 2447}
2793 2448
2794/*{{{ print pipe */ 2449/*{{{ print pipe */
2795/*----------------------------------------------------------------------*/ 2450/*----------------------------------------------------------------------*/
2796#ifdef PRINTPIPE 2451#ifdef PRINTPIPE
2797FILE * 2452FILE * ecb_cold
2798rxvt_term::popen_printer () 2453rxvt_term::popen_printer ()
2799{ 2454{
2800 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2455 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2801 2456
2802 if (stream == NULL) 2457 if (stream == NULL)
2803 rxvt_warn ("can't open printer pipe, not printing.\n"); 2458 rxvt_warn ("can't open printer pipe, not printing.\n");
2804 2459
2805 return stream; 2460 return stream;
2806} 2461}
2807 2462
2808int 2463int ecb_cold
2809rxvt_term::pclose_printer (FILE *stream) 2464rxvt_term::pclose_printer (FILE *stream)
2810{ 2465{
2811 fflush (stream); 2466 fflush (stream);
2812 return pclose (stream); 2467 return pclose (stream);
2813} 2468}
2814 2469
2815/* 2470/*
2816 * simulate attached vt100 printer 2471 * simulate attached vt100 printer
2817 */ 2472 */
2818void 2473void ecb_cold
2819rxvt_term::process_print_pipe () 2474rxvt_term::process_print_pipe ()
2820{ 2475{
2821 int done; 2476 FILE *fd = popen_printer ();
2822 FILE *fd;
2823 2477
2824 if ((fd = popen_printer ()) == NULL) 2478 if (!fd)
2825 return; 2479 return;
2826 2480
2827 /* 2481 /*
2828 * Send all input to the printer until either ESC[4i or ESC[?4i 2482 * Send all input to the printer until either ESC[4i or ESC[?4i
2829 * is received. 2483 * is received.
2830 */ 2484 */
2831 for (done = 0; !done;) 2485 for (int done = 0; !done; )
2832 { 2486 {
2833 unsigned char buf[8]; 2487 unsigned char buf[8];
2834 unicode_t ch; 2488 unicode_t ch;
2835 unsigned int i, len; 2489 unsigned int i, len;
2836 2490
… …
2855 { 2509 {
2856 if ((buf[len++] = cmd_getc ()) == 'i') 2510 if ((buf[len++] = cmd_getc ()) == 'i')
2857 break; /* done = 1 */ 2511 break; /* done = 1 */
2858 } 2512 }
2859 } 2513 }
2860 2514
2861 for (i = 0; i < len; i++) 2515 for (i = 0; i < len; i++)
2862 if (putc (buf[i], fd) == EOF) 2516 if (putc (buf[i], fd) == EOF)
2863 { 2517 {
2864 done = 1; 2518 done = 1;
2865 break; 2519 break;
… …
2867 } 2521 }
2868 } 2522 }
2869 2523
2870 pclose_printer (fd); 2524 pclose_printer (fd);
2871} 2525}
2872#endif /* PRINTPIPE */ 2526#endif /* PRINTPIPE */
2873/*}}} */ 2527/*}}} */
2874 2528
2875/* *INDENT-OFF* */
2876enum { 2529enum {
2877 C1_40 = 0x40, 2530 C1_40 = 0x40,
2878 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2531 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, 2532 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, 2533 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, 2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2882}; 2535};
2883/* *INDENT-ON* */
2884 2536
2885/*{{{ process non-printing single characters */ 2537/*{{{ process non-printing single characters */
2886void 2538void ecb_hot
2887rxvt_term::process_nonprinting (unicode_t ch) 2539rxvt_term::process_nonprinting (unicode_t ch)
2888{ 2540{
2889 switch (ch) 2541 switch (ch)
2890 { 2542 {
2891 case C0_ESC: 2543 case C0_ESC:
2892 process_escape_seq (); 2544 process_escape_seq ();
2893 break; 2545 break;
2894 case C0_ENQ: /* terminal Status */ 2546 case C0_ENQ: /* terminal Status */
2895 if (rs[Rs_answerbackstring]) 2547 if (rs[Rs_answerbackstring])
2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2548 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2898 else 2549 else
2899 tt_write ((unsigned char *)VT100_ANS, 2550 tt_write (VT100_ANS, strlen (VT100_ANS));
2900 (unsigned int)strlen (VT100_ANS));
2901 break; 2551 break;
2902 case C0_BEL: /* bell */ 2552 case C0_BEL: /* bell */
2903 scr_bell (); 2553 scr_bell ();
2904 break; 2554 break;
2905 case C0_BS: /* backspace */ 2555 case C0_BS: /* backspace */
… …
2929 process_dcs_seq (); 2579 process_dcs_seq ();
2930 break; 2580 break;
2931 case 0x9b: /* CSI */ 2581 case 0x9b: /* CSI */
2932 process_csi_seq (); 2582 process_csi_seq ();
2933 break; 2583 break;
2934 case 0x9d: /* CSI */ 2584 case 0x9d: /* OSC */
2935 process_osc_seq (); 2585 process_osc_seq ();
2936 break; 2586 break;
2937#endif 2587#endif
2938 } 2588 }
2939} 2589}
2940/*}}} */ 2590/*}}} */
2941 2591
2942 2592
2943/*{{{ process VT52 escape sequences */ 2593/*{{{ process VT52 escape sequences */
2944void 2594void ecb_cold
2945rxvt_term::process_escape_vt52 (unicode_t ch) 2595rxvt_term::process_escape_vt52 (unicode_t ch)
2946{ 2596{
2947 int row, col; 2597 int row, col;
2948 2598
2949 switch (ch) 2599 switch (ch)
… …
2983 break; 2633 break;
2984 case 'Z': /* identify the terminal type */ 2634 case 'Z': /* identify the terminal type */
2985 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2635 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2986 break; 2636 break;
2987 case '<': /* turn off VT52 mode */ 2637 case '<': /* turn off VT52 mode */
2988 PrivMode (0, PrivMode_vt52); 2638 priv_modes &= ~PrivMode_vt52;
2989 break; 2639 break;
2990 case 'F': /* use special graphics character set */ 2640 case 'F': /* use special graphics character set */
2991 case 'G': /* use regular character set */ 2641 case 'G': /* use regular character set */
2992 /* unimplemented */ 2642 /* unimplemented */
2993 break; 2643 break;
… …
2999} 2649}
3000/*}}} */ 2650/*}}} */
3001 2651
3002 2652
3003/*{{{ process escape sequences */ 2653/*{{{ process escape sequences */
3004void 2654void ecb_hot
3005rxvt_term::process_escape_seq () 2655rxvt_term::process_escape_seq ()
3006{ 2656{
3007 unicode_t ch = cmd_getc (); 2657 unicode_t ch = cmd_getc ();
3008 2658
3009 if (priv_modes & PrivMode_vt52) 2659 if (priv_modes & PrivMode_vt52)
… …
3012 return; 2662 return;
3013 } 2663 }
3014 2664
3015 switch (ch) 2665 switch (ch)
3016 { 2666 {
3017 /* case 1: do_tek_mode (); break; */
3018 case '#': 2667 case '#':
3019 if (cmd_getc () == '8') 2668 if (cmd_getc () == '8')
3020 scr_E (); 2669 scr_E ();
3021 break; 2670 break;
3022 case '(': 2671 case '(':
… …
3029 scr_charset_set (2, (unsigned int)cmd_getc ()); 2678 scr_charset_set (2, (unsigned int)cmd_getc ());
3030 break; 2679 break;
3031 case '+': 2680 case '+':
3032 scr_charset_set (3, (unsigned int)cmd_getc ()); 2681 scr_charset_set (3, (unsigned int)cmd_getc ());
3033 break; 2682 break;
3034#if ENABLE_FRILLS 2683#if !ENABLE_MINIMAL
3035 case '6': 2684 case '6':
3036 scr_backindex (); 2685 scr_backindex ();
3037 break; 2686 break;
3038#endif 2687#endif
3039 case '7': 2688 case '7':
3040 scr_cursor (SAVE); 2689 scr_cursor (SAVE);
3041 break; 2690 break;
3042 case '8': 2691 case '8':
3043 scr_cursor (RESTORE); 2692 scr_cursor (RESTORE);
3044 break; 2693 break;
3045#if ENABLE_FRILLS 2694#if !ENABLE_MINIMAL
3046 case '9': 2695 case '9':
3047 scr_forwardindex (); 2696 scr_forwardindex ();
3048 break; 2697 break;
3049#endif 2698#endif
2699 // DECPAM/DECPNM
3050 case '=': 2700 case '=':
2701 priv_modes |= PrivMode_aplKP;
2702 break;
3051 case '>': 2703 case '>':
3052 PrivMode ((ch == '='), PrivMode_aplKP); 2704 priv_modes &= ~PrivMode_aplKP;
3053 break; 2705 break;
3054 2706
3055 case C1_40: 2707 case C1_40:
3056 cmd_getc (); 2708 cmd_getc ();
3057 break; 2709 break;
… …
3060 break; 2712 break;
3061 2713
3062 /* 8.3.87: NEXT LINE */ 2714 /* 8.3.87: NEXT LINE */
3063 case C1_NEL: /* ESC E */ 2715 case C1_NEL: /* ESC E */
3064 { 2716 {
3065 unicode_t nlcr[] = { C0_LF, C0_CR }; 2717 wchar_t nlcr[] = { C0_LF, C0_CR };
3066 scr_add_lines (nlcr, 1, 2); 2718 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3067 } 2719 }
3068 break; 2720 break;
3069 2721
3070 /* kidnapped escape sequence: Should be 8.3.48 */ 2722 /* kidnapped escape sequence: Should be 8.3.48 */
3071 case C1_ESA: /* ESC G */ 2723 case C1_ESA: /* ESC G */
3072 process_graphics (); 2724 // used by original rxvt for rob nations own graphics mode
2725 if (cmd_getc () == 'Q')
2726 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3073 break; 2727 break;
3074 2728
3075 /* 8.3.63: CHARACTER TABULATION SET */ 2729 /* 8.3.63: CHARACTER TABULATION SET */
3076 case C1_HTS: /* ESC H */ 2730 case C1_HTS: /* ESC H */
3077 scr_set_tab (1); 2731 scr_set_tab (1);
… …
3081 case C1_RI: /* ESC M */ 2735 case C1_RI: /* ESC M */
3082 scr_index (DN); 2736 scr_index (DN);
3083 break; 2737 break;
3084 2738
3085 /* 8.3.142: SINGLE-SHIFT TWO */ 2739 /* 8.3.142: SINGLE-SHIFT TWO */
3086 /*case C1_SS2: scr_single_shift (2); break; */ 2740 /* case C1_SS2: break; */
3087 2741
3088 /* 8.3.143: SINGLE-SHIFT THREE */ 2742 /* 8.3.143: SINGLE-SHIFT THREE */
3089 /*case C1_SS3: scr_single_shift (3); break; */ 2743 /* case C1_SS3: break; */
3090 2744
3091 /* 8.3.27: DEVICE CONTROL STRING */ 2745 /* 8.3.27: DEVICE CONTROL STRING */
3092 case C1_DCS: /* ESC P */ 2746 case C1_DCS: /* ESC P */
3093 process_dcs_seq (); 2747 process_dcs_seq ();
3094 break; 2748 break;
3095 2749
3096 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2750 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3097 case C1_SCI: /* ESC Z */ 2751 case C1_SCI: /* ESC Z */
3098 tt_write ((const unsigned char *)ESCZ_ANSWER, 2752 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3099 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3100 break; /* steal obsolete ESC [ c */ 2753 break; /* steal obsolete ESC [ c */
3101 2754
3102 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2755 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3103 case C1_CSI: /* ESC [ */ 2756 case C1_CSI: /* ESC [ */
3104 process_csi_seq (); 2757 process_csi_seq ();
3105 break; 2758 break;
3106 2759
3107 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2760 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3108 case C1_OSC: /* ESC ] */ 2761 case C1_OSC: /* ESC ] */
3109 process_osc_seq (); 2762 process_osc_seq ();
3110 break; 2763 break;
3111 2764
3112 /* 8.3.106: RESET TO INITIAL STATE */ 2765 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3113 case 'c': 2766 case 'c':
3114 mbstate.reset (); 2767 mbstate.reset ();
3115 scr_poweron (); 2768 scr_poweron ();
3116 scrollbar_show (1); 2769 scrollBar.show (1);
3117 break; 2770 break;
3118 2771
3119 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2772 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3120 case 'n': 2773 case 'n':
3121 scr_charset_choose (2); 2774 scr_charset_choose (2);
… …
3128 } 2781 }
3129} 2782}
3130/*}}} */ 2783/*}}} */
3131 2784
3132/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2785/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3133/* *INDENT-OFF* */
3134enum { 2786enum {
3135 CSI_ICH = 0x40, 2787 CSI_ICH = 0x40,
3136 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2788 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 , 2789 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, 2790 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, 2793 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 , 2794 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 2795 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3144}; 2796};
3145 2797
3146#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2798#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3147 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2799 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3148 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2800 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3149#define get_byte_array_bit(array, bit) \ 2801#define get_byte_array_bit(array, bit) \
3150 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2802 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3151 2803
3152const unsigned char csi_defaults[] = 2804static const unsigned char csi_defaults[] =
3153 { 2805 {
3154 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2806 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, */ 2807 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, */ 2808 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, [, \, ], ^, _, */ 2809 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, */ 2810 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, */ 2811 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, */ 2812 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, {, |, }, ~, */ 2813 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3162 }; 2814 };
3163/* *INDENT-ON* */
3164 2815
3165void 2816void ecb_hot
3166rxvt_term::process_csi_seq () 2817rxvt_term::process_csi_seq ()
3167{ 2818{
3168 unicode_t ch, priv, i; 2819 unicode_t ch, priv, prev_ch, i;
3169 unsigned int nargs, p; 2820 unsigned int nargs, p;
3170 int n, ndef; 2821 int n, ndef;
3171 int arg[ESC_ARGS]; 2822 int arg[ESC_ARGS] = { };
3172 2823
3173 for (nargs = ESC_ARGS; nargs > 0;) 2824 nargs = 0;
3174 arg[--nargs] = 0;
3175 2825
3176 priv = 0; 2826 priv = 0;
3177 ch = cmd_getc (); 2827 ch = cmd_getc ();
3178 if (ch >= '<' && ch <= '?') 2828 if ((ch >= '<' && ch <= '?') || ch == '!')
2829 {
3179 { /* '<' '=' '>' '?' */ 2830 /* '<' '=' '>' '?' '!' */
3180 priv = ch; 2831 priv = ch;
3181 ch = cmd_getc (); 2832 ch = cmd_getc ();
3182 } 2833 }
3183 2834
2835 prev_ch = 0;
3184 /* read any numerical arguments */ 2836 /* read any numerical arguments */
3185 for (n = -1; ch < CSI_ICH; ) 2837 for (n = -1; ch < CSI_ICH; )
3186 { 2838 {
3187 if (isdigit (ch)) 2839 if (isdigit (ch))
3188 { 2840 {
… …
3198 n = -1; 2850 n = -1;
3199 } 2851 }
3200 else if (IS_CONTROL (ch)) 2852 else if (IS_CONTROL (ch))
3201 process_nonprinting (ch); 2853 process_nonprinting (ch);
3202 2854
2855 prev_ch = ch;
3203 ch = cmd_getc (); 2856 ch = cmd_getc ();
3204 } 2857 }
3205 2858
3206 if (ch > CSI_7F) 2859 if (ch > CSI_7F)
3207 return; 2860 return;
… …
3213 ndef = get_byte_array_bit (csi_defaults, i); 2866 ndef = get_byte_array_bit (csi_defaults, i);
3214 for (p = 0; p < nargs; p++) 2867 for (p = 0; p < nargs; p++)
3215 if (arg[p] == -1) 2868 if (arg[p] == -1)
3216 arg[p] = ndef; 2869 arg[p] = ndef;
3217 2870
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 /* 2871 /*
3226 * private mode handling 2872 * private mode handling
3227 */ 2873 */
3228 if (priv) 2874 if (priv)
3229 { 2875 {
3230 switch (priv) 2876 switch (priv)
3231 { 2877 {
3232 case '>': 2878 case '>':
3233 if (ch == CSI_DA) /* secondary device attributes */ 2879 if (ch == CSI_DA) /* secondary device attributes */
3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2880 {
2881 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2882 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2883 //
2884 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2885 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2886 // versions.
2887 //
2888 tt_printf ("\033[>%d;95;0c", 'U');
2889 }
3235 break; 2890 break;
2891
3236 case '?': 2892 case '?':
3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2893 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3238 process_terminal_mode (ch, priv, nargs, arg); 2894 process_terminal_mode (ch, priv, nargs, arg);
3239 break; 2895 break;
2896
2897 case '!':
2898 if (ch == CSI_70)
2899 {
2900 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2901 scr_soft_reset ();
2902
2903 static const int pm_h[] = { 7, 25 };
2904 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2905
2906 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2907 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3240 } 2908 }
2909 break;
2910 }
2911
3241 return; 2912 return;
3242 } 2913 }
3243 2914
3244 switch (ch) 2915 switch (ch)
3245 { 2916 {
… …
3259 } 2930 }
3260 break; 2931 break;
3261#endif 2932#endif
3262 2933
3263 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2934 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3264 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2935 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3265 arg[0] = -arg[0]; 2936 arg[0] = -arg[0];
3266 /* FALLTHROUGH */ 2937 /* FALLTHROUGH */
3267 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2938 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3268 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2939 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3269 scr_gotorc (arg[0], 0, RELATIVE); 2940 scr_gotorc (arg[0], 0, RELATIVE);
3270 break; 2941 break;
3271 2942
3272 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2943 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3273 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2944 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3344 3015
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3016 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3017 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3018 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3019 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3020 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3021 break;
3351 3022
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3023 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3024 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3354 (unsigned int) (sizeof (VT100_ANS) - 1));
3355 break; 3025 break;
3356 3026
3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3027 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3358 process_sgr_mode (nargs, arg); 3028 process_sgr_mode (nargs, arg);
3359 break; 3029 break;
… …
3366 break; 3036 break;
3367 case 6: /* CPR requested */ 3037 case 6: /* CPR requested */
3368 scr_report_position (); 3038 scr_report_position ();
3369 break; 3039 break;
3370 case 7: /* unofficial extension */ 3040 case 7: /* unofficial extension */
3371 if (options & Opt_insecure) 3041 if (option (Opt_insecure))
3372 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3042 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3373 break; 3043 break;
3374 case 8: /* unofficial extension */ 3044 case 8: /* unofficial extension */
3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3045 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3376 break; 3046 break;
… …
3424 scr_insert_mode (1); 3094 scr_insert_mode (1);
3425 else if (arg[0] == 20) 3095 else if (arg[0] == 20)
3426 priv_modes |= PrivMode_LFNL; 3096 priv_modes |= PrivMode_LFNL;
3427 break; 3097 break;
3428 3098
3099 case CSI_71: // DESCUSR: set cursor style
3100 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]);
3102 break;
3103
3429 /* 3104 /*
3430 * PRIVATE USE beyond this point. All CSI_7? sequences here 3105 * PRIVATE USE beyond this point. All CSI_7? sequences here
3431 */ 3106 */
3432 case CSI_72: /* DECSTBM: set top and bottom margins */ 3107 case CSI_72: /* DECSTBM: set top and bottom margins */
3433 if (nargs == 1) 3108 if (nargs == 1)
… …
3443 break; 3118 break;
3444 case CSI_75: 3119 case CSI_75:
3445 scr_cursor (RESTORE); 3120 scr_cursor (RESTORE);
3446 break; 3121 break;
3447 3122
3448#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3449 case CSI_74: 3124 case CSI_74:
3450 process_window_ops (arg, nargs); 3125 process_window_ops (arg, nargs);
3451 break; 3126 break;
3452#endif 3127#endif
3453 3128
… …
3460 break; 3135 break;
3461 } 3136 }
3462} 3137}
3463/*}}} */ 3138/*}}} */
3464 3139
3465#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3466/* ARGSUSED */
3467void 3141void
3468rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3142rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3469{ 3143{
3470 int x, y; 3144 int x, y;
3471 XWindowAttributes wattr; 3145 XWindowAttributes wattr;
3472 Window wdummy; 3146 Window wdummy;
3473 dDisp; 3147
3148 dLocal (Display *, dpy);
3474 3149
3475 if (nargs == 0) 3150 if (nargs == 0)
3476 return; 3151 return;
3477 3152
3478 switch (args[0]) 3153 switch (args[0])
3479 { 3154 {
3480 /* 3155 /*
3481 * commands 3156 * commands
3482 */ 3157 */
3483 case 1: /* deiconify window */ 3158 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3159 XMapWindow (dpy, parent);
3485 break; 3160 break;
3486 case 2: /* iconify window */ 3161 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3162 XIconifyWindow (dpy, parent, display->screen);
3488 break; 3163 break;
3489 case 3: /* set position (pixels) */ 3164 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3165 XMoveWindow (dpy, parent, args[1], args[2]);
3491 break; 3166 break;
3492 case 4: /* set size (pixels) */ 3167 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3168 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3169 break;
3495 case 5: /* raise window */ 3170 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3171 XRaiseWindow (dpy, parent);
3497 break; 3172 break;
3498 case 6: /* lower window */ 3173 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3174 XLowerWindow (dpy, parent);
3500 break; 3175 break;
3501 case 7: /* refresh window */ 3176 case 7: /* refresh window */
3502 scr_touch (true); 3177 scr_touch (true);
3503 break; 3178 break;
3504 case 8: /* set size (chars) */ 3179 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3180 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3181 (unsigned int) (args[1] * fheight));
3507 break; 3182 break;
3508 3183
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3184 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3185 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3186 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3187 set_widthheight ((unsigned int)vt_width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3188 (unsigned int) (args[1] * fheight));
3514 break; 3189 break;
3515
3516 3190
3517 /* 3191 /*
3518 * reports - some output format copied from XTerm 3192 * reports - some output format copied from XTerm
3519 */ 3193 */
3520 case 11: /* report window state */ 3194 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3196 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3197 break;
3524 case 13: /* report window position */ 3198 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3200 XTranslateCoordinates (dpy, parent, wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3201 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3202 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3203 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3204 break;
3531 case 14: /* report window size (pixels) */ 3205 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3207 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3208 break;
3535 case 18: /* report text area size (chars) */ 3209 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3210 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3211 break;
3538 case 19: /* report window size (chars) */ 3212 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3213 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3214 break;
3541 case 20: /* report icon label */ 3215 case 20: /* report icon label */
3542 { 3216 {
3543 char *s; 3217 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3218 XGetIconName (dpy, parent, &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3219 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3220 XFree (s);
3547 } 3221 }
3548 break; 3222 break;
3549 case 21: /* report window title */ 3223 case 21: /* report window title */
3550 { 3224 {
3551 char *s; 3225 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3226 XFetchName (dpy, parent, &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3227 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3228 XFree (s);
3555 } 3229 }
3556 break; 3230 break;
3557 } 3231 }
3558} 3232}
… …
3561/*----------------------------------------------------------------------*/ 3235/*----------------------------------------------------------------------*/
3562/* 3236/*
3563 * get input up until STRING TERMINATOR (or BEL) 3237 * get input up until STRING TERMINATOR (or BEL)
3564 * ends_how is terminator used. returned input must be free()'d 3238 * ends_how is terminator used. returned input must be free()'d
3565 */ 3239 */
3566unsigned char * 3240char *
3567rxvt_term::get_to_st (unicode_t &ends_how) 3241rxvt_term::get_to_st (unicode_t &ends_how)
3568{ 3242{
3569 unicode_t ch; 3243 unicode_t ch;
3570 bool seen_esc = false; 3244 bool seen_esc = false;
3571 unsigned int n = 0; 3245 unsigned int n = 0;
3572 wchar_t string[STRING_MAX]; 3246 wchar_t string[CBUFSIZ];
3573 3247
3574 while ((ch = cmd_getc ()) != NOCHAR) 3248 while ((ch = cmd_getc ()) != NOCHAR)
3575 { 3249 {
3576 if (seen_esc) 3250 if (seen_esc)
3577 { 3251 {
… …
3585 seen_esc = true; 3259 seen_esc = true;
3586 continue; 3260 continue;
3587 } 3261 }
3588 else if (ch == C0_BEL || ch == CHAR_ST) 3262 else if (ch == C0_BEL || ch == CHAR_ST)
3589 break; 3263 break;
3264 else if (ch == C0_SYN)
3265 ch = cmd_get8 ();
3590 else if (ch < 0x20) 3266 else if (ch < 0x20)
3591 return NULL; /* other control character - exit */ 3267 return NULL; /* other control character - exit */
3592 3268
3593 seen_esc = false; 3269 seen_esc = false;
3594 3270
3595 if (n >= STRING_MAX - 1) 3271 if (n >= sizeof (string) - 1)
3596 // stop at some sane length 3272 // stop at some sane length
3597 return NULL; 3273 return NULL;
3598 3274
3599 if (ch == C0_SYN)
3600 string[n++] = cmd_get8 ();
3601 else
3602 string[n++] = ch; 3275 string[n++] = ch;
3603 } 3276 }
3604 3277
3605 string[n++] = '\0'; 3278 string[n++] = '\0';
3606 3279
3607 ends_how = (ch == 0x5c ? C0_ESC : ch); 3280 ends_how = (ch == 0x5c ? C0_ESC : ch);
3608 3281
3609 return (unsigned char *)rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3610} 3283}
3611 3284
3612/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
3613/* 3286/*
3614 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3615 */ 3288 */
3616void 3289void
3617rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3618{ 3291{
3619 unsigned char *s;
3620 unicode_t eh;
3621
3622 /* 3292 /*
3623 * Not handled yet 3293 * Not handled yet
3624 */ 3294 */
3295
3296 unicode_t eh;
3625 s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3626 if (s) 3298 if (s)
3627 free (s); 3299 free (s);
3628 3300
3629 return; 3301 return;
3630} 3302}
… …
3634 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3635 */ 3307 */
3636void 3308void
3637rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3638{ 3310{
3639 unicode_t ch, eh;
3640 int arg; 3311 int arg;
3641 3312
3642 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3643 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3644 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3645 3316
3646 if (ch == ';') 3317 if (ch == ';')
3647 { 3318 {
3319 unicode_t eh;
3648 unsigned char *s = get_to_st (eh); 3320 char *s = get_to_st (eh);
3649 3321
3650 if (s) 3322 if (s)
3651 { 3323 {
3652 process_xterm_seq (arg, (char *)s, eh); 3324 process_xterm_seq (arg, s, eh);
3653 free (s); 3325 free (s);
3654 } 3326 }
3655 } 3327 }
3656} 3328}
3657 3329
3658void 3330void
3659rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3331rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3660{ 3332{
3661 if (str[0] == '?' && !str[1]) 3333 if (str[0] == '?' && !str[1])
3662 { 3334 {
3663 unsigned short r, g, b; 3335 rgba c;
3664 pix_colors_focused[color].get (display, r, g, b); 3336 pix_colors_focused[color].get (c);
3337
3338#if XFT
3339 if (c.a != rgba::MAX_CC)
3340 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3341 else
3342#endif
3665 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3343 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3666 } 3344 }
3667 else 3345 else
3668 set_window_color (color, str); 3346 set_window_color (color, str);
3669} 3347}
3670 3348
3671/* 3349/*
3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3350 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3673 */ 3351 */
3674void 3352void
3675rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3353rxvt_term::process_xterm_seq (int op, char *str, char resp)
3676{ 3354{
3677 int changed = 0;
3678 int color; 3355 int color;
3679 char *buf, *name; 3356 char *buf, *name;
3680 bool query = str[0] == '?' && !str[1]; 3357 bool query = str[0] == '?' && !str[1];
3681 int saveop = op; 3358 int saveop = op;
3682 dDisp; 3359
3360 dLocal (Display *, dpy);
3683 3361
3684 assert (str != NULL); 3362 assert (str != NULL);
3363
3364 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3365 return;
3366
3685 switch (op) 3367 switch (op)
3686 { 3368 {
3687 case XTerm_name: 3369 case XTerm_name:
3688 set_title (str); 3370 set_title (str);
3689 /* FALLTHROUGH */ 3371 /* FALLTHROUGH */
… …
3703 unsigned long bytes_after; 3385 unsigned long bytes_after;
3704 unsigned char *value = 0; 3386 unsigned char *value = 0;
3705 const char *str = ""; 3387 const char *str = "";
3706 3388
3707 if (prop 3389 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3390 && XGetWindowProperty (dpy, parent,
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3391 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3392 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3393 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3394 && actual_type != None
3713 && actual_format == 8) 3395 && actual_format == 8)
3714 str = (const char *)(value); 3396 str = (const char *)(value);
3715 3397
3716 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3398 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3717 3399
3718 XFree (value); 3400 XFree (value);
3719 } 3401 }
3720 else 3402 else
3721 { 3403 {
3722 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3404 char *eq = strchr (str, '=');
3723 3405
3724 if (eq) 3406 if (eq)
3725 { 3407 {
3726 *eq = 0; 3408 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3409 set_utf8_property (display->atom (str), eq + 1);
3728 } 3410 }
3729 else 3411 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3412 XDeleteProperty (dpy, parent,
3731 display->atom (str)); 3413 display->atom (str));
3732 } 3414 }
3733 break; 3415 break;
3734 3416
3735 case XTerm_Color: 3417 case XTerm_Color:
… …
3737 { 3419 {
3738 if ((name = strchr (buf, ';')) == NULL) 3420 if ((name = strchr (buf, ';')) == NULL)
3739 break; 3421 break;
3740 3422
3741 *name++ = '\0'; 3423 *name++ = '\0';
3742 color = atoi (buf); 3424 color = atoi (buf) + minCOLOR;
3743 3425
3744 if (color < 0 || color >= TOTAL_COLORS) 3426 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3745 break; 3427 break;
3746 3428
3747 if ((buf = strchr (name, ';')) != NULL) 3429 if ((buf = strchr (name, ';')) != NULL)
3748 *buf++ = '\0'; 3430 *buf++ = '\0';
3749 3431
3750 if (name[0] == '?' && !name[1]) 3432 process_color_seq (op, color, name, resp);
3433 }
3434 break;
3435 case Rxvt_restoreFG:
3436 case XTerm_Color00:
3437 process_color_seq (op, Color_fg, str, resp);
3438 break;
3439 case Rxvt_restoreBG:
3440 case XTerm_Color01:
3441 process_color_seq (op, Color_bg, str, resp);
3442 break;
3443#ifndef NO_CURSORCOLOR
3444 case XTerm_Color_cursor:
3445 process_color_seq (op, Color_cursor, str, resp);
3446 break;
3447#endif
3448 case XTerm_Color_pointer_fg:
3449 process_color_seq (op, Color_pointer_fg, str, resp);
3450 break;
3451 case XTerm_Color_pointer_bg:
3452 process_color_seq (op, Color_pointer_bg, str, resp);
3453 break;
3454#ifdef OPTION_HC
3455 case XTerm_Color_HC:
3456 process_color_seq (op, Color_HC, str, resp);
3457 break;
3458 case XTerm_Color_HTC:
3459 process_color_seq (op, Color_HTC, str, resp);
3460 break;
3461#endif
3462#ifndef NO_BOLD_UNDERLINE_REVERSE
3463 case URxvt_Color_BD:
3464 process_color_seq (op, Color_BD, str, resp);
3465 break;
3466 case URxvt_Color_UL:
3467 process_color_seq (op, Color_UL, str, resp);
3468 break;
3469 case URxvt_Color_IT:
3470 process_color_seq (op, Color_IT, str, resp);
3471 break;
3472#endif
3473 case URxvt_Color_border:
3474 process_color_seq (op, Color_border, str, resp);
3475 break;
3476
3477#if BG_IMAGE_FROM_ROOT
3478 case URxvt_Color_tint:
3479 process_color_seq (op, Color_tint, str, resp);
3480 {
3481 bool changed = false;
3482
3483 if (ISSET_PIXCOLOR (Color_tint))
3484 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3485
3486 if (changed)
3487 update_background ();
3488 }
3489
3490 break;
3491#endif
3492
3493#if BG_IMAGE_FROM_FILE
3494 case Rxvt_Pixmap:
3495 if (!strcmp (str, "?"))
3496 {
3497 char str[256];
3498 int h_scale = fimage.h_scale;
3499 int v_scale = fimage.v_scale;
3500 int h_align = fimage.h_align;
3501 int v_align = fimage.v_align;
3502
3503 sprintf (str, "[%dx%d+%d+%d]",
3504 h_scale, v_scale,
3505 h_align, v_align);
3506 process_xterm_seq (XTerm_title, str, CHAR_ST);
3507 }
3508 else
3509 {
3510 bool changed = false;
3511
3512 if (*str != ';')
3751 { 3513 {
3752 unsigned short r, g, b; 3514 try
3753 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3515 {
3754 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3516 fimage.set_file_geometry (this, str);
3517 changed = true;
3518 }
3519 catch (const class rxvt_failure_exception &e)
3520 {
3521 }
3755 } 3522 }
3756 else 3523 else
3757 set_window_color (color + minCOLOR, name); 3524 {
3525 str++;
3526 if (fimage.set_geometry (str, true))
3527 changed = true;
3528 }
3529
3530 if (changed)
3531 {
3532 if (bg_window_position_sensitive ())
3533 {
3534 int x, y;
3535 get_window_origin (x, y);
3536 parent_x = x;
3537 parent_y = y;
3538 }
3539 update_background ();
3540 }
3758 } 3541 }
3759 break; 3542 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 3543#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 3544
3833 case XTerm_logfile: 3545 case XTerm_logfile:
3834 // TODO, when secure mode? 3546 // TODO, when secure mode?
3835 break; 3547 break;
3836 3548
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 3549#if 0
3844 case XTerm_dumpscreen: /* no error notices */ 3550 case Rxvt_dumpscreen: /* no error notices */
3845 { 3551 {
3846 int fd; 3552 int fd;
3847 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3553 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3848 { 3554 {
3849 scr_dump (fd); 3555 scr_dump (fd);
… …
3860 case URxvt_italicFont: 3566 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3567 case URxvt_boldItalicFont:
3862#endif 3568#endif
3863 if (query) 3569 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3570 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3571 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3572 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3573 resp);
3868 else 3574 else
3869 { 3575 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3576 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3577
… …
3873 allocated.push_back ((void *)res); 3579 allocated.push_back ((void *)res);
3874 set_fonts (); 3580 set_fonts ();
3875 } 3581 }
3876 break; 3582 break;
3877 3583
3878#if ENABLE_FRILLS 3584 case URxvt_version:
3585 if (query)
3586 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3587 op,
3588 rs[Rs_name], VERSION[0], VERSION[2],
3589 resp);
3590 break;
3591
3592#if !ENABLE_MINIMAL
3879 case URxvt_locale: 3593 case URxvt_locale:
3880 if (query) 3594 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3595 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3882 else 3596 else
3883 { 3597 {
3884 set_locale (str); 3598 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8); 3599 pty->set_utf8_mode (enc_utf8);
3886 init_xlocale (); 3600 init_xlocale ();
3887 } 3601 }
3888 break; 3602 break;
3889 3603
3890 case URxvt_view_up: 3604 case URxvt_view_up:
3891 case URxvt_view_down: 3605 case URxvt_view_down:
3606 {
3892 int lines = atoi (str); 3607 int lines = atoi (str);
3893 3608
3894 if (lines) 3609 if (lines)
3895 scr_page (op == URxvt_view_up ? UP : DN, lines); 3610 scr_page (op == URxvt_view_up ? UP : DN, lines);
3896 else 3611 else
3897 {
3898 scr_erase_savelines (); 3612 scr_erase_savelines ();
3899 } 3613 }
3900 3614
3615 break;
3616#endif
3617
3618#if ENABLE_PERL
3619 case URxvt_perl:
3620 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3901 break; 3621 break;
3902#endif 3622#endif
3903 } 3623 }
3904} 3624}
3905/*----------------------------------------------------------------------*/ 3625/*----------------------------------------------------------------------*/
… …
3912 * 's' = save 3632 * 's' = save
3913 * 'r' = restore 3633 * 'r' = restore
3914 * 't' = toggle 3634 * 't' = toggle
3915 * so no need for fancy checking 3635 * so no need for fancy checking
3916 */ 3636 */
3917int 3637int ecb_cold
3918rxvt_term::privcases (int mode, unsigned long bit) 3638rxvt_term::privcases (int mode, unsigned long bit)
3919{ 3639{
3920 int state; 3640 int state;
3921 3641
3922 if (mode == 's') 3642 if (mode == 's')
3923 { 3643 {
3924 SavedModes |= (priv_modes & bit); 3644 if (priv_modes & bit)
3645 SavedModes |= bit;
3646 else
3647 SavedModes &= ~bit;
3925 return -1; 3648 return -1;
3926 } 3649 }
3927 else 3650 else
3928 { 3651 {
3929 if (mode == 'r') 3652 if (mode == 'r')
3930 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3653 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3931 else 3654 else
3932 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3655 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3933 PrivMode (state, bit); 3656
3657 if (state)
3658 priv_modes |= bit;
3659 else
3660 priv_modes &= ~bit;
3934 } 3661 }
3935 3662
3936 return state; 3663 return state;
3937} 3664}
3938 3665
3939/* we're not using priv _yet_ */ 3666/* we're not using priv _yet_ */
3940void 3667void
3941rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3668rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3942{ 3669{
3943 unsigned int i, j; 3670 unsigned int i, j;
3944 int state; 3671 int state;
3945 3672
3946 static const struct 3673 static const struct
3947 { 3674 {
3948 const int argval; 3675 const int argval;
3949 const unsigned long bit; 3676 const unsigned long bit;
3950 }
3951
3952 argtopriv[] = { 3677 } argtopriv[] = {
3953 { 1, PrivMode_aplCUR }, 3678 { 1, PrivMode_aplCUR }, // DECCKM
3954 { 2, PrivMode_vt52 }, 3679 { 2, PrivMode_vt52 }, // DECANM
3955 { 3, PrivMode_132 }, 3680 { 3, PrivMode_132 }, // DECCOLM
3956 { 4, PrivMode_smoothScroll }, 3681 { 4, PrivMode_smoothScroll }, // DECSCLM
3957 { 5, PrivMode_rVideo }, 3682 { 5, PrivMode_rVideo }, // DECSCNM
3958 { 6, PrivMode_relOrigin }, 3683 { 6, PrivMode_relOrigin }, // DECOM
3959 { 7, PrivMode_Autowrap }, 3684 { 7, PrivMode_Autowrap }, // DECAWM
3960 // 8, bi-directional support mode 3685 // 8, auto-repeat keys // DECARM
3961 { 9, PrivMode_MouseX10 }, 3686 { 9, PrivMode_MouseX10 },
3962#ifdef menuBar_esc 3687 // 18 end FF to printer after print screen
3963 { menuBar_esc, PrivMode_menuBar }, 3688 // 19 Print screen prints full screen/scroll region
3964#endif
3965 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor }, 3689 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3967#ifdef scrollBar_esc 3690#ifdef scrollBar_esc
3968 { scrollBar_esc, PrivMode_scrollBar }, 3691 { scrollBar_esc, PrivMode_scrollBar },
3969#endif 3692#endif
3970 { 35, PrivMode_ShiftKeys }, // rxvt extension 3693 { 35, PrivMode_ShiftKeys }, // rxvt extension
3694 // 38, tektronix mode // DECTEK
3971 { 40, PrivMode_132OK }, 3695 { 40, PrivMode_132OK },
3972 // 41 xterm more fixes NYI 3696 // 41 xterm more fixes NYI
3973 // 45 margin bell NYI 3697 // 45 margin bell NYI
3974 // 46 start logging 3698 // 46 start logging
3975 { 47, PrivMode_Screen }, 3699 { 47, PrivMode_Screen },
3976 { 66, PrivMode_aplKP }, 3700 { 66, PrivMode_aplKP }, // DECNKM
3977#ifndef NO_BACKSPACE_KEY 3701#ifndef NO_BACKSPACE_KEY
3978 { 67, PrivMode_BackSpace }, 3702 { 67, PrivMode_BackSpace }, // DECBKM
3979#endif 3703#endif
3980 { 1000, PrivMode_MouseX11 }, 3704 { 1000, PrivMode_MouseX11 },
3981 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3705 { 1002, PrivMode_MouseBtnEvent },
3982 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3706 { 1003, PrivMode_MouseAnyEvent },
3983 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3707#if ENABLE_FRILLS
3708 { 1005, PrivMode_ExtModeMouse },
3709#endif
3984 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3710 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3985 { 1011, PrivMode_Keypress }, // rxvt extension 3711 { 1011, PrivMode_Keypress }, // rxvt extension
3712#if ENABLE_FRILLS
3713 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3714#endif
3986 // 1035 enable modifiers for alt, numlock NYI 3715 // 1035 enable modifiers for alt, numlock NYI
3987 // 1036 send ESC for meta keys NYI 3716 // 1036 send ESC for meta keys NYI
3988 // 1037 send DEL for keypad delete NYI 3717 // 1037 send DEL for keypad delete NYI
3989 { 1047, PrivMode_Screen }, 3718 { 1047, PrivMode_Screen },
3990 // 1048 save and restore cursor 3719 // 1048 save and restore cursor, implemented in code
3991 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3720 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3992 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3721 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3722 { 2004, PrivMode_BracketPaste },
3993 }; 3723 };
3994 3724
3995 if (nargs == 0) 3725 if (nargs == 0)
3996 return; 3726 return;
3997 3727
… …
4004 for (i = 0; i < nargs; i++) 3734 for (i = 0; i < nargs; i++)
4005 { 3735 {
4006 state = -1; 3736 state = -1;
4007 3737
4008 /* basic handling */ 3738 /* basic handling */
4009 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3739 for (j = 0; j < ecb_array_length (argtopriv); j++)
4010 if (argtopriv[j].argval == arg[i]) 3740 if (argtopriv[j].argval == arg[i])
4011 { 3741 {
4012 state = privcases (mode, argtopriv[j].bit); 3742 state = privcases (mode, argtopriv[j].bit);
4013 break; 3743 break;
4014 } 3744 }
4015 3745
4016 /* extra handling for values with state unkept */ 3746 /* extra handling for values with state unkept */
4017 switch (arg[i]) 3747 switch (arg[i])
4018 { 3748 {
3749#if ENABLE_STYLES
3750 case 1021:
3751 set_option (Opt_intensityStyles, mode);
3752
3753 scr_touch (true);
3754 break;
3755#endif
4019 case 1048: /* alternative cursor save */ 3756 case 1048: /* alternative cursor save */
4020 case 1049:
4021 if (options & Opt_secondaryScreen) 3757 if (option (Opt_secondaryScreen))
4022 if (mode == 0) 3758 if (mode == 0)
4023 scr_cursor (RESTORE); 3759 scr_cursor (RESTORE);
4024 else if (mode == 1) 3760 else if (mode == 1)
4025 scr_cursor (SAVE); 3761 scr_cursor (SAVE);
4026 break; 3762 break;
… …
4034 case 2: /* VT52 mode */ 3770 case 2: /* VT52 mode */
4035 /* oddball mode. should be set regardless of set/reset 3771 /* oddball mode. should be set regardless of set/reset
4036 * parameter. Return from VT52 mode with an ESC < from 3772 * parameter. Return from VT52 mode with an ESC < from
4037 * within VT52 mode 3773 * within VT52 mode
4038 */ 3774 */
4039 PrivMode (1, PrivMode_vt52); 3775 priv_modes |= PrivMode_vt52;
4040 break; 3776 break;
4041 case 3: /* 80/132 */ 3777 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 3778 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3779 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4044 break; 3780 break;
4045 case 4: /* smooth scrolling */ 3781 case 4: /* smooth scrolling */
4046 if (state)
4047 options &= ~Opt_jumpScroll;
4048 else
4049 options |= Opt_jumpScroll; 3782 set_option (Opt_jumpScroll, !state);
4050 break; 3783 break;
4051 case 5: /* reverse video */ 3784 case 5: /* reverse video */
4052 scr_rvideo_mode (state); 3785 scr_rvideo_mode (state);
4053 break; 3786 break;
4054 case 6: /* relative/absolute origins */ 3787 case 6: /* relative/absolute origins */
… …
4058 scr_autowrap (state); 3791 scr_autowrap (state);
4059 break; 3792 break;
4060 /* case 8: - auto repeat, can't do on a per window basis */ 3793 /* case 8: - auto repeat, can't do on a per window basis */
4061 case 9: /* X10 mouse reporting */ 3794 case 9: /* X10 mouse reporting */
4062 if (state) /* orthogonal */ 3795 if (state) /* orthogonal */
4063 priv_modes &= ~PrivMode_MouseX11; 3796 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4064 break; 3797 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 3798#ifdef scrollBar_esc
4073 case scrollBar_esc: 3799 case scrollBar_esc:
4074 if (scrollbar_mapping (state)) 3800 scrollBar.map (state);
4075 {
4076 resize_all_windows (0, 0, 0); 3801 resize_all_windows (0, 0, 0);
4077 scr_touch (true); 3802 scr_touch (true);
4078 }
4079 break; 3803 break;
4080#endif 3804#endif
4081 case 25: /* visible/invisible cursor */ 3805 case 25: /* visible/invisible cursor */
4082 scr_cursor_visible (state); 3806 scr_cursor_visible (state);
4083 break; 3807 break;
… …
4088 break; 3812 break;
4089 /* case 66: - application key pad */ 3813 /* case 66: - application key pad */
4090 /* case 67: - backspace key */ 3814 /* case 67: - backspace key */
4091 case 1000: /* X11 mouse reporting */ 3815 case 1000: /* X11 mouse reporting */
4092 if (state) /* orthogonal */ 3816 if (state) /* orthogonal */
4093 priv_modes &= ~PrivMode_MouseX10; 3817 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4094 break; 3818 break;
4095#if 0
4096 case 1001: 3819 case 1002:
4097 break; /* X11 mouse highlighting */ 3820 case 1003:
4098#endif 3821 if (state)
3822 {
3823 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3824 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3825 mouse_row = mouse_col = 0;
3826 vt_emask_mouse = PointerMotionMask;
3827 }
3828 else
3829 vt_emask_mouse = NoEventMask;
3830
3831 vt_select_input ();
3832 break;
4099 case 1010: /* scroll to bottom on TTY output inhibit */ 3833 case 1010: /* scroll to bottom on TTY output inhibit */
4100 if (state)
4101 options &= ~Opt_scrollTtyOutput;
4102 else
4103 options |= Opt_scrollTtyOutput; 3834 set_option (Opt_scrollTtyOutput, !state);
4104 break; 3835 break;
4105 case 1011: /* scroll to bottom on key press */ 3836 case 1011: /* scroll to bottom on key press */
4106 if (state)
4107 options |= Opt_scrollTtyKeypress; 3837 set_option (Opt_scrollTtyKeypress, state);
4108 else
4109 options &= ~Opt_scrollTtyKeypress;
4110 break; 3838 break;
4111 case 1047: /* secondary screen w/ clearing last */ 3839 case 1047: /* secondary screen w/ clearing last */
4112 if (options & Opt_secondaryScreen) 3840 if (option (Opt_secondaryScreen))
4113 if (current_screen != PRIMARY) 3841 if (!state)
4114 scr_erase_screen (2); 3842 scr_erase_screen (2);
3843
4115 scr_change_screen (state); 3844 scr_change_screen (state);
4116 break; 3845 break;
4117 case 1049: /* secondary screen w/ clearing first */ 3846 case 1049: /* secondary screen w/ clearing first */
3847 if (option (Opt_secondaryScreen))
3848 if (state)
3849 scr_cursor (SAVE);
3850
4118 scr_change_screen (state); 3851 scr_change_screen (state);
3852
4119 if (options & Opt_secondaryScreen) 3853 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 3854 if (state)
4121 scr_erase_screen (2); 3855 scr_erase_screen (2);
3856 else
3857 scr_cursor (RESTORE);
4122 break; 3858 break;
4123 default: 3859 default:
4124 break; 3860 break;
4125 } 3861 }
4126 } 3862 }
4127} 3863}
4128/*}}} */ 3864/*}}} */
4129 3865
4130/*{{{ process sgr sequences */ 3866/*{{{ process sgr sequences */
4131void 3867void ecb_hot
4132rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3868rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4133{ 3869{
4134 unsigned int i; 3870 unsigned int i;
4135 short rendset; 3871 short rendset;
4136 int rendstyle; 3872 int rendstyle;
… …
4252 scr_color (Color_bg, Color_bg); 3988 scr_color (Color_bg, Color_bg);
4253 break; 3989 break;
4254 3990
4255 //case 50: // not variable spacing 3991 //case 50: // not variable spacing
4256 3992
4257#ifndef NO_BRIGHTCOLOR 3993#if !ENABLE_MINIMAL
4258 case 90: 3994 case 90:
4259 case 91: /* set bright fg color */ 3995 case 91: /* set bright fg color */
4260 case 92: 3996 case 92:
4261 case 93: 3997 case 93:
4262 case 94: 3998 case 94:
… …
4274 case 106: 4010 case 106:
4275 case 107: 4011 case 107:
4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4012 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4277 break; 4013 break;
4278#endif 4014#endif
4279
4280 } 4015 }
4281 } 4016 }
4017}
4018
4019void
4020rxvt_term::set_cursor_style (int style)
4021{
4022 if (!IN_RANGE_INC (style, 0, 4))
4023 return;
4024
4025 set_option (Opt_cursorUnderline, style >= 3);
4026
4027#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1));
4029 cursor_blink_reset ();
4030#endif
4031
4032 want_refresh = 1;
4282} 4033}
4283/*}}} */ 4034/*}}} */
4284 4035
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/* ------------------------------------------------------------------------- */ 4036/* ---------------------------------------------------------------------- */
4037/* Write data to the pty as typed by the user, pasted with the mouse,
4038 * or generated by us in response to a query ESC sequence.
4039 */
4304 4040
4305/* 4041/*
4306 * Send printf () formatted output to the command. 4042 * Send printf () formatted output to the command.
4307 * Only use for small amounts of data. 4043 * Only use for small amounts of data.
4308 */ 4044 */
4309void 4045void
4310rxvt_term::tt_printf (const char *fmt,...) 4046rxvt_term::tt_printf (const char *fmt,...)
4311{ 4047{
4312 va_list arg_ptr; 4048 va_list arg_ptr;
4313 unsigned char buf[256]; 4049 char buf[256];
4314 4050
4315 va_start (arg_ptr, fmt); 4051 va_start (arg_ptr, fmt);
4316 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4052 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4317 va_end (arg_ptr); 4053 va_end (arg_ptr);
4318 tt_write (buf, strlen (buf)); 4054 tt_write (buf, strlen (buf));
4319} 4055}
4320 4056
4321/* ---------------------------------------------------------------------- */
4322/* Write data to the pty as typed by the user, pasted with the mouse, 4057/* 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 4058void
4328rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4059rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4329{ 4060{
4061 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4062 return;
4063
4064 if (option (Opt_scrollTtyKeypress))
4065 if (view_start)
4066 {
4067 view_start = 0;
4068 want_refresh = 1;
4069 }
4070
4071 tt_write_ (data, len);
4072}
4073
4074void
4075rxvt_term::tt_write (const char *data, unsigned int len)
4076{
4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4078 return;
4079
4080 tt_write_ (data, len);
4081}
4082
4083static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4084
4085void
4086rxvt_term::tt_write_ (const char *data, unsigned int len)
4087{
4088 if (pty->pty < 0)
4089 return;
4090
4330 if (v_buflen == 0) 4091 if (v_buflen == 0)
4331 { 4092 {
4332 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4093 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4333 4094
4095 max_it (written, 0);
4096
4334 if ((unsigned int)written == len) 4097 if (written == len)
4335 return; 4098 return;
4336 4099
4337 data += written; 4100 data += written;
4338 len -= written; 4101 len -= written;
4339 } 4102 }
4340 4103
4341 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4104 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4342 4105
4343 memcpy (v_buffer + v_buflen, data, len); 4106 memcpy (v_buffer + v_buflen, data, len);
4344 v_buflen += len; 4107 v_buflen += len;
4345 4108
4346 pty_ev.set (EVENT_READ | EVENT_WRITE); 4109 pty_ev.set (ev::READ | ev::WRITE);
4347} 4110}
4348 4111
4349void rxvt_term::pty_write () 4112void rxvt_term::pty_write ()
4350{ 4113{
4351 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4114 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4352 4115
4353 if (written > 0) 4116 if (written > 0)
4354 { 4117 {
4355 v_buflen -= written; 4118 v_buflen -= written;
4356 4119
4357 if (v_buflen == 0) 4120 if (v_buflen == 0)
4358 { 4121 {
4359 free (v_buffer); 4122 free (v_buffer);
4360 v_buffer = 0; 4123 v_buffer = 0;
4361 v_buflen = 0;
4362 4124
4363 pty_ev.set (EVENT_READ); 4125 pty_ev.set (ev::READ);
4364 return; 4126 return;
4365 } 4127 }
4366 4128
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4129 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4130 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4131 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4132 pty_ev.set (ev::READ);
4371 destroy ();
4372} 4133}
4373 4134
4374/*----------------------- end-of-file (C source) -----------------------*/ 4135/*----------------------- end-of-file (C source) -----------------------*/
4375 4136

Diff Legend

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