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.97 by root, Mon Jul 26 18:01:19 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 want_refresh = 1;
667 } 998 }
668#endif 999#endif
669 1000
670 if (want_refresh) 1001 if (want_refresh)
671 { 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
672 scr_refresh (refresh_type); 1041 scr_refresh ();
673 scrollbar_show (1); 1042 scrollbar_show (1);
674#ifdef USE_XIM 1043#ifdef USE_XIM
675 IMSendSpot (); 1044 IMSendSpot ();
676#endif 1045#endif
677 } 1046 }
678 1047
679 display->flush (); 1048 display->flush ();
680} 1049}
681 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
682void 1052void
683rxvt_term::check_cb (check_watcher &w) 1053rxvt_term::refresh_check ()
684{ 1054{
685 SET_R (this); 1055 if (want_refresh && !flush_ev.is_active ())
686 SET_LOCALE (locale); 1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
687 1057
1058 display->flush ();
1059}
1060
1061void
1062rxvt_term::flush_cb (ev::timer &w, int revents)
1063{
1064 make_current ();
1065
1066 refresh_count = 0;
688 flush (); 1067 flush ();
689} 1068}
690 1069
691#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
692void 1071void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
694{ 1073{
695 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1075 want_refresh = 1;
697 1076 refresh_check ();
698 w.start (w.at + BLINK_INTERVAL);
699} 1077}
700#endif 1078#endif
701 1079
702#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
703void 1081void
704rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
705{ 1083{
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 1085 {
708 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
709 want_refresh = 1; 1087 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
711 } 1089 }
1090 else
1091 w.stop ();
712} 1092}
713#endif 1093#endif
714 1094
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void 1096void
717rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
718{ 1098{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
721 { 1101 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1102 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
725 } 1104 }
1105 else
1106 w.stop ();
726} 1107}
727#endif 1108#endif
728 1109
729#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
730void 1111void
731rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
732{ 1113{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1115 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1117 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
739 } 1119 }
1120 else
1121 w.stop ();
740} 1122}
741#endif 1123#endif
742 1124
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void 1126void
745rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
746{ 1128{
747 if (mouse_slip_wheel_speed == 0 1129 if (scr_changeview (view_start - mouse_slip_wheel_speed))
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1130 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1131 want_refresh = 1;
753 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)
754 } 1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1139 }
755} 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;
756#endif 1166#endif
757 1167
758bool 1168bool
759rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
760{ 1170{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1172
763 if (CBUFSIZ == n) 1173 if (CBUFSIZ == n)
764 { 1174 {
765 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");
766 n = 0; 1176 n = 0;
767 } 1177 }
768 1178
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1179 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1180 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1181 cmdbuf_endp = cmdbuf_ptr + n;
772 1182
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
774 1184
775 if (n > 0) 1185 if (r > 0)
776 { 1186 {
777 cmdbuf_endp += n; 1187 cmdbuf_endp += r;
778 return true; 1188 return true;
779 } 1189 }
780 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))
781 destroy (); 1202 destroy ();
782 1203 }
1204
783 return false; 1205 return false;
784} 1206}
785 1207
786void 1208void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
788{ 1210{
789 SET_R (this); 1211 make_current ();
790 SET_LOCALE (locale);
791 1212
792 if (revents & EVENT_WRITE) 1213 if (revents & ev::READ)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1215 while (pty_fill ())
797 if (cmd_parse ()) 1216 if (cmd_parse ())
798 break; 1217 break;
1218
1219 if (revents & ev::WRITE)
1220 pty_write ();
1221
1222 refresh_check ();
1223}
1224
1225void
1226rxvt_term::pointer_unblank ()
1227{
1228 XDefineCursor (dpy, vt, TermWin_cursor);
1229 recolour_cursor ();
1230
1231#ifdef POINTER_BLANK
1232 hidden_pointer = 0;
1233
1234 if (option (Opt_pointerBlank))
1235 pointer_ev.start (pointerBlankDelay);
1236#endif
799} 1237}
800 1238
801#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
802void 1240void
803rxvt_term::pointer_unblank () 1241rxvt_term::pointer_blank ()
804{ 1242{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1243 if (!option (Opt_pointerBlank))
806 recolour_cursor (); 1244 return;
807 1245
1246 XDefineCursor (dpy, vt, display->blank_cursor);
1247 XFlush (dpy);
1248
808 hidden_pointer = 0; 1249 hidden_pointer = 1;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812} 1250}
813 1251
814void 1252void
815rxvt_term::pointer_blank () 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
816{ 1254{
817 if (! (Options & Opt_pointerBlank)) 1255 make_current ();
818 return;
819
820 XDefineCursor (display->display, TermWin.vt, blank_cursor);
821 XFlush (display->display);
822
823 hidden_pointer = 1;
824}
825
826void
827rxvt_term::pointer_cb (time_watcher &w)
828{
829 SET_R (this);
830 SET_LOCALE (locale);
831 1256
832 pointer_blank (); 1257 pointer_blank ();
833} 1258}
834#endif 1259#endif
835 1260
836void 1261void
837rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
838{ 1263{
839 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
840 int x, y; 1265 int x, y;
1266 int code = 32;
841 1267
842 x = ev.x; 1268 x = Pixel2Col (ev.x);
843 y = ev.y; 1269 y = Pixel2Row (ev.y);
844 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 }
845 1278
846 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1280 button_number = 3;
849 }
850 else 1281 else
851 { 1282 {
852 button_number = MEvent.button - Button1; 1283 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1284 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1285 if (button_number >= 3)
855 button_number += (64 - 3); 1286 button_number += (64 - 3);
856 } 1287 }
857 1288
858 if (PrivateModes & PrivMode_MouseX10) 1289 if (priv_modes & PrivMode_MouseX10)
859 { 1290 {
860 /* 1291 /*
861 * do not report ButtonRelease 1292 * do not report ButtonRelease
862 * no state info allowed 1293 * no state info allowed
863 */ 1294 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1309 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1310 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1311#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1312 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1313#endif
883
884 } 1314 }
885 1315
886#ifdef DEBUG_MOUSEREPORT 1316#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1317 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1318 if (key_state & 16)
889 fputc ('C', stderr); 1319 fputc ('C', stderr);
890 if (key_state & 4) 1320 if (key_state & 4)
891 fputc ('S', stderr); 1321 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1325 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1326 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1327 button_number,
898 x + 1, 1328 x + 1,
899 y + 1); 1329 y + 1);
900#else 1330#endif
1331
901 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1333 (code + button_number + key_state),
903 (32 + x + 1), 1334 (32 + x + 1),
904 (32 + y + 1)); 1335 (32 + y + 1));
905#endif
906} 1336}
907
908#ifdef USING_W11LIB
909void
910rxvt_W11_process_x_event (XEvent *ev)
911{
912 rxvt_t *r = rxvt_get_r ();
913
914 x_cb (*ev);
915}
916#endif
917 1337
918/*{{{ process an X event */ 1338/*{{{ process an X event */
919void 1339void
920rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
921{ 1341{
922 SET_R (this); 1342 make_current ();
923 SET_LOCALE (locale);
924 1343
925#if defined(CURSOR_BLINK) 1344 dLocal (Display *, dpy);
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
927 {
928 if (hidden_cursor)
929 {
930 hidden_cursor = 0;
931 want_refresh = 1;
932 }
933 1345
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1346 if (ev.xany.window == vt
935 } 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
936#endif 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
937
938#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 {
941 if (ev.type == MotionNotify
942 || ev.type == ButtonPress
943 || ev.type == ButtonRelease)
944 if (hidden_pointer)
945 pointer_unblank ();
946
947 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank ();
949 }
950#endif
951
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return; 1349 return;
955#endif
956 1350
1351 // for XQueryPointer
957 Window unused_root, unused_child; 1352 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1353 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1354 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1355
1010 switch (ev.type) 1356 switch (ev.type)
1011 { 1357 {
1012 case KeyPress: 1358 case KeyPress:
1013 lookup_key (ev.xkey); 1359 key_press (ev.xkey);
1014 break; 1360 break;
1015 1361
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease: 1362 case KeyRelease:
1018 { 1363 key_release (ev.xkey);
1019 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0;
1028 }
1029 break; 1364 break;
1030 }
1031#endif
1032 1365
1033 case ButtonPress: 1366 case ButtonPress:
1034 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1035 break; 1368 break;
1036 1369
… …
1038 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1039 break; 1372 break;
1040 1373
1041 case ClientMessage: 1374 case ClientMessage:
1042 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1376 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1044 destroy ();
1045#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink))
1051 { 1377 {
1052 /* Get Dnd data */ 1378 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1053 Atom ActualType; 1379 {
1054 int ActualFormat; 1380 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1055 unsigned char *data; 1381 {
1056 unsigned long Size, RemainingBytes; 1382 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1057 1383 {
1058 XGetWindowProperty (display->display, display->root, 1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1059 xa[XA_DNDSELECTION], 1385 destroy ();
1060 0L, 1000000L, 1386 }
1061 False, AnyPropertyType, 1387#if ENABLE_EWMH
1062 &ActualType, &ActualFormat, 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1063 &Size, &RemainingBytes, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1064 &data); 1391 &ev);
1065 XChangeProperty (display->display, display->root, 1392#endif
1066 XA_CUT_BUFFER0, XA_STRING, 1393 }
1067 8, PropModeReplace, 1394 }
1068 data, STRLEN (data)); 1395#if ENABLE_XEMBED
1069 XFree (data); 1396 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1397 {
1071 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
1072 } 1404 }
1073#endif /* OFFIX_DND */
1074 break;
1075
1076 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping));
1078 break; 1405 break;
1079 1406
1080 /* 1407 /*
1081 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1101 break; 1428 break;
1102 } 1429 }
1103 break; 1430 break;
1104 1431
1105 case FocusIn: 1432 case FocusIn:
1106 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])
1107 { 1451 {
1108 TermWin.focus = 1; 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1109 want_refresh = 1;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118
1119 } 1453 ;
1120 break;
1121 1454
1122 case FocusOut: 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1123 if (TermWin.focus)
1124 { 1456 {
1125 TermWin.focus = 0; 1457 seen_resize = 1;
1126 want_refresh = 1; 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break;
1139
1140 case ConfigureNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0])
1142 {
1143 int height, width;
1144
1145 do
1146 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 } 1459 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152
1153 if (szHint.width != width || szHint.height != height)
1154 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1156 resize_all_windows (width, height, 1);
1157 }
1158#ifdef DEBUG_SIZE
1159 else 1460 else
1160 { 1461 {
1161 D_SIZE ((stderr, "Size: Not resizing")); 1462#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped)
1466 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif
1162 } 1471 }
1163#endif 1472
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1165 if (Options & Opt_transparent)
1166 {
1167 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif
1172 } 1474 }
1475 break;
1476
1477 case PropertyNotify:
1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1173 break; 1483 break;
1174 1484
1175 case SelectionClear: 1485 case SelectionClear:
1176 selection_clear (); 1486 selection_clear ();
1177 break; 1487 break;
1178 1488
1179 case SelectionNotify: 1489 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1492 break;
1184 1493
1185 case SelectionRequest: 1494 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1187 break; 1496 break;
1188 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
1189 case UnmapNotify: 1522 case UnmapNotify:
1190 TermWin.mapped = 0; 1523 mapped = 0;
1191#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1192 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1193#endif 1526#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1194 break; 1528 break;
1195
1196 case MapNotify:
1197 TermWin.mapped = 1;
1198#ifdef TEXT_BLINK
1199 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1200#endif
1201 break;
1202
1203#ifdef TRANSPARENT
1204 case ReparentNotify:
1205 rootwin_cb (ev);
1206 break;
1207#endif /* TRANSPARENT */
1208 1529
1209 case GraphicsExpose: 1530 case GraphicsExpose:
1210 case Expose: 1531 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1532 if (ev.xany.window == vt)
1212 { 1533 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1534 do
1535 {
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1538 }
1217 // I don't understand this, so I changed it :) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1547 }
1221 // ev.xexpose.width, TermWin.height, False); 1548
1222#endif
1223 want_refresh = 1; 1549 want_refresh = 1;
1224 } 1550 }
1225 else 1551 else
1226 { 1552 {
1227 XEvent unused_event; 1553 XEvent unused_event;
1228 1554
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1230 ; 1556 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1558 ;
1233 1559
1234 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1235 { 1561 {
1236 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1237 scrollbar_show (0); 1563 scrollbar_show (0);
1238 } 1564 }
1239#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose ();
1242#endif
1243 } 1565 }
1244 break; 1566 break;
1245 1567
1246 case MotionNotify: 1568 case MotionNotify:
1247#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1248 if (hidden_pointer) 1570 if (hidden_pointer)
1249 pointer_unblank (); 1571 pointer_unblank ();
1250#endif 1572#endif
1251#if MENUBAR 1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1252 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)
1253 { 1580 {
1254 menubar_control (ev.xbutton); 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1255 break; 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1256 } 1583 ; // nop
1257#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1259 break;
1260
1261 if (ev.xany.window == TermWin.vt)
1262 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1585 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1266 ; 1587 ;
1267 1588
1268 XQueryPointer (display->display, TermWin.vt, 1589 XQueryPointer (dpy, vt,
1269 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1592 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1593 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1595 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1596 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1597 {
1277#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
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1607 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1608 ev.xbutton.state & Button3Mask ? 2 : 0);
1609
1280#ifdef SELECTION_SCROLLING 1610#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1611 if (ev.xbutton.y < int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1612 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1283 { 1613 {
1284 int dist; 1614 int dist;
1285 1615
1286 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1287 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1288 */ 1618 */
1289 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1291 1621
1292 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1294 */ 1624 */
1295 selection_save_x=ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1626 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1627 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1628
1300 /* calc number of lines to scroll */ 1629 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1630 if (ev.xbutton.y < int_bwidth)
1302 { 1631 {
1303 scroll_selection_dir = UP; 1632 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1633 dist = int_bwidth - ev.xbutton.y;
1305 } 1634 }
1306 else 1635 else
1307 { 1636 {
1308 scroll_selection_dir = DN; 1637 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y - 1638 dist = ev.xbutton.y - (int_bwidth + height);
1310 (TermWin.int_bwidth + TermWin.height);
1311 } 1639 }
1640
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1641 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1642 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1;
1314 MIN_IT (scroll_selection_lines, 1644 min_it (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1645 SELECTION_SCROLL_MAX_LINES);
1316 } 1646 }
1317 else 1647 else
1318 { 1648 {
1319 /* we are within the text window, so we 1649 /* we are within the text window, so we
1320 * shouldn't be scrolling 1650 * shouldn't be scrolling
1321 */ 1651 */
1322 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1324 } 1653 }
1325#endif 1654#endif
1326#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1327
1328 } 1656 }
1329#endif 1657#endif
1330
1331 } 1658 }
1332 } 1659 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1334 { 1661 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1336 MotionNotify, &ev)) ; 1663 MotionNotify, &ev))
1664 ;
1665
1337 XQueryPointer (display->display, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1338 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1669 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1670 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1672 scrollbar_size ());
1344 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1673 want_refresh = 1;
1346 scrollbar_show (1); 1674 scrollbar_show (1);
1347 } 1675 }
1348 break; 1676 break;
1349 } 1677 }
1350}
1351 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
1352void 1803void
1353rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1805{
1355 SET_R (this); 1806 make_current ();
1356 SET_LOCALE (locale);
1357 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
1358 switch (ev.type) 1813 switch (ev.type)
1359 { 1814 {
1360 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 */
1361 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])
1362 { 1822 {
1363 if (ev.xproperty.state == PropertyNewValue) 1823 bgPixmap.set_root_pixmap ();
1364 selection_property (ev.xproperty.window, ev.xproperty.atom); 1824 update_background ();
1365 break;
1366 } 1825 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /*
1371 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on.
1373 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376 1826
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1378 return;
1379 }
1380
1381 /* FALLTHROUGH */
1382 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1;
1385 break; 1827 break;
1828 }
1386#endif 1829# endif
1387 } 1830
1831 refresh_check ();
1388} 1832}
1833#endif
1389 1834
1390void 1835void
1391rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
1392{ 1837{
1393 int reportmode = 0, clickintime; 1838 int reportmode = 0, clickintime;
1394 1839
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1840 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1841
1396 if (!bypass_keystate) 1842 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1843 reportmode = !! (priv_modes & PrivMode_mouse_report);
1844
1398 /* 1845 /*
1399 * VT window processing of button press 1846 * VT window processing of button press
1400 */ 1847 */
1401 if (ev.window == TermWin.vt) 1848 if (ev.window == vt)
1402 { 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
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1862 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1863
1404 if (reportmode) 1864 if (reportmode)
1405 { 1865 {
1406 /* mouse report from vt window */ 1866 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1409#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1410 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1411 { 1871 {
1412 /* same button, within alloted time */ 1872 /* same button, within alloted time */
1413 MEvent.clicks++; 1873 MEvent.clicks++;
1874
1414 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1415 { 1876 {
1416 /* only report double clicks */ 1877 /* only report double clicks */
1417 MEvent.clicks = 2; 1878 MEvent.clicks = 2;
1418 mouse_report (ev); 1879 mouse_report (ev);
… …
1430 mouse_report (ev); 1891 mouse_report (ev);
1431 } 1892 }
1432#else 1893#else
1433 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1434 mouse_report (ev); 1895 mouse_report (ev);
1435#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1436 1897
1437 } 1898 }
1438 else 1899 else
1439 { 1900 {
1440 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1902 MEvent.clicks = 0;
1903
1442 switch (ev.button) 1904 switch (ev.button)
1443 { 1905 {
1444 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
1445 /* allow shift+left click to extend selection */ 1915 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1916 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1447 { 1917 {
1448 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1919 selection_rotate (ev.x, ev.y);
1450 else 1920 else
1451 selection_extend (ev.x, ev.y, 1); 1921 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1936 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1937 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1469 else 1939 else
1470 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1941
1471 MEvent.button = Button3; 1942 MEvent.button = Button3;
1472 break; 1943 break;
1473 } 1944 }
1474 } 1945 }
1946
1475 MEvent.time = ev.time; 1947 MEvent.time = ev.time;
1476 return; 1948 return;
1477 } 1949 }
1478 1950
1479 /* 1951 /*
1480 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1481 */ 1953 */
1482 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1483 { 1955 {
1484 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;
1485 /* 1964 /*
1486 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1487 * move up if mouse is above slider 1966 * move up if mouse is above slider
1488 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1489 * 1968 *
… …
1498 /* 1977 /*
1499 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1500 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1501 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1502 */ 1981 */
1503 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1504 && scrollbarnext_upButton (ev.y))
1505 || (scrollBar.style == R_SB_RXVT
1506 && scrollbarrxvt_upButton (ev.y)))
1507 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1508 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1509 && scrollbarnext_dnButton (ev.y))
1510 || (scrollBar.style == R_SB_RXVT
1511 && scrollbarrxvt_dnButton (ev.y)))
1512 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1513 else 1986 else
1514 switch (ev.button) 1987 switch (ev.button)
1515 { 1988 {
1516 case Button2: 1989 case Button2:
… …
1523 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1524 break; 1997 break;
1525 } 1998 }
1526 } 1999 }
1527 else 2000 else
1528#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1529
1530 {
1531 char upordown = 0;
1532
1533 if (scrollBar.style == R_SB_NEXT)
1534 { 2002 {
1535 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1536 upordown = -1; /* up */
1537 else if (scrollbarnext_dnButton (ev.y))
1538 upordown = 1; /* down */
1539 }
1540 else if (scrollBar.style == R_SB_RXVT)
1541 {
1542 if (scrollbarrxvt_upButton (ev.y))
1543 upordown = -1; /* up */
1544 else if (scrollbarrxvt_dnButton (ev.y))
1545 upordown = 1; /* down */
1546 }
1547 if (upordown)
1548 { 2004 {
1549#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1550 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1551#endif 2008#endif
1552 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1553 { 2010 {
1554 if (upordown < 0) 2011 if (direction == UP)
1555 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1556 else 2013 else
1557 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1558 } 2015 }
1559 } 2016 }
1560 else 2017 else
1561 switch (ev.button) 2018 switch (ev.button)
1562 { 2019 {
1563 case Button2: 2020 case Button2:
1564 switch (scrollbar_align) 2021 switch (scrollBar.align)
1565 { 2022 {
1566 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
1567 csrO = 0; 2024 csrO = 0;
1568 break; 2025 break;
1569 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
1571 break; 2028 break;
1572 case R_SB_ALIGN_BOTTOM: 2029 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 2030 csrO = scrollBar.bot - scrollBar.top;
1574 break; 2031 break;
1575 } 2032 }
2033
1576 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 2038
1581 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
1582 break; 2040 break;
1583 2041
1584 case Button1: 2042 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1586 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
1587 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
1588 2046
1589 case Button3: 2047 case Button3:
1590 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
1591 { 2049 {
1592 if (scrollbar_above_slider (ev.y)) 2050 if (scrollbar_above_slider (ev.y))
1593# ifdef RXVT_SCROLL_FULL 2051# ifdef RXVT_SCROLL_FULL
1594 scr_page (UP, TermWin.nrow - 1); 2052 scr_page (UP, nrow - 1);
1595# else 2053# else
1596 scr_page (UP, TermWin.nrow / 4); 2054 scr_page (UP, nrow / 4);
1597# endif 2055# endif
1598 else if (scrollbar_below_slider (ev.y)) 2056 else if (scrollbar_below_slider (ev.y))
1599# ifdef RXVT_SCROLL_FULL 2057# ifdef RXVT_SCROLL_FULL
1600 scr_page (DN, TermWin.nrow - 1); 2058 scr_page (DN, nrow - 1);
1601# else 2059# else
1602 scr_page (DN, TermWin.nrow / 4); 2060 scr_page (DN, nrow / 4);
1603# endif 2061# endif
1604 else 2062 else
1605 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
1606 } 2064 }
1607 else 2065 else
1608 { 2066 {
1609 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 2068 (nrow
1611 * scrollbar_position (ev.y) 2069 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 2070 / scrollbar_size ()));
1613 } 2071 }
2072
1614 break; 2073 break;
1615 } 2074 }
1616 } 2075 }
2076
1617 return; 2077 return;
1618 } 2078 }
1619#if MENUBAR
1620 /*
1621 * Menubar window processing of button press
1622 */
1623 if (isMenuBarWindow (ev.window))
1624 menubar_control (ev);
1625#endif
1626} 2079}
1627 2080
1628void 2081void
1629rxvt_term::button_release (XButtonEvent &ev) 2082rxvt_term::button_release (XButtonEvent &ev)
1630{ 2083{
1631 int reportmode = 0; 2084 int reportmode = 0;
1632 2085
1633 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2087 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2089
1637 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1638 { 2091 {
1639 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
1640 scrollbar_show (0); 2093 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH;
1643#endif
1644
1645 } 2094 }
2095
1646#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
1649#endif 2098#endif
2099
1650 if (ev.window == TermWin.vt) 2100 if (ev.window == vt)
1651 { 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
1652 if (reportmode) 2111 if (reportmode)
1653 { 2112 {
1654 /* mouse report from vt window */ 2113 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2114 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2115 if (ev.button >= 4)
… …
1667 mouse_report (ev); 2126 mouse_report (ev);
1668 } 2127 }
1669#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
1670 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
1671 mouse_report (ev); 2130 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2132 return;
1674 } 2133 }
2134
1675 /* 2135 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2137 * when overriding mouse reporting
1678 */ 2138 */
1679 if (PrivateModes & PrivMode_mouse_report 2139 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2140 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2141 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2142 selection_extend (ev.x, ev.y, 0);
1683 2143
1684 switch (ev.button) 2144 switch (ev.button)
1685 { 2145 {
1686 case Button1: 2146 case Button1:
1687 case Button3: 2147 case Button3:
1688 selection_make (ev.time); 2148 selection_make (ev.time);
1689 break; 2149 break;
2150
1690 case Button2: 2151 case Button2:
1691 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);
1692 break; 2154 break;
2155
1693#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
1694 case Button4: 2157 case Button4:
1695 case Button5: 2158 case Button5:
1696 { 2159 {
1697 int i; 2160 int i;
… …
1699 2162
1700 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
1701 2164
1702 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
1703 i = 1; 2166 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2167 else if (option (Opt_mouseWheelScrollPage))
1705 i = TermWin.nrow - 1; 2168 i = nrow - 1;
1706 else 2169 else
1707 i = 5; 2170 i = 5;
1708 2171
1709# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2173 if (ev.state & ControlMask)
1711 { 2174 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2178
2179 if (!slip_wheel_ev.is_active ())
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1714 } 2181 }
2182 else
1715# endif 2183# endif
1716# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 { 2184 {
1723 scr_page (v, 1); 2185 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2186 scrollbar_show (1);
1726 } 2187 }
1727# endif
1728
1729 } 2188 }
1730 break; 2189 break;
1731#endif 2190#endif
1732
1733 }
1734 }
1735#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev);
1738#endif
1739}
1740
1741#ifdef TRANSPARENT
1742#if TINTING
1743/* shading taken from eterm-0.9.2 */
1744/* RGB 15 */
1745
1746static void
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0x7c00) * rm;
1761 g = (b & 0x3e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1764 | ((g >> 8) & 0x3e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0x7c00) * rm;
1776 g = (b & 0x3e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 15) - 1);
1779 g |= (!(g >> 10) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1782 | ((g >> 8) & 0x3e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 16 */
1791static void
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 }
1814 } else {
1815 for (y = h; --y >= 0;) {
1816 for (x = -w; x < 0; x++) {
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 }
1830 ptr += bpl;
1831 }
1832 }
1833}
1834
1835/* RGB 24 */
1836static void
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1838{
1839 unsigned char *ptr;
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 }
1867 } else {
1868 for (y = h; --y >= 0;) {
1869 for (x = -(w * 3); x < 0; x += 3) {
1870 int r, g, b;
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 }
1898 ptr += bpl;
1899 }
1900 }
1901}
1902
1903/* RGB 32 */
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973}
1974
1975#endif
1976
1977/*
1978 * Check our parents are still who we think they are.
1979 * Do transparency updates if required
1980 */
1981int
1982rxvt_term::check_our_parents ()
1983{
1984 int i, pchanged, aformat, have_pixmap, rootdepth;
1985 unsigned long nitems, bytes_after;
1986 Atom atype;
1987 unsigned char *prop = NULL;
1988 Window root, oldp, *list;
1989 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr;
1991
1992 pchanged = 0;
1993
1994 if (!(Options & Opt_transparent))
1995 return pchanged; /* Don't try any more */
1996
1997 XGetWindowAttributes (display->display, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth;
1999
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2001
2002 if (rootdepth != wattr.depth)
2003 {
2004 if (am_transparent)
2005 { 2191 }
2006 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0;
2009 }
2010
2011 return pchanged; /* Don't try any more */
2012 }
2013
2014 /* Get all X ops out of the queue so that our information is up-to-date. */
2015 XSync (display->display, False);
2016
2017 /*
2018 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame
2020 * windows for each client, so we have to take care about that.
2021 */
2022 i = (xa[XA_XROOTPMAPID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success);
2026
2027 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success);
2032
2033 if (!i || prop == NULL)
2034 have_pixmap = 0;
2035 else
2036 { 2192 }
2037 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop;
2039 XFree (prop);
2040 }
2041
2042 if (have_pixmap)
2043 {
2044 /*
2045 * Copy display->root pixmap transparency
2046 */
2047 int sx, sy, nx, ny;
2048 unsigned int nw, nh;
2049 Window cr;
2050 XImage *image;
2051 GC gc;
2052 XGCValues gcvalue;
2053
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2055 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height;
2058 nx = ny = 0;
2059
2060 if (sx < 0)
2061 {
2062 nw += sx;
2063 nx = -sx;
2064 sx = 0;
2065 }
2066
2067 if (sy < 0)
2068 {
2069 nh += sy;
2070 ny = -sy;
2071 sy = 0;
2072 }
2073
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2076 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */
2081 allowedxerror = 0;
2082
2083 if (image == NULL)
2084 {
2085 if (am_transparent && am_pixmap_trans)
2086 {
2087 pchanged = 1;
2088 if (TermWin.pixmap != None)
2089 {
2090 XFreePixmap (display->display, TermWin.pixmap);
2091 TermWin.pixmap = None;
2092 }
2093 }
2094
2095 am_pixmap_trans = 0;
2096 }
2097 else
2098 {
2099 if (TermWin.pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap);
2101
2102#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint))
2104 {
2105 unsigned short shade, rm, gm, bm;
2106
2107 PixColors[Color_tint].get (display, rm, gm, bm);
2108
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 }
2120#endif
2121
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2123 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc);
2128 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2130 TermWin.pixmap);
2131
2132 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1;
2134
2135 am_transparent = am_pixmap_trans = 1;
2136 }
2137 }
2138
2139 if (!am_pixmap_trans)
2140 {
2141 unsigned int n;
2142 /*
2143 * InheritPixmap transparency
2144 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 {
2148 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n);
2151 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153
2154 if (TermWin.parent[i] == display->root)
2155 {
2156 if (oldp != None)
2157 pchanged = 1;
2158
2159 break;
2160 }
2161
2162 if (oldp != TermWin.parent[i])
2163 pchanged = 1;
2164 }
2165
2166 n = 0;
2167
2168 if (pchanged)
2169 {
2170 for (; n < (unsigned int)i; n++)
2171 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break;
2178 }
2179 }
2180 }
2181
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2187 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */
2189 }
2190 else
2191 {
2192#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1);
2196#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++)
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2200
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2202 am_transparent = 1;
2203 }
2204
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None;
2207 }
2208
2209 return pchanged;
2210} 2193}
2211#endif
2212 2194
2213/*}}} */ 2195/*}}} */
2214 2196
2215bool 2197bool
2216rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
2217{ 2199{
2218 bool flag = false; 2200 bool flag = false;
2219 unicode_t ch = NOCHAR; 2201 wchar_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here 2202 char *seq_begin; // remember start of esc-sequence here
2221 2203
2222 for (;;) 2204 for (;;)
2223 { 2205 {
2224 if (ch == NOCHAR) 2206 if (ch == NOCHAR)
2225 { 2207 {
2226 seq_begin = cmdbuf_ptr; 2208 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2209 ch = next_char ();
2228 }
2229 2210
2230 if (ch == NOCHAR) // TODO: improve 2211 if (ch == NOCHAR)
2231 break; 2212 break;
2213 }
2232 2214
2233 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)
2234 { 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
2235 /* Read a text string from the input buffer */ 2231 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2232 wchar_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2233 bool refreshnow = false;
2238 int nlines = 0; 2234 int nlines = 0;
2239 unicode_t *str = buf; 2235 wchar_t *str = buf;
2240 2236 wchar_t *eol = str + min (ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2237
2243 for (;;) 2238 for (;;)
2244 { 2239 {
2240 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2241 break;
2242
2243 *str++ = ch;
2244
2245 if (ch == C0_LF || str >= eol)
2246 {
2247 if (ch == C0_LF)
2248 nlines++;
2249
2250 refresh_count++;
2251
2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2253 {
2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2259 ch = NOCHAR;
2260 break;
2261 }
2262 }
2263
2264 // scr_add_lines only works for nlines <= nrow - 1.
2265 if (nlines >= nrow - 1)
2266 {
2267 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2268 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2269 scr_add_lines (buf, str - buf, nlines);
2270
2271 nlines = 0;
2272 str = buf;
2273 eol = str + min (ncol, UBUFSIZ);
2274 }
2275
2276 if (str >= eol)
2277 {
2278 if (eol >= buf + UBUFSIZ)
2279 {
2280 ch = NOCHAR;
2281 break;
2282 }
2283 else
2284 eol = min (eol + ncol, buf + UBUFSIZ);
2285 }
2286
2287 }
2288
2245 seq_begin = cmdbuf_ptr; 2289 seq_begin = cmdbuf_ptr;
2246 ch = next_char (); 2290 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break;
2250
2251 *str++ = ch;
2252
2253 if (ch == C0_LF)
2254 {
2255 nlines++;
2256 refresh_count++;
2257
2258 if (! (Options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2260 {
2261 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR;
2264 break;
2265 }
2266
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1)
2269 {
2270 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0;
2272 str = buf;
2273 }
2274 }
2275
2276 if (str >= buf + UBUFSIZ)
2277 {
2278 ch = NOCHAR;
2279 break;
2280 }
2281 } 2291 }
2282 2292
2293 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2294 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2283 scr_add_lines (buf, nlines, str - buf); 2295 scr_add_lines (buf, str - buf, nlines);
2284 2296
2285 /* 2297 /*
2286 * 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
2287 * 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.
2288 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2289 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2301 */
2294 if (refreshnow) 2302 if (refreshnow)
2295 { 2303 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2304 flag = true;
2297 refresh_limit++;
2298 else
2299 scr_refresh (refresh_type); 2305 scr_refresh ();
2306 want_refresh = 1;
2300 } 2307 }
2301 2308
2302 } 2309 }
2303 else 2310 else
2304 { 2311 {
… …
2318 } 2325 }
2319 2326
2320 return flag; 2327 return flag;
2321} 2328}
2322 2329
2323// read the next octet
2324unicode_t
2325rxvt_term::next_octet ()
2326{
2327 return cmdbuf_ptr < cmdbuf_endp
2328 ? *cmdbuf_ptr++
2329 : NOCHAR;
2330}
2331
2332// read the next character 2330// read the next character
2333unicode_t 2331wchar_t
2334rxvt_term::next_char () 2332rxvt_term::next_char () NOTHROW
2335{ 2333{
2336 while (cmdbuf_ptr < cmdbuf_endp) 2334 while (cmdbuf_ptr < cmdbuf_endp)
2337 { 2335 {
2338 // assume 7-bit to be ascii ALWAYS 2336 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2340 return *cmdbuf_ptr++; 2338 return *cmdbuf_ptr++;
2341 2339
2342 wchar_t wc; 2340 wchar_t wc;
2343 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);
2344 2342
2345 if (len == (size_t)-2) 2343 if (len == (size_t)-2)
2346 { 2344 {
2347 // the mbstate stores incomplete sequences. didn't know this :/ 2345 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp; 2346 cmdbuf_ptr = cmdbuf_endp;
2349 break; 2347 break;
2350 } 2348 }
2351 2349
2352 if (len == (size_t)-1) 2350 if (len == (size_t)-1)
2353 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
2354 2352
2355 // assume wchar == unicode 2353 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2357 return wc; 2355 return wc & UNICODE_MASK;
2358 } 2356 }
2359 2357
2360 return NOCHAR; 2358 return NOCHAR;
2361} 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;
2362 2371
2363/* rxvt_cmd_getc () - Return next input character */ 2372/* rxvt_cmd_getc () - Return next input character */
2364/* 2373/*
2365 * Return the next input character after first passing any keyboard input 2374 * Return the next input character after first passing any keyboard input
2366 * to the command. 2375 * to the command.
2367 */ 2376 */
2368unicode_t 2377wchar_t
2369rxvt_term::cmd_getc () 2378rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2379{
2371 unicode_t c = next_char (); 2380 wchar_t c = next_char ();
2372 2381
2373 if (c == NOCHAR) 2382 if (c == NOCHAR)
2374 throw out_of_input; 2383 throw out_of_input;
2375 2384
2376 return c; 2385 return c;
2377} 2386}
2378 2387
2379unicode_t 2388uint32_t
2380rxvt_term::cmd_get8 () 2389rxvt_term::cmd_get8 () THROW ((class out_of_input))
2381{ 2390{
2382 unicode_t c = next_octet (); 2391 uint32_t c = next_octet ();
2383 2392
2384 if (c == NOCHAR) 2393 if (c == NOCHAR)
2385 throw out_of_input; 2394 throw out_of_input;
2386 2395
2387 return c; 2396 return c;
… …
2451 { 2460 {
2452 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2453 break; /* done = 1 */ 2462 break; /* done = 1 */
2454 } 2463 }
2455 } 2464 }
2456 2465
2457 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2458 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2459 { 2468 {
2460 done = 1; 2469 done = 1;
2461 break; 2470 break;
… …
2463 } 2472 }
2464 } 2473 }
2465 2474
2466 pclose_printer (fd); 2475 pclose_printer (fd);
2467} 2476}
2468#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2469/*}}} */ 2478/*}}} */
2470 2479
2471/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2472enum { 2481enum {
2473 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2487 case C0_ESC: 2496 case C0_ESC:
2488 process_escape_seq (); 2497 process_escape_seq ();
2489 break; 2498 break;
2490 case C0_ENQ: /* terminal Status */ 2499 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2500 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2501 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2494 else 2502 else
2495 tt_write ((unsigned char *)VT100_ANS, 2503 tt_write (VT100_ANS, strlen (VT100_ANS));
2496 (unsigned int)STRLEN (VT100_ANS));
2497 break; 2504 break;
2498 case C0_BEL: /* bell */ 2505 case C0_BEL: /* bell */
2499 scr_bell (); 2506 scr_bell ();
2500 break; 2507 break;
2501 case C0_BS: /* backspace */ 2508 case C0_BS: /* backspace */
… …
2525 process_dcs_seq (); 2532 process_dcs_seq ();
2526 break; 2533 break;
2527 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2528 process_csi_seq (); 2535 process_csi_seq ();
2529 break; 2536 break;
2530 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2531 process_osc_seq (); 2538 process_osc_seq ();
2532 break; 2539 break;
2533#endif 2540#endif
2534 } 2541 }
2535} 2542}
… …
2600void 2607void
2601rxvt_term::process_escape_seq () 2608rxvt_term::process_escape_seq ()
2602{ 2609{
2603 unicode_t ch = cmd_getc (); 2610 unicode_t ch = cmd_getc ();
2604 2611
2605 if (PrivateModes & PrivMode_vt52) 2612 if (priv_modes & PrivMode_vt52)
2606 { 2613 {
2607 process_escape_vt52 (ch); 2614 process_escape_vt52 (ch);
2608 return; 2615 return;
2609 } 2616 }
2610 2617
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 2633 break;
2627 case '+': 2634 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 2636 break;
2630#ifndef NO_FRILLS 2637#if !ENABLE_MINIMAL
2631 case '6': 2638 case '6':
2632 scr_backindex (); 2639 scr_backindex ();
2633 break; 2640 break;
2634#endif 2641#endif
2635 case '7': 2642 case '7':
2636 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
2637 break; 2644 break;
2638 case '8': 2645 case '8':
2639 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
2640 break; 2647 break;
2641#ifndef NO_FRILLS 2648#if !ENABLE_MINIMAL
2642 case '9': 2649 case '9':
2643 scr_forwardindex (); 2650 scr_forwardindex ();
2644 break; 2651 break;
2645#endif 2652#endif
2646 case '=': 2653 case '=':
… …
2656 break; 2663 break;
2657 2664
2658 /* 8.3.87: NEXT LINE */ 2665 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2666 case C1_NEL: /* ESC E */
2660 { 2667 {
2661 unicode_t nlcr[] = { C0_LF, C0_CR }; 2668 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, 1, 2); 2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2663 } 2670 }
2664 break; 2671 break;
2665 2672
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2673 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2674 case C1_ESA: /* ESC G */
… …
2689 process_dcs_seq (); 2696 process_dcs_seq ();
2690 break; 2697 break;
2691 2698
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2694 tt_write ((const unsigned char *)ESCZ_ANSWER, 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2696 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2697 2703
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2699 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 2706 process_csi_seq ();
… …
2762rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
2763{ 2769{
2764 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
2765 unsigned int nargs, p; 2771 unsigned int nargs, p;
2766 int n, ndef; 2772 int n, ndef;
2767 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
2768 2774
2769 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
2770 arg[--nargs] = 0;
2771 2776
2772 priv = 0; 2777 priv = 0;
2773 ch = cmd_getc (); 2778 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
2775 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
2776 priv = ch; 2782 priv = ch;
2777 ch = cmd_getc (); 2783 ch = cmd_getc ();
2778 } 2784 }
2779 2785
2780 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
2809 ndef = get_byte_array_bit (csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
2810 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
2811 if (arg[p] == -1) 2817 if (arg[p] == -1)
2812 arg[p] = ndef; 2818 arg[p] = ndef;
2813 2819
2814#ifdef DEBUG_CMD
2815 fprintf (stderr, "CSI ");
2816 for (p = 0; p < nargs; p++)
2817 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2818 fprintf (stderr, "%c\n", ch);
2819#endif
2820
2821 /* 2820 /*
2822 * private mode handling 2821 * private mode handling
2823 */ 2822 */
2824 if (priv) 2823 if (priv)
2825 { 2824 {
2826 switch (priv) 2825 switch (priv)
2827 { 2826 {
2828 case '>': 2827 case '>':
2829 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 //
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2838 }
2831 break; 2839 break;
2840
2832 case '?': 2841 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 2844 break;
2836 } 2845 }
… …
2940 2949
2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2950 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2942 arg[0] = -arg[0]; 2951 arg[0] = -arg[0];
2943 /* FALLTHROUGH */ 2952 /* FALLTHROUGH */
2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2953 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2954 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2946 break; 2955 break;
2947 2956
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2957 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 2958 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2950 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 2959 break;
2952 2960
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2961 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 2962 process_sgr_mode (nargs, arg);
2955 break; 2963 break;
… …
2962 break; 2970 break;
2963 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
2964 scr_report_position (); 2972 scr_report_position ();
2965 break; 2973 break;
2966 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 2975 if (option (Opt_insecure))
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 2977 break;
2970 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 2980 break;
2973 } 2981 }
… …
3009 break; 3017 break;
3010 3018
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3019 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3020 if (arg[0] == 4)
3013 scr_insert_mode (0); 3021 scr_insert_mode (0);
3022 else if (arg[0] == 20)
3023 priv_modes &= ~PrivMode_LFNL;
3014 break; 3024 break;
3015 3025
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3026 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3027 if (arg[0] == 4)
3018 scr_insert_mode (1); 3028 scr_insert_mode (1);
3029 else if (arg[0] == 20)
3030 priv_modes |= PrivMode_LFNL;
3019 break; 3031 break;
3020 3032
3021 /* 3033 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3034 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3035 */
… …
3035 break; 3047 break;
3036 case CSI_75: 3048 case CSI_75:
3037 scr_cursor (RESTORE); 3049 scr_cursor (RESTORE);
3038 break; 3050 break;
3039 3051
3040#ifndef NO_FRILLS 3052#if !ENABLE_MINIMAL
3041 case CSI_74: 3053 case CSI_74:
3042 process_window_ops (arg, nargs); 3054 process_window_ops (arg, nargs);
3043 break; 3055 break;
3044#endif 3056#endif
3045 3057
… …
3052 break; 3064 break;
3053 } 3065 }
3054} 3066}
3055/*}}} */ 3067/*}}} */
3056 3068
3057#ifndef NO_FRILLS 3069#if !ENABLE_MINIMAL
3058/* ARGSUSED */ 3070/* ARGSUSED */
3059void 3071void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3072rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3073{
3062 int x, y; 3074 int x, y;
3063 XWindowAttributes wattr; 3075 XWindowAttributes wattr;
3064 Window wdummy; 3076 Window wdummy;
3077
3078 dLocal (Display *, dpy);
3065 3079
3066 if (nargs == 0) 3080 if (nargs == 0)
3067 return; 3081 return;
3068 3082
3069 switch (args[0]) 3083 switch (args[0])
3070 { 3084 {
3071 /* 3085 /*
3072 * commands 3086 * commands
3073 */ 3087 */
3074 case 1: /* deiconify window */ 3088 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3089 XMapWindow (dpy, parent[0]);
3076 break; 3090 break;
3077 case 2: /* iconify window */ 3091 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3092 XIconifyWindow (dpy, parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3093 break;
3081 case 3: /* set position (pixels) */ 3094 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3095 XMoveWindow (dpy, parent[0], args[1], args[2]);
3083 break; 3096 break;
3084 case 4: /* set size (pixels) */ 3097 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3099 break;
3087 case 5: /* raise window */ 3100 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3101 XRaiseWindow (dpy, parent[0]);
3089 break; 3102 break;
3090 case 6: /* lower window */ 3103 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3104 XLowerWindow (dpy, parent[0]);
3092 break; 3105 break;
3093 case 7: /* refresh window */ 3106 case 7: /* refresh window */
3094 scr_touch (true); 3107 scr_touch (true);
3095 break; 3108 break;
3096 case 8: /* set size (chars) */ 3109 case 8: /* set size (chars) */
3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3110 set_widthheight ((unsigned int) (args[2] * fwidth),
3098 (unsigned int) (args[1] * TermWin.fheight)); 3111 (unsigned int) (args[1] * fheight));
3099 break; 3112 break;
3100 3113
3101 //case 9: NYI, TODO, restore maximized window or maximize window 3114 //case 9: NYI, TODO, restore maximized window or maximize window
3102 default: 3115 default:
3103 if (args[0] >= 24) /* set height (chars) */ 3116 if (args[0] >= 24) /* set height (chars) */
3104 set_widthheight ((unsigned int)TermWin.width, 3117 set_widthheight ((unsigned int)width,
3105 (unsigned int) (args[1] * TermWin.fheight)); 3118 (unsigned int) (args[1] * fheight));
3106 break; 3119 break;
3107
3108 3120
3109 /* 3121 /*
3110 * reports - some output format copied from XTerm 3122 * reports - some output format copied from XTerm
3111 */ 3123 */
3112 case 11: /* report window state */ 3124 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3127 break;
3116 case 13: /* report window position */ 3128 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3130 XTranslateCoordinates (dpy, parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3131 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3132 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3133 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3134 break;
3123 case 14: /* report window size (pixels) */ 3135 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3138 break;
3127 case 18: /* report text area size (chars) */ 3139 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3140 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3141 break;
3130 case 19: /* report window size (chars) */ 3142 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3143 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3144 break;
3133 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3146 {
3136 char *s; 3147 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3138 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);
3139 } 3151 }
3140 break; 3152 break;
3141 case 21: /* report window title */ 3153 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3154 {
3144 char *s; 3155 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3146 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);
3147 } 3159 }
3148 break; 3160 break;
3149 } 3161 }
3150} 3162}
3151#endif 3163#endif
3152 3164
3153/*----------------------------------------------------------------------*/ 3165/*----------------------------------------------------------------------*/
3154/* 3166/*
3155 * get input up until STRING TERMINATOR (or BEL) 3167 * get input up until STRING TERMINATOR (or BEL)
3156 * ends_how is terminator used. returned input must be free()'d 3168 * ends_how is terminator used. returned input must be free()'d
3157 */ 3169 */
3158unsigned char * 3170char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3171rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3172{
3161 unicode_t prev = 0, ch; 3173 unicode_t ch;
3174 bool seen_esc = false;
3162 unsigned int n = 0; 3175 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3176 wchar_t string[STRING_MAX];
3165 3177
3166 while ((ch = cmd_getc ()) != NOCHAR) 3178 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3179 {
3168 if (prev == C0_ESC) 3180 if (seen_esc)
3169 { 3181 {
3170 if (ch == 0x5c) /* 7bit ST */ 3182 if (ch == 0x5c) /* 7bit ST */
3171 break; 3183 break;
3172 else 3184 else
3173 return NULL; 3185 return NULL;
3174 } 3186 }
3187 else if (ch == C0_ESC)
3188 {
3189 seen_esc = true;
3190 continue;
3191 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3177 else if (ch < 0x20) 3196 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3179 3198
3180 if (n >= sizeof (string) - 1) 3199 seen_esc = false;
3200
3201 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3202 // stop at some sane length
3182 return NULL; 3203 return NULL;
3183 3204
3184 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else
3190 string[n++] = prev = ch; 3205 string[n++] = ch;
3191 } 3206 }
3192 3207
3193 string[n++] = '\0'; 3208 string[n++] = '\0';
3194 3209
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3211
3200 return s; 3212 return rxvt_wcstombs (string);
3201} 3213}
3202 3214
3203/*----------------------------------------------------------------------*/ 3215/*----------------------------------------------------------------------*/
3204/* 3216/*
3205 * 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)'
3206 */ 3218 */
3207void 3219void
3208rxvt_term::process_dcs_seq () 3220rxvt_term::process_dcs_seq ()
3209{ 3221{
3210 unsigned char *s; 3222 char *s;
3211 unicode_t eh; 3223 unicode_t eh;
3212 3224
3213 /* 3225 /*
3214 * Not handled yet 3226 * Not handled yet
3215 */ 3227 */
… …
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3246 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3247 arg = arg * 10 + (ch - '0');
3236 3248
3237 if (ch == ';') 3249 if (ch == ';')
3238 { 3250 {
3239 unsigned char *s = get_to_st (eh); 3251 char *s = get_to_st (eh);
3240 3252
3241 if (s) 3253 if (s)
3242 { 3254 {
3243 process_xterm_seq (arg, (char *)s, eh); 3255 process_xterm_seq (arg, s, eh);
3244 free (s); 3256 free (s);
3245 } 3257 }
3246 } 3258 }
3247} 3259}
3248 3260
3249void 3261void
3250rxvt_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)
3251{ 3263{
3252 if (str[0] == '?' && !str[1]) 3264 if (str[0] == '?' && !str[1])
3253 { 3265 {
3254 if (Options & Opt_insecure) 3266 rgba c;
3255 { 3267 pix_colors_focused[color].get (c);
3256 unsigned short r, g, b; 3268
3257 PixColors[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
3258 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);
3259 }
3260 } 3275 }
3261 else 3276 else
3262 set_window_color (color, str); 3277 set_window_color (color, str);
3263} 3278}
3264 3279
3265/* 3280/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3281 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3267 * 0 = change iconName/title
3268 * 1 = change iconName
3269 * 2 = change title
3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
3273 * 12 = change text color
3274 * 13 = change mouse foreground color
3275 * 17 = change highlight character colour
3276 * 18 = change bold character color
3277 * 19 = change underlined character color
3278 * 46 = change logfile (not implemented)
3279 * 50 = change font
3280 *
3281 * rxvt extensions:
3282 * 20 = bg pixmap
3283 * 39 = change default fg color
3284 * 49 = change default bg color
3285 * 55 = dump scrollback buffer and all of screen
3286 * 701 = change locale
3287 * 702 = find font
3288 * 703 = menu
3289 */ 3282 */
3290void 3283void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3284rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3292{ 3285{
3293 int changed = 0;
3294 int color; 3286 int color;
3295 char *buf, *name; 3287 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3288 bool query = str[0] == '?' && !str[1];
3289 int saveop = op;
3290
3291 dLocal (Display *, dpy);
3297 3292
3298 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
3299 switch (op) 3298 switch (op)
3300 { 3299 {
3301 case XTerm_name: 3300 case XTerm_name:
3302 set_title (str); 3301 set_title (str);
3303 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3308 set_title (str); 3307 set_title (str);
3309 break; 3308 break;
3310 case XTerm_property: 3309 case XTerm_property:
3311 if (str[0] == '?') 3310 if (str[0] == '?')
3312 { 3311 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3312 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3313 Atom actual_type;
3315 int actual_format; 3314 int actual_format;
3316 unsigned long nitems; 3315 unsigned long nitems;
3317 unsigned long bytes_after; 3316 unsigned long bytes_after;
3318 unsigned char *value = 0; 3317 unsigned char *value = 0;
3319 const char *str = ""; 3318 const char *str = "";
3320 3319
3321 if (prop 3320 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3321 && XGetWindowProperty (dpy, parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3322 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3323 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3324 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3325 && actual_type != None
3327 && actual_format == 8) 3326 && actual_format == 8)
3328 str = (const char *)(value); 3327 str = (const char *)(value);
3329 3328
3330 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3329 tt_printf ("\033]%d;%s%c", op, str, resp);
3331 3330
3332 XFree (value); 3331 XFree (value);
3333 } 3332 }
3334 else 3333 else
3335 { 3334 {
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3335 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3336
3338 if (eq) 3337 if (eq)
3339 { 3338 {
3340 *eq = 0; 3339 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3340 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3341 }
3346 else 3342 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3343 XDeleteProperty (dpy, parent[0],
3348 display->atom (str)); 3344 display->atom (str));
3349 } 3345 }
3350 break; 3346 break;
3351 3347
3352 case XTerm_Color: 3348 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3349 for (buf = (char *)str; buf && *buf;)
3354 { 3350 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3351 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3352 break;
3357 3353
3358 *name++ = '\0'; 3354 *name++ = '\0';
3359 color = atoi (buf); 3355 color = atoi (buf) + minCOLOR;
3360 3356
3361 if (color < 0 || color >= TOTAL_COLORS) 3357 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3362 break; 3358 break;
3363 3359
3364 if ((buf = STRCHR (name, ';')) != NULL) 3360 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3361 *buf++ = '\0';
3366 3362
3367 if (name[0] == '?' && !name[1]) 3363 process_color_seq (op, color, name, resp);
3368 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 }
3376 else
3377 set_window_color (color + minCOLOR, name);
3378 } 3364 }
3379 break; 3365 break;
3366 case Rxvt_restoreFG:
3380 case XTerm_Color00: 3367 case XTerm_Color00:
3381 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3382 break; 3369 break;
3370 case Rxvt_restoreBG:
3383 case XTerm_Color01: 3371 case XTerm_Color01:
3384 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3385 break; 3373 break;
3386#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3387 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
3388 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3376 process_color_seq (op, Color_cursor, str, resp);
3389 break; 3377 break;
3390#endif 3378#endif
3391 case XTerm_Color_pointer_fg: 3379 case XTerm_Color_pointer_fg:
3392 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3380 process_color_seq (op, Color_pointer_fg, str, resp);
3393 break; 3381 break;
3394 case XTerm_Color_pointer_bg: 3382 case XTerm_Color_pointer_bg:
3395 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3383 process_color_seq (op, Color_pointer_bg, str, resp);
3396 break; 3384 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3385#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_BD:
3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3400 break;
3401 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break;
3404 case XTerm_Color_RV: 3386 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3387 process_color_seq (op, Color_RV, str, resp);
3406 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;
3407#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;
3408 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
3409 case XTerm_Pixmap: 3420 case Rxvt_Pixmap:
3410 if (*str != ';') 3421 if (!strcmp (str, "?"))
3411 { 3422 {
3412#if XPM_BACKGROUND 3423 char str[256];
3413 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */
3415#endif
3416 scr_touch (true);
3417 }
3418 while ((str = STRCHR (str, ';')) != NULL)
3419 {
3420 str++;
3421#if XPM_BACKGROUND
3422 changed += scale_pixmap (str);
3423#endif
3424 3424
3425 } 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3426 if (changed) 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3427 { 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428#ifdef XPM_BACKGROUND 3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 resize_pixmap ();
3430#endif
3431 scr_touch (true);
3432 }
3433 break;
3434
3435 case XTerm_restoreFG:
3436 set_window_color (Color_fg, str);
3437 break;
3438 case XTerm_restoreBG:
3439 set_window_color (Color_bg, str);
3440 break;
3441
3442 case XTerm_logfile:
3443 // TODO, when secure mode?
3444 break;
3445
3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3457 change_font (str);
3458 break;
3459
3460#ifndef NO_FRILLS
3461 case XTerm_locale:
3462 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 } 3429 }
3467 else 3430 else
3468 { 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
3469 set_locale (str); 3445 while (str)
3470# ifdef USE_XIM 3446 {
3471 im_cb (); 3447 str++;
3472# endif 3448 if (bgPixmap.set_geometry (str))
3449 changed++;
3450 str = strchr (str, ';');
3451 }
3452
3453 if (changed)
3454 update_background ();
3473 } 3455 }
3474 break; 3456 break;
3457#endif
3475 3458
3476 case XTerm_findfont: 3459 case XTerm_logfile:
3477 if (Options & Opt_insecure) 3460 // TODO, when secure mode?
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR
3487 case XTerm_Menu:
3488 if (Options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3461 break;
3491#endif 3462
3492#if 0 3463#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3464 case Rxvt_dumpscreen: /* no error notices */
3494 { 3465 {
3495 int fd; 3466 int fd;
3496 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)
3497 { 3468 {
3498 scr_dump (fd); 3469 scr_dump (fd);
3499 close (fd); 3470 close (fd);
3500 } 3471 }
3501 } 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
3502 break; 3536 break;
3503#endif 3537#endif
3504 } 3538 }
3505} 3539}
3506/*----------------------------------------------------------------------*/ 3540/*----------------------------------------------------------------------*/
… …
3520{ 3554{
3521 int state; 3555 int state;
3522 3556
3523 if (mode == 's') 3557 if (mode == 's')
3524 { 3558 {
3525 SavedModes |= (PrivateModes & bit); 3559 SavedModes |= (priv_modes & bit);
3526 return -1; 3560 return -1;
3527 } 3561 }
3528 else 3562 else
3529 { 3563 {
3530 if (mode == 'r') 3564 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3566 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3567 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3568 PrivMode (state, bit);
3535 } 3569 }
3536 3570
3537 return state; 3571 return state;
3538} 3572}
3539 3573
3540/* we're not using priv _yet_ */ 3574/* we're not using priv _yet_ */
3541void 3575void
3542rxvt_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)
3543{ 3577{
3544 unsigned int i, j; 3578 unsigned int i, j;
3545 int state; 3579 int state;
3546 3580
3547 static const struct 3581 static const struct
3548 { 3582 {
3549 const int argval; 3583 const int argval;
3550 const unsigned long bit; 3584 const unsigned long bit;
3551 }
3552
3553 argtopriv[] = { 3585 } argtopriv[] = {
3554 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
3555 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
3556 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3591 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3592 { 7, PrivMode_Autowrap },
3593 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3594 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3595 // 18, 19 printing-related
3563 { menuBar_esc, PrivMode_menuBar }, 3596 { 25, PrivMode_VisibleCursor },
3564#endif
3565#ifdef scrollBar_esc 3597#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3598 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3599#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3600 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3601 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3602 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3603 // 45 margin bell NYI
3575 // 46 start logging 3604 // 46 start logging
… …
3577 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
3578#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
3579 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
3580#endif 3609#endif
3581 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
3582 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
3583 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
3584 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3585 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3586 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
3587 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
3588 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
3589 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
3590 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
3591 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
3592 { 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 */
3593 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
3594 }; 3623 };
3595 3624
3596 if (nargs == 0) 3625 if (nargs == 0)
3597 return; 3626 return;
3598 3627
… …
3615 } 3644 }
3616 3645
3617 /* extra handling for values with state unkept */ 3646 /* extra handling for values with state unkept */
3618 switch (arg[i]) 3647 switch (arg[i])
3619 { 3648 {
3649#if ENABLE_STYLES
3650 case 1021:
3651 set_option (Opt_intensityStyles, mode);
3652
3653 scr_touch (true);
3654 break;
3655#endif
3620 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
3657 case 1049:
3621 if (Options & Opt_secondaryScreen) 3658 if (option (Opt_secondaryScreen))
3622 if (mode == 0) 3659 if (mode == 0)
3623 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
3624 else if (mode == 1) 3661 else if (mode == 1)
3625 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
3626 break; 3663 break;
… …
3637 * within VT52 mode 3674 * within VT52 mode
3638 */ 3675 */
3639 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
3640 break; 3677 break;
3641 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
3644 break; 3684 break;
3645 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
3646 if (state) 3686 set_option (Opt_jumpScroll, !state);
3647 Options &= ~Opt_jumpScroll;
3648 else
3649 Options |= Opt_jumpScroll;
3650 break; 3687 break;
3651 case 5: /* reverse video */ 3688 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 3689 scr_rvideo_mode (state);
3653 break; 3690 break;
3654 case 6: /* relative/absolute origins */ 3691 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 3695 scr_autowrap (state);
3659 break; 3696 break;
3660 /* 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 */
3661 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3664 break; 3701 break;
3665#ifdef menuBar_esc
3666 case menuBar_esc:
3667#ifdef MENUBAR
3668 map_menuBar (state);
3669#endif
3670 break;
3671#endif
3672#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
3673 case scrollBar_esc: 3703 case scrollBar_esc:
3674 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
3675 { 3705 {
3676 resize_all_windows (0, 0, 0); 3706 resize_all_windows (0, 0, 0);
… …
3688 break; 3718 break;
3689 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3724 break;
3695#if 0
3696 case 1001: 3725 case 1002:
3697 break; /* X11 mouse highlighting */ 3726 case 1003:
3698#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;
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state)
3701 Options &= ~Opt_scrollTtyOutput;
3702 else
3703 Options |= Opt_scrollTtyOutput; 3738 set_option (Opt_scrollTtyOutput, !state);
3704 break; 3739 break;
3705 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
3706 if (state)
3707 Options |= Opt_scrollTtyKeypress; 3741 set_option (Opt_scrollTtyKeypress, state);
3708 else
3709 Options &= ~Opt_scrollTtyKeypress;
3710 break; 3742 break;
3711 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 3744 if (option (Opt_secondaryScreen))
3713 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 3746 scr_erase_screen (2);
3715 scr_change_screen (state); 3747 scr_change_screen (state);
3716 break; 3748 break;
3717 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 3750 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 3751 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 3753 scr_erase_screen (2);
3722 break; 3754 break;
3723 default: 3755 default:
3724 break; 3756 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 3782 rendset = 0, rendstyle = ~RS_None;
3751 break; 3783 break;
3752 case 1: 3784 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 3785 rendset = 1, rendstyle = RS_Bold;
3754 break; 3786 break;
3787 //case 2: // low intensity
3788 case 3:
3789 rendset = 1, rendstyle = RS_Italic;
3790 break;
3755 case 4: 3791 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 3792 rendset = 1, rendstyle = RS_Uline;
3757 break; 3793 break;
3758 case 5: 3794 case 5: // slowly blinking
3795 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 3796 rendset = 1, rendstyle = RS_Blink;
3760 break; 3797 break;
3761 //case 6: // scoansi light background 3798 //case 6: // scoansi light background
3762 case 7: 3799 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 3800 rendset = 1, rendstyle = RS_RVid;
3764 break; 3801 break;
3765 case 8: 3802 case 8:
3766 // invisible. NYI 3803 // invisible. NYI
3767 break; 3804 break;
3805 //case 9: // crossed out
3768 //case 10: // scoansi acs off 3806 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 3807 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 3808 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 3809 //...
3810 //case 19: // ninth alt font
3811 //case 20: // gothic
3812 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3813 rendset = 0, rendstyle = RS_Bold;
3773 break; 3814 break;
3774 case 22: 3815 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 3816 rendset = 0, rendstyle = RS_Bold;
3817 break;
3818 case 23: // disable italic
3819 rendset = 0, rendstyle = RS_Italic;
3776 break; 3820 break;
3777 case 24: 3821 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 3822 rendset = 0, rendstyle = RS_Uline;
3779 break; 3823 break;
3780 case 25: 3824 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 3825 rendset = 0, rendstyle = RS_Blink;
3782 break; 3826 break;
3827 case 26: // variable spacing (iso 8613)
3828 rendset = 0, rendstyle = RS_Blink;
3829 break;
3783 case 27: 3830 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 3831 rendset = 0, rendstyle = RS_RVid;
3785 break; 3832 break;
3786 case 28:
3787 // visible. NYI 3833 //case 28: // visible. NYI
3788 break; 3834 //case 29: // not crossed-out
3789 } 3835 }
3790 3836
3791 if (rendset != -1) 3837 if (rendset != -1)
3792 { 3838 {
3793 scr_rendition (rendset, rendstyle); 3839 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 3850 case 35:
3805 case 36: 3851 case 36:
3806 case 37: 3852 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3853 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 3854 break;
3809#ifdef TTY_256COLOR 3855 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 3856 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 3857 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3858 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 3859 i += 2;
3815 } 3860 }
3816 break; 3861 break;
3817#endif
3818 case 39: /* default fg */ 3862 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 3863 scr_color (Color_fg, Color_fg);
3820 break; 3864 break;
3821 3865
3822 case 40: 3866 case 40:
… …
3827 case 45: 3871 case 45:
3828 case 46: 3872 case 46:
3829 case 47: 3873 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3874 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 3875 break;
3832#ifdef TTY_256COLOR 3876 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 3877 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 3878 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3879 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 3880 i += 2;
3838 } 3881 }
3839 break; 3882 break;
3840#endif
3841 case 49: /* default bg */ 3883 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 3884 scr_color (Color_bg, Color_bg);
3843 break; 3885 break;
3844 3886
3845#ifndef NO_BRIGHTCOLOR 3887 //case 50: // not variable spacing
3888
3889#if !ENABLE_MINIMAL
3846 case 90: 3890 case 90:
3847 case 91: /* set bright fg color */ 3891 case 91: /* set bright fg color */
3848 case 92: 3892 case 92:
3849 case 93: 3893 case 93:
3850 case 94: 3894 case 94:
3851 case 95: 3895 case 95:
3852 case 96: 3896 case 96:
3853 case 97: 3897 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3898 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 3899 break;
3857 case 100: 3900 case 100:
3858 case 101: /* set bright bg color */ 3901 case 101: /* set bright bg color */
3859 case 102: 3902 case 102:
3860 case 103: 3903 case 103:
3861 case 104: 3904 case 104:
3862 case 105: 3905 case 105:
3863 case 106: 3906 case 106:
3864 case 107: 3907 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3908 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 3909 break;
3868#endif 3910#endif
3869
3870 } 3911 }
3871 } 3912 }
3872} 3913}
3873/*}}} */ 3914/*}}} */
3874 3915
… …
3877rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
3878{ 3919{
3879 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
3880 3921
3881 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
3882 { /* query graphics */ 3924 /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 3926 return;
3885 } 3927 }
3886 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
3887 do 3929 do
3888 ch = cmd_getc (); 3930 ch = cmd_getc ();
… …
3898 */ 3940 */
3899void 3941void
3900rxvt_term::tt_printf (const char *fmt,...) 3942rxvt_term::tt_printf (const char *fmt,...)
3901{ 3943{
3902 va_list arg_ptr; 3944 va_list arg_ptr;
3903 unsigned char buf[256]; 3945 char buf[256];
3904 3946
3905 va_start (arg_ptr, fmt); 3947 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 3949 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 3950 tt_write (buf, strlen (buf));
3909} 3951}
3910 3952
3911/* ---------------------------------------------------------------------- */ 3953/* ---------------------------------------------------------------------- */
3912/* 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,
3913 * or generated by us in response to a query ESC sequence. 3955 * or generated by us in response to a query ESC sequence.
3914 */ 3956 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958
3915void 3959void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3960rxvt_term::tt_write (const char *data, unsigned int len)
3917{ 3961{
3918 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;
3919 3964
3920 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;
3921 { 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
3922 if (v_buflen == 0) 3995 if (v_buflen == 0)
3923 { 3996 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 3997 free (v_buffer);
3951 v_buffer = 0; 3998 v_buffer = 0;
3952 v_buflen = 0;
3953 3999
3954 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4001 return;
3967 } 4002 }
4003
4004 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4005 }
4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4007 pty_ev.set (ev::READ);
3969} 4008}
3970 4009
3971/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
3972 4011

Diff Legend

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