ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 2007 UTC

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

Diff Legend

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