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

Diff Legend

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