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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

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

Diff Legend

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