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.420 by root, Wed Oct 15 14:48:22 2008 UTC

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

Diff Legend

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