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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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>
7 * - original version 7 * - original version
… …
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-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
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; 70
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_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0,
107 XK_Home, 0x21f1,
108 XK_End, 0x21f2,
109
110 XK_Execute, 0x2318,
111 XK_Begin, 0x2320,
112 XK_Delete, 0x2326,
113 XK_Clear, 0x2327,
114 XK_BackSpace, 0x232b,
115 XK_Insert, 0x2380,
116 XK_Control_L, 0x2388,
117 XK_Control_R, 0x2388,
118 XK_Pause, 0x2389,
119 XK_Break, 0x238a,
120 XK_Escape, 0x238b,
121 XK_Undo, 0x238c,
122 XK_Print, 0x2399,
123
124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
132 XK_KP_Space, 0x2422,
133#endif
134 0,
135};
136
137void
138rxvt_term::iso14755_54 (int x, int y)
139{
140 x = Pixel2Col (x);
141 y = Pixel2Row (y);
142
143 if (!IN_RANGE_EXC (x, 0, ncol)
144 || !IN_RANGE_EXC (y, 0, nrow))
145 return;
146
147 for (;;)
148 {
149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
152
153 if (t != NOCHAR || !x)
154 {
155 iso14755_51 (l.t[x], l.r[x], x, y);
156 iso14755buf = ISO_14755_54;
157 break;
158 }
159
160 x--;
161 }
162}
163
164void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{
167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname;
170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173
174# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch))
176 {
177 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr);
180 }
181 else
182# endif
183 {
184 ch2 = ch;
185
186 alloc = 0;
187 chr = &ch2;
188 len = 1;
189 }
190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
215
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217
218 for (int y = 0; y < len; y++)
219 {
220 char buf[9];
221
222 ch = *chr++;
223
224 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '=');
227# if !UNICODE3
228 if (ch >= 0x10000)
229 ch = 0xfffd;
230# endif
231 scr_overlay_set (11, y, ch, r);
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname);
237
238 free (fname);
239
240# if ENABLE_COMBINING
241 if (alloc)
242 delete [] alloc;
243# endif
244}
245#endif
246
247void
248rxvt_term::commit_iso14755 ()
249{
250 wchar_t ch[2];
251
252 ch[0] = iso14755buf & ISO_14755_MASK;
253 ch[1] = 0;
254
255 if (iso14755buf & ISO_14755_51)
256 {
257 char mb[16];
258 int len;
259
260 // allow verbatim 0-bytes and control-bytes to be entered
261 if (ch[0] >= 0x20)
262 len = wcstombs (mb, ch, 16);
263 else
264 {
265 mb[0] = ch[0];
266 len = 1;
267 }
268
269 if (len > 0)
270 tt_write (mb, len);
271 else
272 scr_bell ();
273 }
274
275 iso14755buf = 0;
276}
277
278int
279rxvt_term::hex_keyval (XKeyEvent &ev)
280{
281 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++)
284 {
285 KeySym k = XLookupKeysym (&ev, index);
286
287 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
288 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
289 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
290 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
291 }
292
293 return -1;
294}
295#endif
61 296
62/*{{{ Convert the keypress event into a string */ 297/*{{{ Convert the keypress event into a string */
63void 298void
64rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
65{ 300{
… …
68 KeySym keysym; 303 KeySym keysym;
69#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
71#endif 306#endif
72 int valid_keysym; 307 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
74 309
75 /* 310 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
78 * 313 *
79 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
80 */ 315 */
81 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
84 319
85 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
86 { 321 {
87 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 331 Status status_return;
97 332
98#if 0 333#if 0
99#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
103 else 338 else
104#endif 339#endif
105#endif 340#endif
106 { 341 {
… …
108 343
109 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
113 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
116 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 354 SET_LOCALE (locale);
118 355
119 if (status_return == XLookupChars 356 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
142 } 379 }
143 else 380 else
144#endif 381#endif
145 { 382 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
148 } 385 }
149 386
150 if (valid_keysym) 387 if (valid_keysym)
151 { 388 {
389#ifdef KEYSYM_RESOURCE
390 if (keyboard->dispatch (this, keysym, ev.state))
391 return;
392#endif
393
152 if (TermWin.saveLines) 394 if (saveLines)
153 { 395 {
154#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 397 if (!ctrl && !meta)
156 {
157#else 398#else
158 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
400#endif
159 { 401 {
160#endif
161 int lnsppg; 402 int lnsppg;
162 403
163#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 406#else
166 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
167#endif 408#endif
168 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
169 { 410 {
170 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
171 return; 412 return;
… …
199 scr_move_to (0, 1); 440 scr_move_to (0, 1);
200 return; 441 return;
201 } 442 }
202 else if (keysym == XK_End) 443 else if (keysym == XK_End)
203 { 444 {
204 scr_move_to (1, 0); 445 scr_move_to (1, 1);
205 return; 446 return;
206 } 447 }
207 } 448 }
208#endif 449#endif
209 } 450 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 455 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 456 {
216 keysym += (XK_F11 - XK_F1); 457 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 458 shft = 0; /* turn off Shift */
218 } 459 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 460 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 461 {
221 switch (keysym) 462 switch (keysym)
222 { 463 {
223 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
226 return; 467 return;
468#if TODO
227 /* rxvt extras */ 469 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 471 change_font (FONT_UP);
230 return; 472 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 473 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 474 change_font (FONT_DN);
233 return; 475 return;
476#endif
234 } 477 }
235 } 478 }
236 } 479 }
237#ifdef PRINTPIPE 480
238 if (keysym == XK_Print) 481#if ENABLE_FRILLS || ISO_14755
239 { 482 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 483 if (shft && ctrl)
241 return;
242 } 484 {
243#endif 485 int hv;
244 486
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 487 if (iso14755buf & ISO_14755_51
246 { 488 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 489 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 490 {
250 unsigned int l; 491 commit_iso14755 ();
251 const unsigned char *kbuf0; 492 iso14755buf = ISO_14755_51;
252 493# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 494 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 495# endif
261 ) 496 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 497 }
266 498 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 499 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51;
502# if ISO_14755
503 iso14755_51 (iso14755buf & ISO_14755_MASK);
504# endif
268 return; 505 return;
269 } 506 }
270 else 507 else
508 {
509# if ENABLE_OVERLAY
510 scr_overlay_off ();
271#endif 511# endif
512 iso14755buf = 0;
513 }
514 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED))
518 {
519 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif
524 }
525#endif
526
527#ifdef PRINTPIPE
528 if (keysym == XK_Print)
529 {
530 scr_printscreen (ctrl | shft);
531 return;
532 }
533#endif
534
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 {
272 { 537 {
273 newlen = 1; 538 newlen = 1;
274 switch (keysym) 539 switch (keysym)
275 { 540 {
276#ifndef NO_BACKSPACE_KEY 541#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 542 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 543 if (priv_modes & PrivMode_HaveBackSpace)
279 { 544 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 546 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 547 kbuf[1] = '\0';
283 } 548 }
284 else 549 else
285 STRCPY (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
286 break; 551 break;
287#endif 552#endif
288#ifndef NO_DELETE_KEY 553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
289 case XK_Delete: 564 case XK_Delete:
290 STRCPY (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
291 break; 566 break;
292#endif 567#endif
293 case XK_Tab: 568 case XK_Tab:
294 if (shft) 569 if (shft)
295 STRCPY (kbuf, "\033[Z"); 570 strcpy (kbuf, "\033[Z");
296 else 571 else
297 { 572 {
298#ifdef CTRL_TAB_MAKES_META 573#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 574 if (ctrl)
300 meta = 1; 575 meta = 1;
… …
306 newlen = 0; 581 newlen = 0;
307 } 582 }
308 break; 583 break;
309 584
310#ifdef XK_KP_Left 585#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 586 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 587 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 588 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 589 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 591 {
317 STRCPY (kbuf, "\033OZ"); 592 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 594 break;
320 } 595 }
321 else 596 else
322 /* translate to std. cursor key */ 597 /* translate to std. cursor key */
… …
325#endif 600#endif
326 case XK_Up: /* "\033[A" */ 601 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 602 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 603 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 604 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 606 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 607 /* do Shift first */
333 if (shft) 608 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 609 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 610 else if (ctrl)
336 { 611 {
337 kbuf[1] = 'O'; 612 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 613 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 614 }
340 else if (PrivateModes & PrivMode_aplCUR) 615 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 616 kbuf[1] = 'O';
342 break; 617 break;
343 618
344#ifndef UNSHIFTED_SCROLLKEYS 619#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 620# ifdef XK_KP_Prior
346 case XK_KP_Prior: 621 case XK_KP_Prior:
347 /* allow shift to override */ 622 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 624 {
350 STRCPY (kbuf, "\033Oy"); 625 strcpy (kbuf, "\033Oy");
351 break; 626 break;
352 } 627 }
353 /* FALLTHROUGH */ 628 /* FALLTHROUGH */
354# endif 629# endif
355 case XK_Prior: 630 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 631 strcpy (kbuf, "\033[5~");
357 break; 632 break;
358# ifdef XK_KP_Next 633# ifdef XK_KP_Next
359 case XK_KP_Next: 634 case XK_KP_Next:
360 /* allow shift to override */ 635 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 637 {
363 STRCPY (kbuf, "\033Os"); 638 strcpy (kbuf, "\033Os");
364 break; 639 break;
365 } 640 }
366 /* FALLTHROUGH */ 641 /* FALLTHROUGH */
367# endif 642# endif
368 case XK_Next: 643 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
370 break; 645 break;
371#endif 646#endif
372 case XK_KP_Enter: 647 case XK_KP_Enter:
373 /* allow shift to override */ 648 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 650 {
376 STRCPY (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
377 } 663 }
378 else 664 else
379 { 665 {
380 kbuf[0] = '\r'; 666 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
382 } 668 }
383 break; 669 break;
384 670
385#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
386 case XK_KP_Begin: 672 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
388 break; 674 break;
389 675
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 676#endif
398 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 681 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 682 kbuf[2] += (keysym - XK_KP_F1);
404 break; 683 break;
405 684
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 685 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 686 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 697 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 698 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 699 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 700 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 701 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 703 {
425 STRCPY (kbuf, "\033Oj"); 704 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 705 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 706 }
428 else 707 else
429 { 708 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 710 kbuf[1] = '\0';
432 } 711 }
433 break; 712 break;
434 713
435 case XK_Find: 714 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
437 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
438 case XK_Insert: 728 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
440 break; 730 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 732 case DXK_Remove:
443 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
444#endif 734#endif
445 case XK_Execute: 735 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 736 strcpy (kbuf, "\033[3~");
447 break; 737 break;
448 case XK_Select: 738 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 739 strcpy (kbuf, "\033[4~");
450 break; 740 break;
451#ifdef XK_KP_End 741#ifdef XK_KP_End
452 case XK_KP_End: 742 case XK_KP_End:
453 /* allow shift to override */ 743 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 745 {
456 STRCPY (kbuf, "\033Oq"); 746 strcpy (kbuf, "\033Oq");
457 break; 747 break;
458 } 748 }
459 /* FALLTHROUGH */ 749 /* FALLTHROUGH */
460#endif 750#endif
461 case XK_End: 751 case XK_End:
462 STRCPY (kbuf, KS_END); 752 strcpy (kbuf, KS_END);
463 break; 753 break;
464#ifdef XK_KP_Home 754#ifdef XK_KP_Home
465 case XK_KP_Home: 755 case XK_KP_Home:
466 /* allow shift to override */ 756 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 758 {
469 STRCPY (kbuf, "\033Ow"); 759 strcpy (kbuf, "\033Ow");
470 break; 760 break;
471 } 761 }
472 /* FALLTHROUGH */ 762 /* FALLTHROUGH */
473#endif 763#endif
474 case XK_Home: 764 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 765 strcpy (kbuf, KS_HOME);
476 break; 766 break;
477 767
478#define FKEY(n, fkey) \ 768#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 770
… …
532#undef FKEY 822#undef FKEY
533 default: 823 default:
534 newlen = 0; 824 newlen = 0;
535 break; 825 break;
536 } 826 }
827
537 if (newlen) 828 if (newlen)
538 len = STRLEN (kbuf); 829 len = strlen (kbuf);
539 } 830 }
540 831
541 /* 832 /*
542 * Pass meta for all function keys, if 'meta' option set 833 * Pass meta for all function keys, if 'meta' option set
543 */ 834 */
… …
550 else if (ctrl && keysym == XK_minus) 841 else if (ctrl && keysym == XK_minus)
551 { 842 {
552 len = 1; 843 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 844 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 845 }
846 else if (keysym == XK_ISO_Left_Tab)
847 {
848 strcpy (kbuf, "\033[Z");
849 len = 3;
850 }
555 else 851 else
556 { 852 {
557#ifdef META8_OPTION 853#ifdef META8_OPTION
558 /* set 8-bit on */ 854 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
560 { 856 {
561 unsigned char *ch; 857 char *ch;
562 858
563 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 860 *ch |= 0x80;
565 861
566 meta = 0; 862 meta = 0;
… …
568#endif 864#endif
569 /* nil */ ; 865 /* nil */ ;
570 } 866 }
571 } 867 }
572 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
573 if (len <= 0) 872 if (len <= 0)
574 return; /* not mapped */ 873 return; /* not mapped */
575 874
576 if (Options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 876 if (view_start)
578 { 877 {
579 TermWin.view_start = 0; 878 view_start = 0;
580 want_refresh = 1; 879 want_refresh = 1;
581 } 880 }
582 881
583 /* 882 /*
584 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 898#ifdef META8_OPTION
600 && meta_char == C0_ESC 899 && meta_char == C0_ESC
601#endif 900#endif
602 ) 901 )
603 { 902 {
604 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
605 tt_write (&ch, 1); 904 tt_write (&ch, 1);
606 } 905 }
607 906
608#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
617#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
619} 918}
620/*}}} */ 919/*}}} */
621 920
622#if (MENUBAR_MAX) 921#if defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */
625unsigned int 922unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 924{
628 unsigned int n, s; 925 unsigned int n, s;
629 926
630 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 929
633 if (n > 0 && s < count) 930 if (n > 0 && s < count)
634 { 931 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 932 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 933 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 934 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 935 cmdbuf_endp -= n;
639 s += n; 936 s += n;
640 } 937 }
… …
650 947
651 cmd_parse (); 948 cmd_parse ();
652 949
653 return 0; 950 return 0;
654} 951}
655#endif /* MENUBAR_MAX */ 952#endif
656 953
657void 954void
658rxvt_term::flush () 955rxvt_term::flush ()
659{ 956{
957 flush_ev.stop ();
958
660#ifdef TRANSPARENT 959#ifdef TRANSPARENT
661 if (want_full_refresh) 960 if (want_full_refresh)
662 { 961 {
663 want_full_refresh = 0; 962 want_full_refresh = 0;
664 scr_clear (); 963 scr_clear ();
665 scr_touch (false); 964 scr_touch (false);
666 want_refresh = 1;
667 } 965 }
668#endif 966#endif
669 967
670 if (want_refresh) 968 if (want_refresh)
671 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
672 scr_refresh (refresh_type); 1008 scr_refresh ();
673 scrollbar_show (1); 1009 scrollbar_show (1);
674#ifdef USE_XIM 1010#ifdef USE_XIM
675 IMSendSpot (); 1011 IMSendSpot ();
676#endif 1012#endif
677
678 } 1013 }
679 1014
680 display->flush (); 1015 display->flush ();
681} 1016}
682 1017
683void 1018void
684rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
685{ 1020{
686 SET_R (this); 1021 make_current ();
687 SET_LOCALE (locale);
688 1022
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0;
689 flush (); 1036 flush ();
690} 1037}
691 1038
692#ifdef CURSOR_BLINK 1039#ifdef CURSOR_BLINK
693void 1040void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1042{
696 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1044 want_refresh = 1;
698 1045
699 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1047}
701#endif 1048#endif
702 1049
703#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
704void 1051void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1058 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1059 }
713} 1060}
714#endif 1061#endif
715 1062
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void
1065rxvt_term::cont_scroll_cb (time_watcher &w)
1066{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1069 {
1070 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 }
1073}
1074#endif
1075
1076#ifdef SELECTION_SCROLLING
1077void
1078rxvt_term::sel_scroll_cb (time_watcher &w)
1079{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1085 }
1086}
1087#endif
1088
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void
1091rxvt_term::slip_wheel_cb (time_watcher &w)
1092{
1093 if (mouse_slip_wheel_speed == 0
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 }
1103}
1104#endif
1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
716bool 1124bool
717rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
718{ 1126{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1128
1129 if (CBUFSIZ == n)
1130 {
1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1132 n = 0;
1133 }
720 1134
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
724 1138
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1140
727 if (n > 0) 1141 if (r > 0)
728 { 1142 {
729 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
730 return true; 1144 return true;
731 } 1145 }
732 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
733 destroy (); 1158 destroy ();
1159 }
734 1160
735 return false; 1161 return false;
736} 1162}
737 1163
738void 1164void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1166{
741 SET_R (this); 1167 make_current ();
742 SET_LOCALE (locale); 1168
1169 if (revents & EVENT_READ)
1170 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ())
1172 if (cmd_parse ())
1173 break;
743 1174
744 if (revents & EVENT_WRITE) 1175 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1176 pty_write ();
746 else if (revents & EVENT_READ) 1177}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1178
760 if (cmd_parse ()) 1179void
761 break; 1180rxvt_term::pointer_unblank ()
762 } 1181{
763 } 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1183 recolour_cursor ();
1184
1185#ifdef POINTER_BLANK
1186 hidden_pointer = 0;
1187
1188 if (OPTION (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif
764} 1191}
765 1192
766#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
767void 1194void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
781{ 1196{
782 if (! (Options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
783 return; 1198 return;
784 1199
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1201 XFlush (display->display);
787 1202
788 hidden_pointer = 1; 1203 hidden_pointer = 1;
789} 1204}
790 1205
791void 1206void
792rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
793{ 1208{
794 SET_R (this); 1209 make_current ();
795 SET_LOCALE (locale);
796 1210
797 pointer_blank (); 1211 pointer_blank ();
798} 1212}
799#endif 1213#endif
800 1214
… …
807 x = ev.x; 1221 x = ev.x;
808 y = ev.y; 1222 y = ev.y;
809 pixel_position (&x, &y); 1223 pixel_position (&x, &y);
810 1224
811 if (MEvent.button == AnyButton) 1225 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1226 button_number = 3;
814 }
815 else 1227 else
816 { 1228 {
817 button_number = MEvent.button - Button1; 1229 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1230 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1231 if (button_number >= 3)
820 button_number += (64 - 3); 1232 button_number += (64 - 3);
821 } 1233 }
822 1234
823 if (PrivateModes & PrivMode_MouseX10) 1235 if (priv_modes & PrivMode_MouseX10)
824 { 1236 {
825 /* 1237 /*
826 * do not report ButtonRelease 1238 * do not report ButtonRelease
827 * no state info allowed 1239 * no state info allowed
828 */ 1240 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1255 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1256 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1257#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1258 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1259#endif
848
849 } 1260 }
850 1261
851#ifdef DEBUG_MOUSEREPORT 1262#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1263 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1264 if (key_state & 16)
854 fputc ('C', stderr); 1265 fputc ('C', stderr);
855 if (key_state & 4) 1266 if (key_state & 4)
856 fputc ('S', stderr); 1267 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1271 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1272 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1273 button_number,
863 x + 1, 1274 x + 1,
864 y + 1); 1275 y + 1);
865#else 1276#endif
1277
866 tt_printf ("\033[M%c%c%c", 1278 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
868 (32 + x + 1), 1280 (32 + x + 1),
869 (32 + y + 1)); 1281 (32 + y + 1));
870#endif
871} 1282}
872 1283
873#ifdef USING_W11LIB 1284#ifdef USING_W11LIB
874void 1285void
875rxvt_W11_process_x_event (XEvent *ev) 1286rxvt_W11_process_x_event (XEvent *ev)
… …
882 1293
883/*{{{ process an X event */ 1294/*{{{ process an X event */
884void 1295void
885rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
886{ 1297{
887 SET_R (this); 1298 make_current ();
888 SET_LOCALE (locale);
889 1299
890#if defined(CURSOR_BLINK) 1300 dDisp;
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1301
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
900 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1305 return;
920#endif
921 1306
1307 // for XQueryPointer
922 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1310 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1311
975 switch (ev.type) 1312 switch (ev.type)
976 { 1313 {
977 case KeyPress: 1314 case KeyPress:
1315#if ISO_14755
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
978 lookup_key (ev.xkey); 1318 lookup_key (ev.xkey);
1319
1320 break;
1321
1322 case KeyRelease:
1323 {
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
979 break; 1386 break;
980 1387
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
986 else 1393#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1394 break;
995 } 1395 }
996#endif
997 1396
998 case ButtonPress: 1397 case ButtonPress:
999 button_press (ev.xbutton); 1398 button_press (ev.xbutton);
1000 break; 1399 break;
1001 1400
1002 case ButtonRelease: 1401 case ButtonRelease:
1003 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1004 break; 1403 break;
1005 1404
1006 case ClientMessage: 1405 case ClientMessage:
1007 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32)
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1407 {
1017 /* Get Dnd data */ 1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1409 {
1019 int ActualFormat; 1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1020 unsigned char *data; 1411 {
1021 unsigned long Size, RemainingBytes; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))
1022 1413 destroy ();
1023 XGetWindowProperty (display->display, display->root, 1414 }
1024 xa[XA_DNDSELECTION], 1415#if ENABLE_EWMH
1025 0L, 1000000L, 1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1026 False, AnyPropertyType, 1417 XSendEvent (disp, ev.xclient.window = display->root,
1027 &ActualType, &ActualFormat, 1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1028 &Size, &RemainingBytes,
1029 &data); 1419 &ev);
1030 XChangeProperty (display->display, display->root, 1420#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1421 }
1032 8, PropModeReplace, 1422#if ENABLE_XEMBED
1033 data, STRLEN (data)); 1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1424 {
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1426 focus_in ();
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out ();
1429 }
1430#endif
1036 } 1431 }
1037#endif /* OFFIX_DND */
1038 break; 1432 break;
1039 1433
1040 case MappingNotify: 1434 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1435 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1436 break;
1043 1437
1044 /* 1438 /*
1045 * XXX: this is not the _current_ arrangement 1439 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1440 * Here's my conclusion:
… …
1065 break; 1459 break;
1066 } 1460 }
1067 break; 1461 break;
1068 1462
1069 case FocusIn: 1463 case FocusIn:
1070 if (!TermWin.focus) 1464 focus_in ();
1465 break;
1466
1467 case FocusOut:
1468 focus_out ();
1469 break;
1470
1471 case ConfigureNotify:
1472 if (ev.xconfigure.window == parent[0])
1071 { 1473 {
1072 TermWin.focus = 1; 1474 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1475 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 1476
1477 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1478 {
1479 seen_resize = 1;
1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1481 }
1482
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1486 if (OPTION (Opt_transparent))
1487 check_our_parents ();
1488#endif
1083 } 1489 }
1084 break; 1490 break;
1085 1491
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1492 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1494 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1496
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136
1137 }
1138 break; 1497 break;
1139 1498
1140 case SelectionClear: 1499 case SelectionClear:
1141 selection_clear (); 1500 selection_clear ();
1142 break; 1501 break;
1143 1502
1144 case SelectionNotify: 1503 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1504 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1506 break;
1149 1507
1150 case SelectionRequest: 1508 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1152 break; 1510 break;
1153 1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break;
1519
1154 case UnmapNotify: 1520 case UnmapNotify:
1155 TermWin.mapped = 0; 1521 mapped = 0;
1156#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1158#endif 1524#endif
1159 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break; 1526 break;
1167 1527
1168#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1169 case ReparentNotify: 1529 case ReparentNotify:
1170 rootwin_cb (ev); 1530 rootwin_cb (ev);
1171 break; 1531 break;
1172#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1173 1533
1174 case GraphicsExpose: 1534 case GraphicsExpose:
1175 case Expose: 1535 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1177 { 1537 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1538 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1541 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1542
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1548
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1549 want_refresh = 1;
1189 } 1550 }
1190 else 1551 else
1191 { 1552 {
1192 XEvent unused_event; 1553 XEvent unused_event;
1193 1554
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1555 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1556 ;
1196 &unused_event)) ; 1557 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1558 ;
1198 GraphicsExpose, 1559
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1201 { 1561 {
1202 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1203 scrollbar_show (0); 1563 scrollbar_show (0);
1204 } 1564 }
1205#ifdef MENUBAR 1565
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1566#ifdef TRANSPARENT
1207 menubar_expose (); 1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (disp, ev.xany.window);
1208#endif 1569#endif
1209 } 1570 }
1210 break; 1571 break;
1211 1572
1212 case MotionNotify: 1573 case MotionNotify:
1213#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1575 if (hidden_pointer)
1215 pointer_unblank (); 1576 pointer_unblank ();
1216#endif 1577#endif
1217#if MENUBAR 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1579 break;
1580
1581 if (ev.xany.window == vt)
1219 { 1582 {
1220 menubar_control (ev.xbutton); 1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1585 ; // nop
1223#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break;
1226
1227 if (ev.xany.window == TermWin.vt)
1228 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1587 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1232 ; 1589 ;
1233 1590
1234 XQueryPointer (display->display, TermWin.vt, 1591 XQueryPointer (disp, vt,
1235 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1594 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1595 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1597 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1598 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1599 {
1243#endif 1600#endif
1601#if ISO_14755
1602 // 5.4
1603 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1604 {
1605 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1606 break;
1607 }
1608#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1611
1246#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1615 {
1250 int dist; 1616 int dist;
1251
1252 pending_scroll_selection=1;
1253 1617
1254 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
1256 */ 1620 */
1257 if (scroll_selection_delay<=0) 1621 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1623
1260 /* save the event params so we can highlight 1624 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1625 * the selection in the pending-scroll loop
1262 */ 1626 */
1263 selection_save_x=ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1630
1268 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1270 { 1633 {
1271 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1273 } 1636 }
1274 else 1637 else
1275 { 1638 {
1276 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1640 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1641 }
1642
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1643 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1;
1282 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1284 } 1648 }
1285 else 1649 else
1286 { 1650 {
1287 /* we are within the text window, so we 1651 /* we are within the text window, so we
1288 * shouldn't be scrolling 1652 * shouldn't be scrolling
1289 */ 1653 */
1290 pending_scroll_selection = 0; 1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop();
1291 } 1656 }
1292#endif 1657#endif
1293#ifdef MOUSE_THRESHOLD 1658#ifdef MOUSE_THRESHOLD
1294
1295 } 1659 }
1296#endif 1660#endif
1297
1298 } 1661 }
1299 } 1662 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1664 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1665 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1666 MotionNotify, &ev))
1667 ;
1668
1304 XQueryPointer (display->display, scrollBar.win, 1669 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1672 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1673 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1675 scrollbar_size ());
1311 scr_refresh (refresh_type); 1676 want_refresh = 1;
1312 refresh_limit = 0; 1677 refresh_limit = 0;
1313 scrollbar_show (1); 1678 scrollbar_show (1);
1314 } 1679 }
1315 break; 1680 break;
1316 } 1681 }
1317}
1318 1682
1683skip_switch: ;
1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1711}
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1722
1723#if USE_XIM
1724 if (Input_Context != NULL)
1725 {
1726 IMSetStatusPosition ();
1727 XSetICFocus (Input_Context);
1728 }
1729#endif
1730#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif
1734#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade])
1736 {
1737 pix_colors = pix_colors_focused;
1738 scr_recolour ();
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ENABLE_OVERLAY
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782#if TRANSPARENT
1319void 1783void
1320rxvt_term::rootwin_cb (XEvent &ev) 1784rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1785{
1322 SET_R (this); 1786 make_current ();
1323 SET_LOCALE (locale);
1324 1787
1325 switch (ev.type) 1788 switch (ev.type)
1326 { 1789 {
1327 case PropertyNotify: 1790 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1791 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1792 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1793 * use the property to determine the pixmap. We use it later on.
1340 */ 1794 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1795 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1796 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1797 return;
1346 }
1347 1798
1348 /* FALLTHROUGH */ 1799 /* FALLTHROUGH */
1349 case ReparentNotify: 1800 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1801 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1802 want_refresh = want_full_refresh = 1;
1353 break; 1803 break;
1354#endif
1355 } 1804 }
1356} 1805}
1806#endif
1357 1807
1358void 1808void
1359rxvt_term::button_press (XButtonEvent &ev) 1809rxvt_term::button_press (XButtonEvent &ev)
1360{ 1810{
1361 int reportmode = 0, clickintime; 1811 int reportmode = 0, clickintime;
1362 1812
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1813 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1814
1364 if (!bypass_keystate) 1815 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1816 reportmode = !! (priv_modes & PrivMode_mouse_report);
1817
1366 /* 1818 /*
1367 * VT window processing of button press 1819 * VT window processing of button press
1368 */ 1820 */
1369 if (ev.window == TermWin.vt) 1821 if (ev.window == vt)
1370 { 1822 {
1823#if ISO_14755
1824 // 5.4
1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1826 {
1827 iso14755_54 (ev.x, ev.y);
1828 return;
1829 }
1830#endif
1831
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1832 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1833
1372 if (reportmode) 1834 if (reportmode)
1373 { 1835 {
1374 /* mouse report from vt window */ 1836 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1837 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1838 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1839#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1840 if (ev.button == MEvent.button && clickintime)
1379 { 1841 {
1380 /* same button, within alloted time */ 1842 /* same button, within alloted time */
1381 MEvent.clicks++; 1843 MEvent.clicks++;
1844
1382 if (MEvent.clicks > 1) 1845 if (MEvent.clicks > 1)
1383 { 1846 {
1384 /* only report double clicks */ 1847 /* only report double clicks */
1385 MEvent.clicks = 2; 1848 MEvent.clicks = 2;
1386 mouse_report (ev); 1849 mouse_report (ev);
… …
1405 } 1868 }
1406 else 1869 else
1407 { 1870 {
1408 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1873
1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1410 switch (ev.button) 1875 switch (ev.button)
1411 { 1876 {
1412 case Button1: 1877 case Button1:
1878 /* allow meta + click to select rectangular areas */
1879 /* should be done in screen.C */
1880#if ENABLE_FRILLS
1881 selection.rect = !!(ev.state & ModMetaMask);
1882#else
1883 selection.rect = false;
1884#endif
1885
1413 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1888 {
1416 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1418 else 1891 else
1419 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
1420 } 1893 }
1421 else 1894 else
1422 { 1895 {
1423 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++; 1897 MEvent.clicks++;
1425 else 1898 else
1426 MEvent.clicks = 1; 1899 MEvent.clicks = 1;
1427 1900
1428 selection_click (MEvent.clicks, ev.x, ev.y); 1901 selection_click (MEvent.clicks, ev.x, ev.y);
1429 } 1902 }
1430 1903
1431 MEvent.button = Button1; 1904 MEvent.button = Button1;
1432 break; 1905 break;
1433 1906
1434 case Button3: 1907 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1437 else 1910 else
1438 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1912
1439 MEvent.button = Button3; 1913 MEvent.button = Button3;
1440 break; 1914 break;
1441 } 1915 }
1442 } 1916 }
1917
1443 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1444 return; 1919 return;
1445 } 1920 }
1446 1921
1447 /* 1922 /*
… …
1513 upordown = 1; /* down */ 1988 upordown = 1; /* down */
1514 } 1989 }
1515 if (upordown) 1990 if (upordown)
1516 { 1991 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1994#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1995 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1996 {
1522 if (upordown < 0) 1997 if (upordown < 0)
1523 scrollBar.setUp (); 1998 scrollBar.setUp ();
… …
1539 break; 2014 break;
1540 case R_SB_ALIGN_BOTTOM: 2015 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2016 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2017 break;
1543 } 2018 }
2019
1544 if (scrollBar.style == R_SB_XTERM 2020 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2021 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2022 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2024
1549 scrollBar.setMotion (); 2025 scrollBar.setMotion ();
1550 break; 2026 break;
1551 2027
1552 case Button1: 2028 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2029 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2033 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1559 { 2035 {
1560 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1563# else 2039# else
1564 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1565# endif 2041# endif
1566 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1569# else 2045# else
1570 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1571# endif 2047# endif
1572 else 2048 else
1573 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1574 } 2050 }
1575 else 2051 else
1576 { 2052 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2054 (nrow
1579 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2056 / scrollbar_size ()));
1581 } 2057 }
2058
1582 break; 2059 break;
1583 } 2060 }
1584 } 2061 }
2062
1585 return; 2063 return;
1586 } 2064 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2065}
1595 2066
1596void 2067void
1597rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1598{ 2069{
1599 int reportmode = 0; 2070 int reportmode = 0;
1600 2071
1601 csrO = 0; /* reset csr Offset */ 2072 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2073 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2074 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2075
1605 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1606 { 2077 {
1607 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1608 scrollbar_show (0); 2079 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2080 }
2081
1614#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop();
1616#endif 2085#endif
2086
1617 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1618 { 2088 {
2089#if ISO_14755
2090 // 5.4
2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2092 return;
2093#endif
1619 if (reportmode) 2094 if (reportmode)
1620 { 2095 {
1621 /* mouse report from vt window */ 2096 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2112 MEvent.button = AnyButton;
1638 mouse_report (ev); 2113 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2114#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2115 return;
1641 } 2116 }
2117
1642 /* 2118 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2119 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2120 * when overriding mouse reporting
1645 */ 2121 */
1646 if (PrivateModes & PrivMode_mouse_report 2122 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2123 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2124 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2125 selection_extend (ev.x, ev.y, 0);
2126
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
1650 2129
1651 switch (ev.button) 2130 switch (ev.button)
1652 { 2131 {
1653 case Button1: 2132 case Button1:
1654 case Button3: 2133 case Button3:
1655 selection_make (ev.time); 2134 selection_make (ev.time);
1656 break; 2135 break;
2136
1657 case Button2: 2137 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2140 break;
2141
1660#ifdef MOUSE_WHEEL 2142#ifdef MOUSE_WHEEL
1661 case Button4: 2143 case Button4:
1662 case Button5: 2144 case Button5:
1663 { 2145 {
1664 int i; 2146 int i;
1665 page_dirn v; 2147 page_dirn v;
1666 2148
1667 v = (ev.button == Button4) ? UP : DN; 2149 v = ev.button == Button4 ? UP : DN;
2150
1668 if (ev.state & ShiftMask) 2151 if (ev.state & ShiftMask)
1669 i = 1; 2152 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2153 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2154 i = nrow - 1;
1672 else 2155 else
1673 i = 5; 2156 i = 5;
2157
1674# ifdef MOUSE_SLIP_WHEELING 2158# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2159 if (ev.state & ControlMask)
1676 { 2160 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2161 mouse_slip_wheel_speed += v ? -1 : 1;
2162 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2163 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2164
2165 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2166 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2167
2168 slip_wheel_ev.start ();
2169 }
2170 else
2171 {
2172# endif
2173 scr_page (v, i);
2174 scrollbar_show (1);
2175# ifdef MOUSE_SLIP_WHEELING
1679 } 2176 }
1680# endif 2177# endif
1681# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1);
1691 }
1692# endif
1693
1694 } 2178 }
1695 break; 2179 break;
1696#endif 2180#endif
1697
1698 } 2181 }
1699 } 2182 }
1700#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev);
1703#endif
1704} 2183}
1705
1706 2184
1707#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2186#if TINTING
2187/* taken from aterm-0.4.2 */
2188
2189typedef uint32_t RUINT32T;
2190
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{
2193 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
2199
2200 Visual *visual = display->visual;
2201
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203
2204 /* for convenience */
2205 mask_r = visual->red_mask;
2206 mask_g = visual->green_mask;
2207 mask_b = visual->blue_mask;
2208
2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2282 } else {
2283 if (shade < 0) shade = 0;
2284 if (shade > 100) shade = 100;
2285
2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2287
2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2291 }
2292
2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2295 {
2296 unsigned int tmp;
2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 16:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0xf800)>>11] |
2364 lookup_g[(*p & 0x07e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xff0000)>>16] |
2403 lookup_g[(*p & 0x00ff00)>> 8] |
2404 lookup_b[(*p & 0x0000ff)] |
2405 (*p & ~0xffffff);
2406 }
2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 }
2412
2413 free (lookup);
2414}
2415#endif
2416
1708/* 2417/*
1709 * Check our parents are still who we think they are. 2418 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2419 * Do transparency updates if required
1711 */ 2420 */
1712int 2421int
1713rxvt_term::check_our_parents () 2422rxvt_term::check_our_parents ()
1714{ 2423{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2424 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2425 unsigned long nitems, bytes_after;
1717 Atom atype; 2426 Atom atype;
1718 unsigned char *prop = NULL; 2427 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2428 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2429 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
1722 2432
1723 pchanged = 0; 2433 pchanged = 0;
1724 2434
1725 if (! (Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1727 2437
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1730 2440
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
2442
1732 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1733 { 2444 {
1734 if (am_transparent) 2445 if (am_transparent)
1735 { 2446 {
1736 pchanged = 1; 2447 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1740 } 2450 }
2451
1741 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1742 } 2453 }
1743 2454
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2456 XSync (disp, False);
1746 2457
1747 /* 2458 /*
1748 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
1751 */ 2462 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2463 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2466 &nitems, &bytes_after, &prop) == Success);
2467
1756 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
1757 have_pixmap = 0; 2479 have_pixmap = 0;
1758 else 2480 else
1759 { 2481 {
1760 have_pixmap = 1; 2482 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2483 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2484 XFree (prop);
1763 } 2485 }
2486
1764 if (have_pixmap) 2487 if (have_pixmap)
1765 { 2488 {
1766 /* 2489 /*
1767 * Copy display->root pixmap transparency 2490 * Copy display->root pixmap transparency
1768 */ 2491 */
… …
1771 Window cr; 2494 Window cr;
1772 XImage *image; 2495 XImage *image;
1773 GC gc; 2496 GC gc;
1774 XGCValues gcvalue; 2497 XGCValues gcvalue;
1775 2498
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2503 nx = ny = 0;
1781 2504
1782 if (sx < 0) 2505 if (sx < 0)
… …
1791 nh += sy; 2514 nh += sy;
1792 ny = -sy; 2515 ny = -sy;
1793 sy = 0; 2516 sy = 0;
1794 } 2517 }
1795 2518
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
1798 allowedxerror = -1; 2523 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2525
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2528 allowedxerror = 0;
2529
1804 if (image == NULL) 2530 if (image == NULL)
1805 { 2531 {
1806 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
1807 { 2533 {
1808 pchanged = 1; 2534 pchanged = 1;
1809 if (TermWin.pixmap != None) 2535 if (pixmap != None)
1810 { 2536 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
1812 TermWin.pixmap = None; 2538 pixmap = None;
1813 } 2539 }
1814 } 2540 }
2541
1815 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
1816 } 2543 }
1817 else 2544 else
1818 { 2545 {
1819 if (TermWin.pixmap != None) 2546 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2556
2557 ShadeXImage (display, image, shade, rm, gm, bm);
2558 }
2559#endif
2560
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2562 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2565 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2566 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2567 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1832 TermWin.pixmap); 2569 XClearWindow (disp, parent[0]);
2570
1833 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2572 pchanged = 1;
2573
1835 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
1836 } 2575 }
1837 } 2576 }
1838 2577
1839 if (!am_pixmap_trans) 2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
1840 { 2581 {
1841 unsigned int n; 2582 unsigned int n;
1842 /* 2583 /*
1843 * InheritPixmap transparency 2584 * InheritPixmap transparency
1844 */ 2585 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2587 {
1849 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
1852 XFree (list); 2591 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2592
1854 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
1855 { 2594 {
1856 if (oldp != None) 2595 if (oldp != None)
1857 pchanged = 1; 2596 pchanged = 1;
2597
1858 break; 2598 break;
1859 } 2599 }
2600
1860 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
1861 pchanged = 1; 2602 pchanged = 1;
1862 } 2603 }
1863 2604
1864 n = 0; 2605 n = 0;
1865 2606
1866 if (pchanged) 2607 if (pchanged)
1867 { 2608 {
1868 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
1869 { 2610 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2611 XGetWindowAttributes (disp, parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2613 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2615 break;
1876 } 2616 }
1877 } 2617 }
1878 } 2618 }
1879 2619
1880 if (n > (int) (sizeof (TermWin.parent) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2621 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2624 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
1890 } 2626 }
1891 else 2627 else
1892 { 2628 {
2629#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2630 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2632 sleep (1);
1903# endif 2633#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2635 {
1907 ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2637 XClearWindow (disp, parent[n]);
1909 ParentRelative); 2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
1910 am_transparent = 1; 2641 am_transparent = 1;
1911 } 2642 }
1912 2643
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
1915 } 2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
1916 return pchanged; 2662 return pchanged;
1917} 2663}
1918#endif 2664#endif
1919 2665
1920/*}}} */ 2666/*}}} */
1921 2667
1922bool 2668bool
1923rxvt_term::cmd_parse () 2669rxvt_term::cmd_parse ()
1924{ 2670{
1925 bool flag = false; 2671 bool flag = false;
1926 unicode_t ch = NOCHAR; 2672 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2673 char *seq_begin; // remember start of esc-sequence here
1928 2674
1929 for (;;) 2675 for (;;)
1930 { 2676 {
1931 if (ch == NOCHAR) 2677 if (ch == NOCHAR)
1932 { 2678 {
1933 seq_begin = cmdbuf_ptr; 2679 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2680 ch = next_char ();
1935 }
1936 2681
1937 if (ch == NOCHAR) // TODO: improve 2682 if (ch == NOCHAR)
1938 break; 2683 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2684 }
2685
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 {
2688 if (!seen_input)
2689 {
2690 seen_input = 1;
2691 // many badly-written programs (e.g. jed) contain a race condition:
2692 // they first read the screensize and then install a SIGWINCH handler.
2693 // some window managers resize the window early, and these programs
2694 // then sometimes get the size wrong.
2695 // unfortunately other programs are even more buggy and dislike
2696 // being sent SIGWINCH, so only do it when we were in fact being
2697 // resized.
2698 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH);
2700 }
2701
1942 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2703 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2704 bool refreshnow = false;
1945 int nlines = 0; 2705 int nlines = 0;
1946 unicode_t *str = buf; 2706 wchar_t *str = buf;
1947 2707 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2708
1950 for (;;) 2709 for (;;)
1951 { 2710 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2712 break;
1957 2713
1958 *str++ = ch; 2714 *str++ = ch;
1959 2715
1960 if (ch == '\n') 2716 if (ch == C0_LF || str >= eol)
1961 { 2717 {
2718 if (ch == C0_LF)
1962 nlines++; 2719 nlines++;
2720
1963 refresh_count++; 2721 refresh_count++;
1964 2722
1965 if (! (Options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2725 {
1968 refreshnow = true; 2726 refreshnow = true;
1969 flag = true; 2727 refresh_count = 0;
1970 ch = NOCHAR; 2728 ch = NOCHAR;
1971 break; 2729 break;
1972 } 2730 }
1973 2731
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
1976 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1977 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, str - buf, nlines);
2738
1978 nlines = 0; 2739 nlines = 0;
1979 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
1980 } 2742 }
2743
2744 if (str >= eol)
2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2748 ch = NOCHAR;
2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
1981 } 2755 }
1982 2756
1983 if (str >= buf + UBUFSIZ) 2757 seq_begin = cmdbuf_ptr;
1984 { 2758 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2759 }
1989 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2763 scr_add_lines (buf, str - buf, nlines);
1991 2764
1992 /* 2765 /*
1993 * If there have been a lot of new lines, then update the screen 2766 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2767 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2768 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2769 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2770 */
2001 if (refreshnow) 2771 if (refreshnow)
2002 { 2772 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2774 refresh_limit++;
2005 2775 else
2776 {
2777 flag = true;
2006 scr_refresh (refresh_type); 2778 scr_refresh ();
2779 want_refresh = 1;
2780 }
2007 } 2781 }
2008 2782
2009 } 2783 }
2010 else 2784 else
2011 { 2785 {
… …
2026 2800
2027 return flag; 2801 return flag;
2028} 2802}
2029 2803
2030// read the next character 2804// read the next character
2031unicode_t 2805wchar_t
2032rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2033{ 2807{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2809 {
2036 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2812 return *cmdbuf_ptr++;
2039 2813
2040 wchar_t wc; 2814 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2815 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2816
2043 if (len == (size_t)-2) 2817 if (len == (size_t)-2)
2044 { 2818 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2819 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2820 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2821 break;
2048 } 2822 }
2049 2823
2050 if (len == (size_t)-1) 2824 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2825 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2826
2053 // assume wchar == unicode 2827 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2828 cmdbuf_ptr += len;
2055 return wc; 2829 return wc & UNICODE_MASK;
2056 } 2830 }
2057 2831
2058 return NOCHAR; 2832 return NOCHAR;
2059} 2833}
2834
2835// read the next octet
2836uint32_t
2837rxvt_term::next_octet () NOTHROW
2838{
2839 return cmdbuf_ptr < cmdbuf_endp
2840 ? (unsigned char)*cmdbuf_ptr++
2841 : NOCHAR;
2842}
2843
2844static class out_of_input out_of_input;
2060 2845
2061/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2062/* 2847/*
2063 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2064 * to the command. 2849 * to the command.
2065 */ 2850 */
2066unicode_t 2851wchar_t
2067rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2853{
2069 unicode_t c = next_char (); 2854 wchar_t c = next_char ();
2855
2856 if (c == NOCHAR)
2857 throw out_of_input;
2858
2859 return c;
2860}
2861
2862uint32_t
2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2864{
2865 uint32_t c = next_octet ();
2070 2866
2071 if (c == NOCHAR) 2867 if (c == NOCHAR)
2072 throw out_of_input; 2868 throw out_of_input;
2073 2869
2074 return c; 2870 return c;
… …
2156/*}}} */ 2952/*}}} */
2157 2953
2158/* *INDENT-OFF* */ 2954/* *INDENT-OFF* */
2159enum { 2955enum {
2160 C1_40 = 0x40, 2956 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2957 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2958 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2959 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2960 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2961};
2166/* *INDENT-ON* */ 2962/* *INDENT-ON* */
2167 2963
2168/*{{{ process non-printing single characters */ 2964/*{{{ process non-printing single characters */
2169void 2965void
… …
2174 case C0_ESC: 2970 case C0_ESC:
2175 process_escape_seq (); 2971 process_escape_seq ();
2176 break; 2972 break;
2177 case C0_ENQ: /* terminal Status */ 2973 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2974 if (rs[Rs_answerbackstring])
2179 tt_write ( 2975 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2976 else
2183 tt_write ((unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2978 break;
2186 case C0_BEL: /* bell */ 2979 case C0_BEL: /* bell */
2187 scr_bell (); 2980 scr_bell ();
2188 break; 2981 break;
2189 case C0_BS: /* backspace */ 2982 case C0_BS: /* backspace */
… …
2205 break; 2998 break;
2206 case C0_SI: /* shift in - acs */ 2999 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3000 scr_charset_choose (0);
2208 break; 3001 break;
2209 3002
3003#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3004 // 8-bit controls
2211 case 0x90: /* DCS */ 3005 case 0x90: /* DCS */
2212 process_dcs_seq (); 3006 process_dcs_seq ();
2213 break; 3007 break;
2214 case 0x9b: /* CSI */ 3008 case 0x9b: /* CSI */
2215 process_csi_seq (); 3009 process_csi_seq ();
2216 break; 3010 break;
2217 case 0x9d: /* CSI */ 3011 case 0x9d: /* CSI */
2218 process_osc_seq (); 3012 process_osc_seq ();
2219 break; 3013 break;
3014#endif
2220 } 3015 }
2221} 3016}
2222/*}}} */ 3017/*}}} */
2223 3018
2224 3019
… …
2286void 3081void
2287rxvt_term::process_escape_seq () 3082rxvt_term::process_escape_seq ()
2288{ 3083{
2289 unicode_t ch = cmd_getc (); 3084 unicode_t ch = cmd_getc ();
2290 3085
2291 if (PrivateModes & PrivMode_vt52) 3086 if (priv_modes & PrivMode_vt52)
2292 { 3087 {
2293 process_escape_vt52 (ch); 3088 process_escape_vt52 (ch);
2294 return; 3089 return;
2295 } 3090 }
2296 3091
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3106 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3107 break;
2313 case '+': 3108 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3109 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3110 break;
2316#ifndef NO_FRILLS 3111#if ENABLE_FRILLS
2317 case '6': 3112 case '6':
2318 scr_backindex (); 3113 scr_backindex ();
2319 break; 3114 break;
2320#endif 3115#endif
2321 case '7': 3116 case '7':
2322 scr_cursor (SAVE); 3117 scr_cursor (SAVE);
2323 break; 3118 break;
2324 case '8': 3119 case '8':
2325 scr_cursor (RESTORE); 3120 scr_cursor (RESTORE);
2326 break; 3121 break;
2327#ifndef NO_FRILLS 3122#if ENABLE_FRILLS
2328 case '9': 3123 case '9':
2329 scr_forwardindex (); 3124 scr_forwardindex ();
2330 break; 3125 break;
2331#endif 3126#endif
2332 case '=': 3127 case '=':
… …
2342 break; 3137 break;
2343 3138
2344 /* 8.3.87: NEXT LINE */ 3139 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3140 case C1_NEL: /* ESC E */
2346 { 3141 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3142 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3143 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 3144 }
2350 break; 3145 break;
2351 3146
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3147 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 3148 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 3158 case C1_RI: /* ESC M */
2364 scr_index (DN); 3159 scr_index (DN);
2365 break; 3160 break;
2366 3161
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3162 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3163 /*case C1_SS2: scr_single_shift (2); break; */
2369 3164
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3165 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3166 /*case C1_SS3: scr_single_shift (3); break; */
2372 3167
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3168 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3169 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3170 process_dcs_seq ();
2376 break; 3171 break;
2377 3172
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3173 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 3174 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 3175 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 3176 break; /* steal obsolete ESC [ c */
2383 3177
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3178 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 3179 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 3180 process_csi_seq ();
… …
2391 process_osc_seq (); 3185 process_osc_seq ();
2392 break; 3186 break;
2393 3187
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3188 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3189 case 'c':
3190 mbstate.reset ();
2396 scr_poweron (); 3191 scr_poweron ();
2397 scrollbar_show (1); 3192 scrollbar_show (1);
2398 break; 3193 break;
2399 3194
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3195 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3207
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3208/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3209/* *INDENT-OFF* */
2415enum { 3210enum {
2416 CSI_ICH = 0x40, 3211 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3212 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3213 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3214 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3215 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3216 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3217 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3232 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3233 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3234 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3235 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3236 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3237 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3238 };
2444/* *INDENT-ON* */ 3239/* *INDENT-ON* */
2445 3240
2446void 3241void
2447rxvt_term::process_csi_seq () 3242rxvt_term::process_csi_seq ()
… …
2510 { 3305 {
2511 switch (priv) 3306 switch (priv)
2512 { 3307 {
2513 case '>': 3308 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3309 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3311 break;
2517 case '?': 3312 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3314 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3315 break;
… …
2625 3420
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3421 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3422 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3423 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3424 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3425 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3426 break;
2632 3427
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3428 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3429 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3430 break;
2637 3431
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3433 process_sgr_mode (nargs, arg);
2640 break; 3434 break;
… …
2646 tt_printf ("\033[0n"); 3440 tt_printf ("\033[0n");
2647 break; 3441 break;
2648 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
2649 scr_report_position (); 3443 scr_report_position ();
2650 break; 3444 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3448 break;
2655#endif
2656 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3451 break;
2659 } 3452 }
2660 break; 3453 break;
2661 3454
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3455 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3488 break;
2696 3489
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3490 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3491 if (arg[0] == 4)
2699 scr_insert_mode (0); 3492 scr_insert_mode (0);
3493 else if (arg[0] == 20)
3494 priv_modes &= ~PrivMode_LFNL;
2700 break; 3495 break;
2701 3496
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3497 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3498 if (arg[0] == 4)
2704 scr_insert_mode (1); 3499 scr_insert_mode (1);
3500 else if (arg[0] == 20)
3501 priv_modes |= PrivMode_LFNL;
2705 break; 3502 break;
2706 3503
2707 /* 3504 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3505 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3506 */
… …
2721 break; 3518 break;
2722 case CSI_75: 3519 case CSI_75:
2723 scr_cursor (RESTORE); 3520 scr_cursor (RESTORE);
2724 break; 3521 break;
2725 3522
2726#ifndef NO_FRILLS 3523#if ENABLE_FRILLS
2727 case CSI_74: 3524 case CSI_74:
2728 process_window_ops (arg, nargs); 3525 process_window_ops (arg, nargs);
2729 break; 3526 break;
2730#endif 3527#endif
2731 3528
… …
2738 break; 3535 break;
2739 } 3536 }
2740} 3537}
2741/*}}} */ 3538/*}}} */
2742 3539
2743#ifndef NO_FRILLS 3540#if ENABLE_FRILLS
2744/* ARGSUSED */ 3541/* ARGSUSED */
2745void 3542void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3543rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3544{
2748 int x, y; 3545 int x, y;
2749 XWindowAttributes wattr; 3546 XWindowAttributes wattr;
2750 Window wdummy; 3547 Window wdummy;
3548 dDisp;
2751 3549
2752 if (nargs == 0) 3550 if (nargs == 0)
2753 return; 3551 return;
2754 3552
2755 switch (args[0]) 3553 switch (args[0])
2756 { 3554 {
2757 /* 3555 /*
2758 * commands 3556 * commands
2759 */ 3557 */
2760 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
2762 break; 3560 break;
2763 case 2: /* iconify window */ 3561 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3562 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3563 break;
2767 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3566 break;
2770 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3569 break;
2773 case 5: /* raise window */ 3570 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
2775 break; 3572 break;
2776 case 6: /* lower window */ 3573 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
2778 break; 3575 break;
2779 case 7: /* refresh window */ 3576 case 7: /* refresh window */
2780 scr_touch (true); 3577 scr_touch (true);
2781 break; 3578 break;
2782 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
2785 break; 3582 break;
2786 3583
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3585 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
2792 break; 3589 break;
2793 3590
2794 3591
2795 /* 3592 /*
2796 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
2797 */ 3594 */
2798 case 11: /* report window state */ 3595 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3598 break;
2802 case 13: /* report window position */ 3599 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3605 break;
2809 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3609 break;
2813 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3612 break;
2816 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3615 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3617 {
3618 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s);
3622 }
2823 break; 3623 break;
2824 case 21: /* report window title */ 3624 case 21: /* report window title */
3625 {
3626 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s);
3630 }
2827 break; 3631 break;
2828#endif
2829 } 3632 }
2830} 3633}
2831#endif 3634#endif
2832 3635
2833/*----------------------------------------------------------------------*/ 3636/*----------------------------------------------------------------------*/
2834/* 3637/*
2835 * get input up until STRING TERMINATOR (or BEL) 3638 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3639 * ends_how is terminator used. returned input must be free()'d
2837 */ 3640 */
2838unsigned char * 3641char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3642rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3643{
2841 int seen_esc = 0; /* seen escape? */ 3644 unicode_t ch;
3645 bool seen_esc = false;
2842 unsigned int n = 0; 3646 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3647 wchar_t string[STRING_MAX];
2846 3648
2847 while ((ch = cmd_getc ())) 3649 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3650 {
2849 if (ch == C0_BEL 3651 if (seen_esc)
2850 || ch == CHAR_ST 3652 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3653 if (ch == 0x5c) /* 7bit ST */
2852 break; 3654 break;
2853 3655 else
3656 return NULL;
3657 }
2854 if (ch == C0_ESC) 3658 else if (ch == C0_ESC)
2855 { 3659 {
2856 seen_esc = 1; 3660 seen_esc = true;
2857 continue; 3661 continue;
2858 } 3662 }
2859 else if (ch == '\t') 3663 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3664 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3665 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
2863 3667
2864 if (n < sizeof (string) - 1) 3668 seen_esc = false;
3669
3670 if (n >= STRING_MAX - 1)
3671 // stop at some sane length
3672 return NULL;
3673
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
2865 string[n++] = ch; 3677 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3678 }
2869 3679
2870 string[n++] = '\0'; 3680 string[n++] = '\0';
2871 3681
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3682 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3683
2877 return s; 3684 return rxvt_wcstombs (string);
2878} 3685}
2879 3686
2880/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
2881/* 3688/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3690 */
2884void 3691void
2885rxvt_term::process_dcs_seq () 3692rxvt_term::process_dcs_seq ()
2886{ 3693{
2887 unsigned char *s; 3694 char *s;
2888 unicode_t eh; 3695 unicode_t eh;
2889 3696
2890 /* 3697 /*
2891 * Not handled yet 3698 * Not handled yet
2892 */ 3699 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3718 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3719 arg = arg * 10 + (ch - '0');
2913 3720
2914 if (ch == ';') 3721 if (ch == ';')
2915 { 3722 {
2916 unsigned char *s = get_to_st (eh); 3723 char *s = get_to_st (eh);
2917 3724
2918 if (s) 3725 if (s)
2919 { 3726 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3727 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3728 free (s);
2934 } 3729 }
2935 } 3730 }
2936} 3731}
3732
3733void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{
3736 if (str[0] == '?' && !str[1])
3737 {
3738 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b);
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3741 }
3742 else
3743 set_window_color (color, str);
3744}
3745
2937/* 3746/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3748 */
2960void 3749void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3751{
2963 int changed = 0;
2964 int color; 3752 int color;
2965 char *buf, *name; 3753 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1];
3755 int saveop = op;
3756 dDisp;
2966 3757
2967 assert (str != NULL); 3758 assert (str != NULL);
2968 switch (op) 3759 switch (op)
2969 { 3760 {
2970 case XTerm_name: 3761 case XTerm_name:
… …
2974 set_icon_name (str); 3765 set_icon_name (str);
2975 break; 3766 break;
2976 case XTerm_title: 3767 case XTerm_title:
2977 set_title (str); 3768 set_title (str);
2978 break; 3769 break;
3770 case XTerm_property:
3771 if (str[0] == '?')
3772 {
3773 Atom prop = display->atom (str + 1);
3774 Atom actual_type;
3775 int actual_format;
3776 unsigned long nitems;
3777 unsigned long bytes_after;
3778 unsigned char *value = 0;
3779 const char *str = "";
3780
3781 if (prop
3782 && XGetWindowProperty (disp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None
3787 && actual_format == 8)
3788 str = (const char *)(value);
3789
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3791
3792 XFree (value);
3793 }
3794 else
3795 {
3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3797
3798 if (eq)
3799 {
3800 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1);
3802 }
3803 else
3804 XDeleteProperty (disp, parent[0],
3805 display->atom (str));
3806 }
3807 break;
3808
2979 case XTerm_Color: 3809 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3810 for (buf = (char *)str; buf && *buf;)
2981 { 3811 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3813 break;
2984 3814
2985 *name++ = '\0'; 3815 *name++ = '\0';
2986 color = atoi (buf); 3816 color = atoi (buf) + minCOLOR;
2987 3817
2988 if (color < 0 || color >= TOTAL_COLORS) 3818 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3819 break;
2990 3820
2991 if ((buf = STRCHR (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3822 *buf++ = '\0';
2993 3823
3824 if (name[0] == '?' && !name[1])
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
2994 set_window_color (color + minCOLOR, name); 3831 set_window_color (color, name);
2995 } 3832 }
3833 break;
3834 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break;
3837 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
2996 break; 3839 break;
2997#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3843 break;
3001#endif 3844#endif
3002 case XTerm_Color_pointer: 3845 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3847 break;
3848 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3850 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str);
3008 break;
3009 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str);
3011 break;
3012 case XTerm_Color_RV: 3852 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3854 break;
3855 case Rxvt_Color_BD:
3856 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp);
3858 break;
3859 case Rxvt_Color_UL:
3860 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp);
3862 break;
3863 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3865 break;
3015#endif 3866#endif
3867#if TRANSPARENT && TINTING
3868 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3870 check_our_parents ();
3871 if (am_transparent)
3872 want_full_refresh = want_refresh = 1;
3873 break;
3874#endif
3016 3875
3017 case XTerm_Menu: 3876 case Rxvt_Pixmap:
3018 /* 3877 {
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap:
3024 if (*str != ';') 3878 if (*str != ';')
3025 { 3879 {
3026#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3029#endif
3030 scr_touch (true); 3883 scr_touch (true);
3884#endif
3031 } 3885 }
3886
3887 int changed = 0;
3888
3032 while ((str = STRCHR (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3033 { 3890 {
3034 str++; 3891 str++;
3035#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3037#endif 3894#endif
3038
3039 } 3895 }
3896
3040 if (changed) 3897 if (changed)
3041 { 3898 {
3042#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3900 resize_pixmap ();
3044#endif
3045 scr_touch (true); 3901 scr_touch (true);
3902#endif
3046 } 3903 }
3904 }
3047 break; 3905 break;
3048 3906
3049 case XTerm_restoreFG: 3907 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3051 break; 3909 break;
3052 case XTerm_restoreBG: 3910 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3911 set_window_color (Color_bg, str);
3054 break; 3912 break;
3913
3055 case XTerm_logfile: 3914 case XTerm_logfile:
3056 // TODO, when secure mode? 3915 // TODO, when secure mode?
3057 break; 3916 break;
3058 case XTerm_font: 3917
3059 change_font (str);
3060 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif
3080#if 0 3918#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3919 case Rxvt_dumpscreen: /* no error notices */
3082 { 3920 {
3083 int fd; 3921 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3923 {
3086 scr_dump (fd); 3924 scr_dump (fd);
3087 close (fd); 3925 close (fd);
3088 } 3926 }
3089 } 3927 }
3928 break;
3929#endif
3930 case XTerm_font:
3931 op = URxvt_font;
3932 case URxvt_font:
3933#if ENABLE_STYLES
3934 case URxvt_boldFont:
3935 case URxvt_italicFont:
3936 case URxvt_boldItalicFont:
3937#endif
3938 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp);
3943 else
3944 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3946
3947 res = strdup (str);
3948 allocated.push_back ((void *)res);
3949 set_fonts ();
3950 }
3951 break;
3952
3953#if ENABLE_FRILLS
3954 case URxvt_locale:
3955 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3957 else
3958 {
3959 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale ();
3962 }
3963 break;
3964
3965 case URxvt_view_up:
3966 case URxvt_view_down:
3967 {
3968 int lines = atoi (str);
3969
3970 if (lines)
3971 scr_page (op == URxvt_view_up ? UP : DN, lines);
3972 else
3973 scr_erase_savelines ();
3974 }
3975
3976 break;
3977#endif
3978
3979#if ENABLE_PERL
3980 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet
3090 break; 3983 break;
3091#endif 3984#endif
3092 } 3985 }
3093} 3986}
3094/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
… …
3108{ 4001{
3109 int state; 4002 int state;
3110 4003
3111 if (mode == 's') 4004 if (mode == 's')
3112 { 4005 {
3113 SavedModes |= (PrivateModes & bit); 4006 SavedModes |= (priv_modes & bit);
3114 return -1; 4007 return -1;
3115 } 4008 }
3116 else 4009 else
3117 { 4010 {
3118 if (mode == 'r') 4011 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4012 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4013 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4014 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4015 PrivMode (state, bit);
3123 } 4016 }
3124 4017
3125 return state; 4018 return state;
3126} 4019}
3127 4020
3128/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
3129void 4022void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 4024{
3132 unsigned int i, j; 4025 unsigned int i, j;
3133 int state; 4026 int state;
3134 4027
3135 static const struct 4028 static const struct
… …
3144 { 3, PrivMode_132 }, 4037 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4038 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
4042 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4044 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 4045 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4048#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4049 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4050 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4051 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4052 // 45 margin bell NYI
3163 // 46 start logging 4053 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4065 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4066 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4067 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4068 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4069 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4070 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4071 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4072 };
3183 4073
3184 if (nargs == 0) 4074 if (nargs == 0)
3185 return; 4075 return;
… …
3203 } 4093 }
3204 4094
3205 /* extra handling for values with state unkept */ 4095 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4096 switch (arg[i])
3207 { 4097 {
4098#if ENABLE_STYLES
4099 case 1021:
4100 set_option (Opt_intensityStyles, mode);
4101
4102 scr_touch (true);
4103 break;
4104#endif
3208 case 1048: /* alternative cursor save */ 4105 case 1048: /* alternative cursor save */
3209 case 1049: 4106 case 1049:
4107 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4108 if (mode == 0)
3211 scr_cursor (RESTORE); 4109 scr_cursor (RESTORE);
3212 else if (mode == 1) 4110 else if (mode == 1)
3213 scr_cursor (SAVE); 4111 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4112 break;
3215 } 4113 }
3216 4114
3217 if (state >= 0) 4115 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4116 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4117 switch (arg[i])
… …
3225 * within VT52 mode 4123 * within VT52 mode
3226 */ 4124 */
3227 PrivMode (1, PrivMode_vt52); 4125 PrivMode (1, PrivMode_vt52);
3228 break; 4126 break;
3229 case 3: /* 80/132 */ 4127 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4128 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4129 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4130 break;
3233 case 4: /* smooth scrolling */ 4131 case 4: /* smooth scrolling */
3234 if (state) 4132 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 4133 break;
3239 case 5: /* reverse video */ 4134 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4135 scr_rvideo_mode (state);
3241 break; 4136 break;
3242 case 6: /* relative/absolute origins */ 4137 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4138 scr_relative_origin (state);
3244 break; 4139 break;
3245 case 7: /* autowrap */ 4140 case 7: /* autowrap */
3246 scr_autowrap (state); 4141 scr_autowrap (state);
3247 break; 4142 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4147 break;
3253#ifdef menuBar_esc
3254 case menuBar_esc:
3255#ifdef MENUBAR
3256 map_menuBar (state);
3257#endif
3258 break;
3259#endif
3260#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
3261 case scrollBar_esc: 4149 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
3263 { 4151 {
3264 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
3267 break; 4155 break;
3268#endif 4156#endif
3269 case 25: /* visible/invisible cursor */ 4157 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4158 scr_cursor_visible (state);
3271 break; 4159 break;
3272 /* case 35: - shift keys */ 4160 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4161 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4162 case 47: /* secondary screen */
3275 scr_change_screen (state); 4163 scr_change_screen (state);
3276 break; 4164 break;
3277 /* case 66: - application key pad */ 4165 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4166 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4167 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4168 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4169 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4170 break;
3283#if 0 4171#if 0
3284 case 1001: 4172 case 1001:
3285 break; /* X11 mouse highlighting */ 4173 break; /* X11 mouse highlighting */
3286#endif 4174#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4175 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 4176 set_option (Opt_scrollTtyOutput, !state);
3292 break; 4177 break;
3293 case 1011: /* scroll to bottom on key press */ 4178 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4179 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 4180 break;
3299 case 1047: /* secondary screen w/ clearing */ 4181 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4182 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4183 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4184 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4185 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4186 break;
4187 case 1049: /* secondary screen w/ clearing first */
4188 scr_change_screen (state);
4189 if (OPTION (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY)
4191 scr_erase_screen (2);
4192 break;
3306 default: 4193 default:
3307 break; 4194 break;
3308 } 4195 }
3309 } 4196 }
3310} 4197}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4220 rendset = 0, rendstyle = ~RS_None;
3334 break; 4221 break;
3335 case 1: 4222 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4223 rendset = 1, rendstyle = RS_Bold;
3337 break; 4224 break;
4225 //case 2: // low intensity
4226 case 3:
4227 rendset = 1, rendstyle = RS_Italic;
4228 break;
3338 case 4: 4229 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4230 rendset = 1, rendstyle = RS_Uline;
3340 break; 4231 break;
3341 case 5: 4232 case 5: // slowly blinking
4233 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4234 rendset = 1, rendstyle = RS_Blink;
3343 break; 4235 break;
4236 //case 6: // scoansi light background
3344 case 7: 4237 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4238 rendset = 1, rendstyle = RS_RVid;
3346 break; 4239 break;
3347 case 8: 4240 case 8:
3348 // invisible. NYI 4241 // invisible. NYI
3349 break; 4242 break;
3350 case 22: 4243 //case 9: // crossed out
4244 //case 10: // scoansi acs off, primary font
4245 //case 11: // scoansi acs on, first alt font
4246 //case 12: // scoansi acs on, |0x80, second alt font
4247 //...
4248 //case 19: // ninth alt font
4249 //case 20: // gothic
4250 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4251 rendset = 0, rendstyle = RS_Bold;
4252 break;
4253 case 22: // normal intensity
4254 rendset = 0, rendstyle = RS_Bold;
4255 break;
4256 case 23: // disable italic
4257 rendset = 0, rendstyle = RS_Italic;
3352 break; 4258 break;
3353 case 24: 4259 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4260 rendset = 0, rendstyle = RS_Uline;
3355 break; 4261 break;
3356 case 25: 4262 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4263 rendset = 0, rendstyle = RS_Blink;
3358 break; 4264 break;
4265 case 26: // variable spacing (iso 8613)
4266 rendset = 0, rendstyle = RS_Blink;
4267 break;
3359 case 27: 4268 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4269 rendset = 0, rendstyle = RS_RVid;
3361 break; 4270 break;
3362 case 28:
3363 // visible. NYI 4271 //case 28: // visible. NYI
3364 break; 4272 //case 29: // not crossed-out
3365 } 4273 }
3366 4274
3367 if (rendset != -1) 4275 if (rendset != -1)
3368 { 4276 {
3369 scr_rendition (rendset, rendstyle); 4277 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4288 case 35:
3381 case 36: 4289 case 36:
3382 case 37: 4290 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4291 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4292 break;
3385#ifdef TTY_256COLOR 4293 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4294 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4295 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4296 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4297 i += 2;
3391 } 4298 }
3392 break; 4299 break;
3393#endif
3394 case 39: /* default fg */ 4300 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4301 scr_color (Color_fg, Color_fg);
3396 break; 4302 break;
3397 4303
3398 case 40: 4304 case 40:
… …
3403 case 45: 4309 case 45:
3404 case 46: 4310 case 46:
3405 case 47: 4311 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4312 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4313 break;
3408#ifdef TTY_256COLOR 4314 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4315 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4316 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4317 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4318 i += 2;
3414 } 4319 }
3415 break; 4320 break;
3416#endif
3417 case 49: /* default bg */ 4321 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4322 scr_color (Color_bg, Color_bg);
3419 break; 4323 break;
3420 4324
3421#ifndef NO_BRIGHTCOLOR 4325 //case 50: // not variable spacing
4326
4327#if ENABLE_FRILLS
3422 case 90: 4328 case 90:
3423 case 91: /* set bright fg color */ 4329 case 91: /* set bright fg color */
3424 case 92: 4330 case 92:
3425 case 93: 4331 case 93:
3426 case 94: 4332 case 94:
3427 case 95: 4333 case 95:
3428 case 96: 4334 case 96:
3429 case 97: 4335 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4336 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4337 break;
3433 case 100: 4338 case 100:
3434 case 101: /* set bright bg color */ 4339 case 101: /* set bright bg color */
3435 case 102: 4340 case 102:
3436 case 103: 4341 case 103:
3437 case 104: 4342 case 104:
3438 case 105: 4343 case 105:
3439 case 106: 4344 case 106:
3440 case 107: 4345 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4346 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4347 break;
3444#endif 4348#endif
3445
3446 } 4349 }
3447 } 4350 }
3448} 4351}
3449/*}}} */ 4352/*}}} */
3450 4353
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4354/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4355void
3453rxvt_term::process_graphics () 4356rxvt_term::process_graphics ()
3454{ 4357{
3455 unicode_t ch, cmd = cmd_getc (); 4358 unicode_t ch, cmd = cmd_getc ();
3456 4359
3457 if (cmd == 'Q') 4360 if (cmd == 'Q')
3458 { /* query graphics */ 4361 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4362 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4363 return;
3461 } 4364 }
3462 /* swallow other graphics sequences until terminating ':' */ 4365 /* swallow other graphics sequences until terminating ':' */
3463 do 4366 do
3464 ch = cmd_getc (); 4367 ch = cmd_getc ();
… …
3474 */ 4377 */
3475void 4378void
3476rxvt_term::tt_printf (const char *fmt,...) 4379rxvt_term::tt_printf (const char *fmt,...)
3477{ 4380{
3478 va_list arg_ptr; 4381 va_list arg_ptr;
3479 unsigned char buf[256]; 4382 char buf[256];
3480 4383
3481 va_start (arg_ptr, fmt); 4384 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4385 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4386 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4387 tt_write (buf, strlen (buf));
3485} 4388}
3486 4389
3487/* ---------------------------------------------------------------------- */ 4390/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4391/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4392 * or generated by us in response to a query ESC sequence.
3490 */ 4393 */
4394const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4395
3491void 4396void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4398{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4400 return;
3495 4401
3496 if (len) 4402 if (pty->pty < 0)
4403 return;
4404
4405 if (v_buflen == 0)
4406 {
4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4408
4409 if ((unsigned int)written == len)
4410 return;
4411
4412 data += written;
4413 len -= written;
3497 { 4414 }
4415
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4417
4418 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len;
4420
4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4422}
4423
4424void rxvt_term::pty_write ()
4425{
4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4427
4428 if (written > 0)
4429 {
4430 v_buflen -= written;
4431
3498 if (v_buflen == 0) 4432 if (v_buflen == 0)
3499 { 4433 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4434 free (v_buffer);
3527 v_buffer = 0; 4435 v_buffer = 0;
3528 v_buflen = 0; 4436 v_buflen = 0;
3529 4437
3530 pty_ev.set (EVENT_READ); 4438 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4439 return;
3543 } 4440 }
4441
4442 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4443 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ);
3545} 4446}
3546 4447
3547/*----------------------- end-of-file (C source) -----------------------*/ 4448/*----------------------- end-of-file (C source) -----------------------*/
3548 4449

Diff Legend

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