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

Diff Legend

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