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

Diff Legend

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