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

Diff Legend

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