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

Diff Legend

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