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.539 by sf-exg, Tue Apr 16 08:44:45 2013 UTC

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

Diff Legend

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