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.382 by root, Fri Dec 14 06:04:56 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); 1050 if (want_refresh && !flush_ev.is_active ())
687 SET_LOCALE (locale); 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
688 1052
689 display->flush (); 1053 display->flush ();
690
691 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01);
693} 1054}
694 1055
695void 1056void
696rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
697{ 1058{
698 SET_R (this); 1059 make_current ();
699 SET_LOCALE (locale);
700 1060
701 refresh_limit = 1;
702 refresh_count = 0; 1061 refresh_count = 0;
703 flush (); 1062 flush ();
704} 1063}
705 1064
706#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
707void 1066void
708rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
709{ 1068{
710 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1070 want_refresh = 1;
712 1071 refresh_check ();
713 w.start (w.at + BLINK_INTERVAL);
714} 1072}
715#endif 1073#endif
716 1074
717#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
718void 1076void
719rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
720{ 1078{
721 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
722 { 1080 {
723 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
724 want_refresh = 1; 1082 want_refresh = 1;
725 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
726 } 1084 }
1085 else
1086 w.stop ();
727} 1087}
728#endif 1088#endif
729 1089
730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
731void 1091void
732rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
733{ 1093{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
736 { 1096 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1097 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
740 } 1099 }
1100 else
1101 w.stop ();
741} 1102}
742#endif 1103#endif
743 1104
744#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
745void 1106void
746rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
747{ 1108{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1110 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1112 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
754 } 1114 }
1115 else
1116 w.stop ();
755} 1117}
756#endif 1118#endif
757 1119
758#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
759void 1121void
760rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
761{ 1123{
762 if (mouse_slip_wheel_speed == 0 1124 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 { 1125 {
766 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1; 1126 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
769 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
770} 1135}
1136#endif
1137
1138#if LINUX_YIELD_HACK
1139static struct event_handler
1140{
1141 ev::prepare yield_ev;
1142
1143 void yield_cb (ev::prepare &w, int revents)
1144 {
1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1153 w.stop ();
1154 }
1155
1156 event_handler ()
1157 : yield_ev (this, &event_handler::yield_cb)
1158 {
1159 }
1160} event_handler;
771#endif 1161#endif
772 1162
773bool 1163bool
774rxvt_term::pty_fill () 1164rxvt_term::pty_fill ()
775{ 1165{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1166 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1167
778 if (CBUFSIZ == n) 1168 if (CBUFSIZ == n)
779 { 1169 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1170 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1171 n = 0;
782 } 1172 }
783 1173
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1174 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1175 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1176 cmdbuf_endp = cmdbuf_ptr + n;
787 1177
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1178 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1179
790 if (n > 0) 1180 if (r > 0)
791 { 1181 {
792 cmdbuf_endp += n; 1182 cmdbuf_endp += r;
793 return true; 1183 return true;
794 } 1184 }
795 else if (n < 0 && errno != EAGAIN) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1186 {
1187#if LINUX_YIELD_HACK
1188 if (display->is_local)
1189 event_handler.yield_ev.start ();
1190#endif
1191 }
1192 else
1193 {
1194 pty_ev.stop ();
1195
1196 if (!option (Opt_hold))
796 destroy (); 1197 destroy ();
797 1198 }
1199
798 return false; 1200 return false;
799} 1201}
800 1202
801void 1203void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
803{ 1205{
804 SET_R (this); 1206 make_current ();
805 SET_LOCALE (locale);
806 1207
807 if (revents & EVENT_WRITE) 1208 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 1209 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1210 while (pty_fill ())
812 if (cmd_parse ()) 1211 if (cmd_parse ())
813 break; 1212 break;
1213
1214 if (revents & ev::WRITE)
1215 pty_write ();
814} 1216}
815 1217
816void 1218void
817rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
818{ 1220{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
820 recolour_cursor (); 1222 recolour_cursor ();
821 1223
822#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1225 hidden_pointer = 0;
824 1226
825 if (Options & Opt_pointerBlank) 1227 if (option (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
827#endif 1229#endif
828} 1230}
829 1231
830#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
831void 1233void
832rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
833{ 1235{
834 if (! (Options & Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
835 return; 1237 return;
836 1238
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
838 XFlush (display->display); 1240 XFlush (dpy);
839 1241
840 hidden_pointer = 1; 1242 hidden_pointer = 1;
841} 1243}
842 1244
843void 1245void
844rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
845{ 1247{
846 SET_R (this); 1248 make_current ();
847 SET_LOCALE (locale);
848 1249
849 pointer_blank (); 1250 pointer_blank ();
850} 1251}
851#endif 1252#endif
852 1253
853void 1254void
854rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
855{ 1256{
856 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
857 int x, y; 1258 int x, y;
1259 int code = 32;
858 1260
859 x = ev.x; 1261 x = Pixel2Col (ev.x);
860 y = ev.y; 1262 y = Pixel2Row (ev.y);
861 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
862 1271
863 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1273 button_number = 3;
866 }
867 else 1274 else
868 { 1275 {
869 button_number = MEvent.button - Button1; 1276 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1277 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1278 if (button_number >= 3)
872 button_number += (64 - 3); 1279 button_number += (64 - 3);
873 } 1280 }
874 1281
875 if (PrivateModes & PrivMode_MouseX10) 1282 if (priv_modes & PrivMode_MouseX10)
876 { 1283 {
877 /* 1284 /*
878 * do not report ButtonRelease 1285 * do not report ButtonRelease
879 * no state info allowed 1286 * no state info allowed
880 */ 1287 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1302 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1303 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1304#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1305 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1306#endif
900
901 } 1307 }
902 1308
903#ifdef DEBUG_MOUSEREPORT 1309#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1310 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1311 if (key_state & 16)
906 fputc ('C', stderr); 1312 fputc ('C', stderr);
907 if (key_state & 4) 1313 if (key_state & 4)
908 fputc ('S', stderr); 1314 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1318 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1319 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1320 button_number,
915 x + 1, 1321 x + 1,
916 y + 1); 1322 y + 1);
917#else 1323#endif
1324
918 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1326 (code + button_number + key_state),
920 (32 + x + 1), 1327 (32 + x + 1),
921 (32 + y + 1)); 1328 (32 + y + 1));
922#endif
923} 1329}
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 1330
935/*{{{ process an X event */ 1331/*{{{ process an X event */
936void 1332void
937rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
938{ 1334{
939 SET_R (this); 1335 make_current ();
940 SET_LOCALE (locale);
941 1336
942#if defined(CURSOR_BLINK) 1337 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 1338
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1339 if (ev.xany.window == vt
952 } 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1341 && 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; 1342 return;
972#endif
973 1343
1344 // for XQueryPointer
974 Window unused_root, unused_child; 1345 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1346 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1347 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 1348
1027 switch (ev.type) 1349 switch (ev.type)
1028 { 1350 {
1029 case KeyPress: 1351 case KeyPress:
1030 lookup_key (ev.xkey); 1352 key_press (ev.xkey);
1031 break; 1353 break;
1032 1354
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease: 1355 case KeyRelease:
1035 { 1356 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; 1357 break;
1047 }
1048#endif
1049 1358
1050 case ButtonPress: 1359 case ButtonPress:
1051 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1052 break; 1361 break;
1053 1362
… …
1055 button_release (ev.xbutton); 1364 button_release (ev.xbutton);
1056 break; 1365 break;
1057 1366
1058 case ClientMessage: 1367 case ClientMessage:
1059 if (ev.xclient.format == 32 1368 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1369 && !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 { 1370 {
1069 /* Get Dnd data */ 1371 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1372 {
1071 int ActualFormat; 1373 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1374 {
1073 unsigned long Size, RemainingBytes; 1375 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1376 {
1075 XGetWindowProperty (display->display, display->root, 1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1378 destroy ();
1077 0L, 1000000L, 1379 }
1078 False, AnyPropertyType, 1380#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1384 &ev);
1082 XChangeProperty (display->display, display->root, 1385#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1386 }
1084 8, PropModeReplace, 1387 }
1085 data, STRLEN (data)); 1388#if ENABLE_XEMBED
1086 XFree (data); 1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1390 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1089 } 1397 }
1090#endif /* OFFIX_DND */
1091 break;
1092
1093 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1398 break;
1096 1399
1097 /* 1400 /*
1098 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1099 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1118 break; 1421 break;
1119 } 1422 }
1120 break; 1423 break;
1121 1424
1122 case FocusIn: 1425 case FocusIn:
1123 if (!TermWin.focus) 1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1429 focus_in ();
1430 break;
1431
1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1436 focus_out ();
1437 break;
1438
1439 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */
1443 if (ev.xconfigure.window == parent[0])
1124 { 1444 {
1125 TermWin.focus = 1; 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1446 ;
1127#ifdef USE_XIM 1447
1128 if (Input_Context != NULL) 1448 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 { 1449 {
1138 PixColors = PixColorsFocused; 1450 seen_resize = 1;
1139 set_colorfgbg (); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1452 }
1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 update_background ();
1143#endif 1458#endif
1144 1459 }
1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1145 } 1461 }
1146 break; 1462 break;
1147 1463
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: 1464 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1465 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1466 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1467 && ev.xproperty.state == PropertyNewValue)
1468 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1469
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; 1470 break;
1201 1471
1202 case SelectionClear: 1472 case SelectionClear:
1203 selection_clear (); 1473 selection_clear ();
1204 break; 1474 break;
1205 1475
1206 case SelectionNotify: 1476 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1477 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1478 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1479 break;
1211 1480
1212 case SelectionRequest: 1481 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1482 selection_send (ev.xselectionrequest);
1214 break; 1483 break;
1215 1484
1485 case MapNotify:
1486 mapped = 1;
1487#ifdef TEXT_BLINK
1488 text_blink_ev.start ();
1489#endif
1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 break;
1492
1216 case UnmapNotify: 1493 case UnmapNotify:
1217 TermWin.mapped = 0; 1494 mapped = 0;
1218#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1496 text_blink_ev.stop ();
1220#endif 1497#endif
1498 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1221 break; 1499 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 1500
1236 case GraphicsExpose: 1501 case GraphicsExpose:
1237 case Expose: 1502 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1503 if (ev.xany.window == vt)
1239 { 1504 {
1240 do 1505 do
1506 {
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1507 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1508 ev.xexpose.width, ev.xexpose.height, False);
1509 }
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1510 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1511
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1512 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1513
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1515 {
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1250 1519
1251 scr_refresh (refresh_type); 1520 want_refresh = 1;
1252 } 1521 }
1253 else 1522 else
1254 { 1523 {
1255 XEvent unused_event; 1524 XEvent unused_event;
1256 1525
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1527 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1529 ;
1261 1530
1262 if (isScrollbarWindow (ev.xany.window)) 1531 if (isScrollbarWindow (ev.xany.window))
1263 { 1532 {
1264 scrollBar.setIdle (); 1533 scrollBar.setIdle ();
1265 scrollbar_show (0); 1534 scrollbar_show (0);
1266 } 1535 }
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 } 1536 }
1277 break; 1537 break;
1278 1538
1279 case MotionNotify: 1539 case MotionNotify:
1280#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1541 if (hidden_pointer)
1282 pointer_unblank (); 1542 pointer_unblank ();
1283#endif 1543#endif
1284#if MENUBAR 1544 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1285 if (isMenuBarWindow (ev.xany.window)) 1545 || priv_modes & PrivMode_MouseAnyEvent)
1546 mouse_report (ev.xbutton);
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break;
1549
1550 if (ev.xany.window == vt)
1286 { 1551 {
1287 menubar_control (ev.xbutton); 1552 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1553 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1554 ; // 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))) 1555 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1556 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1558 ;
1300 1559
1301 XQueryPointer (display->display, TermWin.vt, 1560 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1561 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1562 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1563 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1564 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1565#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1566 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1567 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1568 {
1310#endif 1569#endif
1570#if ISO_14755
1571 // 5.4
1572 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1573 {
1574 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1575 break;
1576 }
1577#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1578 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1579 ev.xbutton.state & Button3Mask ? 2 : 0);
1580
1313#ifdef SELECTION_SCROLLING 1581#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1582 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1583 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1584 {
1317 int dist; 1585 int dist;
1318 1586
1319 /* don't clobber the current delay if we are 1587 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1588 * already in the middle of scrolling.
1321 */ 1589 */
1322 if (!sel_scroll_ev.active) 1590 if (!sel_scroll_ev.is_active ())
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1591 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1324 1592
1325 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1327 */ 1595 */
1328 selection_save_x=ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1597 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1599
1333 /* calc number of lines to scroll */ 1600 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1601 if (ev.xbutton.y < int_bwidth)
1335 { 1602 {
1336 scroll_selection_dir = UP; 1603 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1604 dist = int_bwidth - ev.xbutton.y;
1338 } 1605 }
1339 else 1606 else
1340 { 1607 {
1341 scroll_selection_dir = DN; 1608 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1609 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1610 }
1611
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1612 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1613 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1;
1347 MIN_IT (scroll_selection_lines, 1615 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1616 SELECTION_SCROLL_MAX_LINES);
1349 } 1617 }
1350 else 1618 else
1351 { 1619 {
1352 /* we are within the text window, so we 1620 /* we are within the text window, so we
1353 * shouldn't be scrolling 1621 * shouldn't be scrolling
1354 */ 1622 */
1355 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1623 sel_scroll_ev.stop();
1357 } 1624 }
1358#endif 1625#endif
1359#ifdef MOUSE_THRESHOLD 1626#ifdef MOUSE_THRESHOLD
1360
1361 } 1627 }
1362#endif 1628#endif
1363
1364 } 1629 }
1365 } 1630 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1631 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1632 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1633 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1634 MotionNotify, &ev))
1635 ;
1636
1370 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1640 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1641 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1643 scrollbar_size ());
1377 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1644 want_refresh = 1;
1379 scrollbar_show (1); 1645 scrollbar_show (1);
1380 } 1646 }
1381 break; 1647 break;
1382 } 1648 }
1383}
1384 1649
1650#if defined(CURSOR_BLINK)
1651 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1652 {
1653 if (hidden_cursor)
1654 {
1655 hidden_cursor = 0;
1656 want_refresh = 1;
1657 }
1658
1659 cursor_blink_ev.again ();
1660 }
1661#endif
1662
1663#if defined(POINTER_BLANK)
1664 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1665 {
1666 if (ev.type == MotionNotify
1667 || ev.type == ButtonPress
1668 || ev.type == ButtonRelease)
1669 if (hidden_pointer)
1670 pointer_unblank ();
1671
1672 if (ev.type == KeyPress && hidden_pointer == 0)
1673 pointer_blank ();
1674 }
1675#endif
1676
1677 refresh_check ();
1678}
1679
1680void
1681rxvt_term::focus_in ()
1682{
1683 if (!focus)
1684 {
1685 focus = 1;
1686 want_refresh = 1;
1687
1688 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1689
1690#if USE_XIM
1691 if (Input_Context != NULL)
1692 {
1693 IMSetPosition ();
1694 XSetICFocus (Input_Context);
1695 }
1696#endif
1697#if CURSOR_BLINK
1698 if (option (Opt_cursorBlink))
1699 cursor_blink_ev.again ();
1700#endif
1701#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_focused;
1705 scr_recolour ();
1706 }
1707#endif
1708#if ENABLE_FRILLS
1709 if (option (Opt_urgentOnBell))
1710 {
1711 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712 {
1713 h->flags &= ~XUrgencyHint;
1714 XSetWMHints (dpy, parent[0], h);
1715 }
1716 }
1717#endif
1718 }
1719}
1720
1721void
1722rxvt_term::focus_out ()
1723{
1724 if (focus)
1725 {
1726 focus = 0;
1727 want_refresh = 1;
1728
1729 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1730
1731#if ENABLE_FRILLS || ISO_14755
1732 if (iso14755buf)
1733 {
1734 iso14755buf = 0;
1735# if ISO_14755
1736 scr_overlay_off ();
1737# endif
1738 }
1739#endif
1740#if USE_XIM
1741 if (Input_Context != NULL)
1742 XUnsetICFocus (Input_Context);
1743#endif
1744#if CURSOR_BLINK
1745 if (option (Opt_cursorBlink))
1746 cursor_blink_ev.stop ();
1747
1748 hidden_cursor = 0;
1749#endif
1750#if OFF_FOCUS_FADING
1751 if (rs[Rs_fade])
1752 {
1753 pix_colors = pix_colors_unfocused;
1754 scr_recolour ();
1755 }
1756#endif
1757 }
1758}
1759
1760void
1761rxvt_term::update_fade_color (unsigned int idx)
1762{
1763#if OFF_FOCUS_FADING
1764 if (rs[Rs_fade])
1765 {
1766 rgba c;
1767 pix_colors [Color_fade].get (c);
1768 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1769 }
1770#endif
1771}
1772
1773#if ENABLE_TRANSPARENCY || ENABLE_PERL
1385void 1774void
1386rxvt_term::rootwin_cb (XEvent &ev) 1775rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1776{
1388 SET_R (this); 1777 make_current ();
1389 SET_LOCALE (locale);
1390 1778
1779 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1780 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1781 return;
1782
1783# if ENABLE_TRANSPARENCY
1391 switch (ev.type) 1784 switch (ev.type)
1392 { 1785 {
1393 case PropertyNotify: 1786 case PropertyNotify:
1787 /*
1788 * if user used some Esetroot compatible prog to set the root bg,
1789 * use the property to determine the pixmap. We use it later on.
1790 */
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1791 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1395 { 1793 {
1396 if (ev.xproperty.state == PropertyNewValue) 1794 bgPixmap.set_root_pixmap ();
1397 selection_property (ev.xproperty.window, ev.xproperty.atom); 1795 update_background ();
1398 break;
1399 } 1796 }
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; 1797 break;
1798 }
1419#endif 1799# endif
1420 } 1800
1801 refresh_check ();
1421} 1802}
1803#endif
1422 1804
1423void 1805void
1424rxvt_term::button_press (XButtonEvent &ev) 1806rxvt_term::button_press (XButtonEvent &ev)
1425{ 1807{
1426 int reportmode = 0, clickintime; 1808 int reportmode = 0, clickintime;
1427 1809
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1810 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1811
1429 if (!bypass_keystate) 1812 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1813 reportmode = !! (priv_modes & PrivMode_mouse_report);
1814
1431 /* 1815 /*
1432 * VT window processing of button press 1816 * VT window processing of button press
1433 */ 1817 */
1434 if (ev.window == TermWin.vt) 1818 if (ev.window == vt)
1435 { 1819 {
1820 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1821 return;
1822
1823#if ISO_14755
1824 // 5.4
1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1826 {
1827 iso14755_54 (ev.x, ev.y);
1828 return;
1829 }
1830#endif
1831
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1832 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1833
1437 if (reportmode) 1834 if (reportmode)
1438 { 1835 {
1439 /* mouse report from vt window */ 1836 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1837 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1838 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1839#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1840 if (ev.button == MEvent.button && clickintime)
1444 { 1841 {
1445 /* same button, within alloted time */ 1842 /* same button, within alloted time */
1446 MEvent.clicks++; 1843 MEvent.clicks++;
1844
1447 if (MEvent.clicks > 1) 1845 if (MEvent.clicks > 1)
1448 { 1846 {
1449 /* only report double clicks */ 1847 /* only report double clicks */
1450 MEvent.clicks = 2; 1848 MEvent.clicks = 2;
1451 mouse_report (ev); 1849 mouse_report (ev);
… …
1463 mouse_report (ev); 1861 mouse_report (ev);
1464 } 1862 }
1465#else 1863#else
1466 MEvent.button = ev.button; 1864 MEvent.button = ev.button;
1467 mouse_report (ev); 1865 mouse_report (ev);
1468#endif /* MOUSE_REPORT_DOUBLECLICK */ 1866#endif /* MOUSE_REPORT_DOUBLECLICK */
1469 1867
1470 } 1868 }
1471 else 1869 else
1472 { 1870 {
1473 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1873
1475 switch (ev.button) 1874 switch (ev.button)
1476 { 1875 {
1477 case Button1: 1876 case Button1:
1877 /* allow meta + click to select rectangular areas */
1878 /* should be done in screen.C */
1879#if ENABLE_FRILLS
1880 selection.rect = !!(ev.state & ModMetaMask);
1881#else
1882 selection.rect = false;
1883#endif
1884
1478 /* allow shift+left click to extend selection */ 1885 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1886 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1887 {
1481 if (MEvent.button == Button1 && clickintime) 1888 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1889 selection_rotate (ev.x, ev.y);
1483 else 1890 else
1484 selection_extend (ev.x, ev.y, 1); 1891 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1906 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1907 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1908 selection_rotate (ev.x, ev.y);
1502 else 1909 else
1503 selection_extend (ev.x, ev.y, 1); 1910 selection_extend (ev.x, ev.y, 1);
1911
1504 MEvent.button = Button3; 1912 MEvent.button = Button3;
1505 break; 1913 break;
1506 } 1914 }
1507 } 1915 }
1916
1508 MEvent.time = ev.time; 1917 MEvent.time = ev.time;
1509 return; 1918 return;
1510 } 1919 }
1511 1920
1512 /* 1921 /*
… …
1556 tt_printf ("\033[5~"); 1965 tt_printf ("\033[5~");
1557 break; 1966 break;
1558 } 1967 }
1559 } 1968 }
1560 else 1969 else
1561#endif /* NO_SCROLLBAR_REPORT */ 1970#endif /* NO_SCROLLBAR_REPORT */
1562 1971
1563 { 1972 {
1564 char upordown = 0; 1973 char upordown = 0;
1565 1974
1566 if (scrollBar.style == R_SB_NEXT) 1975 if (scrollBar.style == R_SB_NEXT)
1567 { 1976 {
1568 if (scrollbarnext_upButton (ev.y)) 1977 if (scrollbarnext_upButton (ev.y))
1569 upordown = -1; /* up */ 1978 upordown = -1; /* up */
… …
1575 if (scrollbarrxvt_upButton (ev.y)) 1984 if (scrollbarrxvt_upButton (ev.y))
1576 upordown = -1; /* up */ 1985 upordown = -1; /* up */
1577 else if (scrollbarrxvt_dnButton (ev.y)) 1986 else if (scrollbarrxvt_dnButton (ev.y))
1578 upordown = 1; /* down */ 1987 upordown = 1; /* down */
1579 } 1988 }
1989
1580 if (upordown) 1990 if (upordown)
1581 { 1991 {
1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 if (!cont_scroll_ev.is_active ())
1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1994 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584#endif 1995#endif
1585 if (scr_page (upordown < 0 ? UP : DN, 1)) 1996 if (scr_page (upordown < 0 ? UP : DN, 1))
1586 { 1997 {
1587 if (upordown < 0) 1998 if (upordown < 0)
1588 scrollBar.setUp (); 1999 scrollBar.setUp ();
… …
1623 case Button3: 2034 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2035 if (scrollBar.style != R_SB_XTERM)
1625 { 2036 {
1626 if (scrollbar_above_slider (ev.y)) 2037 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2038# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2039 scr_page (UP, nrow - 1);
1629# else 2040# else
1630 scr_page (UP, TermWin.nrow / 4); 2041 scr_page (UP, nrow / 4);
1631# endif 2042# endif
1632 else if (scrollbar_below_slider (ev.y)) 2043 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2045 scr_page (DN, nrow - 1);
1635# else 2046# else
1636 scr_page (DN, TermWin.nrow / 4); 2047 scr_page (DN, nrow / 4);
1637# endif 2048# endif
1638 else 2049 else
1639 scrollBar.setMotion (); 2050 scrollBar.setMotion ();
1640 } 2051 }
1641 else 2052 else
1642 { 2053 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2054 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2055 (nrow
1645 * scrollbar_position (ev.y) 2056 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2057 / scrollbar_size ()));
1647 } 2058 }
1648 2059
1649 break; 2060 break;
1650 } 2061 }
1651 } 2062 }
2063
1652 return; 2064 return;
1653 } 2065 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2066}
1662 2067
1663void 2068void
1664rxvt_term::button_release (XButtonEvent &ev) 2069rxvt_term::button_release (XButtonEvent &ev)
1665{ 2070{
1666 int reportmode = 0; 2071 int reportmode = 0;
1667 2072
1668 csrO = 0; /* reset csr Offset */ 2073 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2074 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2075 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2076
1672 if (scrollbar_isUpDn ()) 2077 if (scrollbar_isUpDn ())
1673 { 2078 {
1674 scrollBar.setIdle (); 2079 scrollBar.setIdle ();
1675 scrollbar_show (0); 2080 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2081 }
2082
1681#ifdef SELECTION_SCROLLING 2083#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
1684#endif 2085#endif
2086
1685 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1686 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2092#if ISO_14755
2093 // 5.4
2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2095 return;
2096#endif
2097
1687 if (reportmode) 2098 if (reportmode)
1688 { 2099 {
1689 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
1702 mouse_report (ev); 2113 mouse_report (ev);
1703 } 2114 }
1704#else /* MOUSE_REPORT_DOUBLECLICK */ 2115#else /* MOUSE_REPORT_DOUBLECLICK */
1705 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
1706 mouse_report (ev); 2117 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2119 return;
1709 } 2120 }
2121
1710 /* 2122 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2124 * when overriding mouse reporting
1713 */ 2125 */
1714 if (PrivateModes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2127 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
1718 2130
1719 switch (ev.button) 2131 switch (ev.button)
1720 { 2132 {
1721 case Button1: 2133 case Button1:
1722 case Button3: 2134 case Button3:
1723 selection_make (ev.time); 2135 selection_make (ev.time);
1724 break; 2136 break;
2137
1725 case Button2: 2138 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1727 break; 2141 break;
2142
1728#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
1729 case Button4: 2144 case Button4:
1730 case Button5: 2145 case Button5:
1731 { 2146 {
1732 int i; 2147 int i;
… …
1734 2149
1735 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
1736 2151
1737 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
1738 i = 1; 2153 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2154 else if (option (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2155 i = nrow - 1;
1741 else 2156 else
1742 i = 5; 2157 i = 5;
1743 2158
1744# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
1746 { 2161 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2163 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; 2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2165
1751 if (slip_wheel_ev.at < NOW) 2166 if (!slip_wheel_ev.is_active ())
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1753
1754 slip_wheel_ev.start ();
1755 } 2168 }
1756 else 2169 else
1757 { 2170 {
1758# endif 2171# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2172 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2173 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 2174# ifdef MOUSE_SLIP_WHEELING
1772 } 2175 }
1773#endif 2176# endif
1774 } 2177 }
1775 break; 2178 break;
1776#endif 2179#endif
1777 } 2180 }
1778 } 2181 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2182}
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 2183
2261/*}}} */ 2184/*}}} */
2262 2185
2263bool 2186bool
2264rxvt_term::cmd_parse () 2187rxvt_term::cmd_parse ()
2265{ 2188{
2266 bool flag = false; 2189 bool flag = false;
2267 unicode_t ch = NOCHAR; 2190 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2191 char *seq_begin; // remember start of esc-sequence here
2269 2192
2270 for (;;) 2193 for (;;)
2271 { 2194 {
2272 if (ch == NOCHAR) 2195 if (ch == NOCHAR)
2273 { 2196 {
2274 seq_begin = cmdbuf_ptr; 2197 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2198 ch = next_char ();
2276 }
2277 2199
2278 if (ch == NOCHAR) // TODO: improve 2200 if (ch == NOCHAR)
2279 break; 2201 break;
2202 }
2280 2203
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2204 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2205 {
2206 if (!seen_input)
2207 {
2208 seen_input = 1;
2209 // many badly-written programs (e.g. jed) contain a race condition:
2210 // they first read the screensize and then install a SIGWINCH handler.
2211 // some window managers resize the window early, and these programs
2212 // then sometimes get the size wrong.
2213 // unfortunately other programs are even more buggy and dislike
2214 // being sent SIGWINCH, so only do it when we were in fact being
2215 // resized.
2216 if (seen_resize && cmd_pid)
2217 kill (-cmd_pid, SIGWINCH);
2218 }
2219
2283 /* Read a text string from the input buffer */ 2220 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2221 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2222 bool refreshnow = false;
2286 int nlines = 0; 2223 int nlines = 0;
2287 unicode_t *str = buf; 2224 wchar_t *str = buf;
2225 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2226
2289 for (;;) 2227 for (;;)
2290 { 2228 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2229 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2230 break;
2293 2231
2294 *str++ = ch; 2232 *str++ = ch;
2295 2233
2296 if (ch == C0_LF) 2234 if (ch == C0_LF || str >= eol)
2297 { 2235 {
2236 if (ch == C0_LF)
2298 nlines++; 2237 nlines++;
2238
2299 refresh_count++; 2239 refresh_count++;
2300 2240
2301 if (!(Options & Opt_jumpScroll) 2241 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2242 {
2243 refresh_count = 0;
2244
2245 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2246 {
2304 refreshnow = true; 2247 refreshnow = true;
2305 ch = NOCHAR; 2248 ch = NOCHAR;
2306 break; 2249 break;
2250 }
2307 } 2251 }
2308 2252
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2253 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2254 if (nlines >= nrow - 1)
2311 { 2255 {
2256 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2257 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2258 scr_add_lines (buf, str - buf, nlines);
2259
2313 nlines = 0; 2260 nlines = 0;
2314 str = buf; 2261 str = buf;
2262 eol = str + min (ncol, UBUFSIZ);
2315 } 2263 }
2316 }
2317 2264
2318 if (str >= buf + UBUFSIZ) 2265 if (str >= eol)
2319 { 2266 {
2267 if (eol >= buf + UBUFSIZ)
2268 {
2320 ch = NOCHAR; 2269 ch = NOCHAR;
2321 break; 2270 break;
2271 }
2272 else
2273 eol = min (eol + ncol, buf + UBUFSIZ);
2274 }
2275
2322 } 2276 }
2323 2277
2324 seq_begin = cmdbuf_ptr; 2278 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2279 ch = next_char ();
2326 } 2280 }
2327 2281
2282 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2283 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2284 scr_add_lines (buf, str - buf, nlines);
2329 2285
2330 /* 2286 /*
2331 * If there have been a lot of new lines, then update the screen 2287 * 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. 2288 * 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 2289 * if skipScroll is enabled.
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2290 */
2336 if (refreshnow) 2291 if (refreshnow)
2337 { 2292 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true; 2293 flag = true;
2343 scr_refresh (refresh_type); 2294 scr_refresh ();
2344 } 2295 want_refresh = 1;
2345 } 2296 }
2346 2297
2347 } 2298 }
2348 else 2299 else
2349 { 2300 {
… …
2360 2311
2361 ch = NOCHAR; 2312 ch = NOCHAR;
2362 } 2313 }
2363 } 2314 }
2364 2315
2316 refresh_check ();
2317
2365 return flag; 2318 return flag;
2366} 2319}
2367 2320
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 2321// read the next character
2378unicode_t 2322wchar_t
2379rxvt_term::next_char () 2323rxvt_term::next_char () NOTHROW
2380{ 2324{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2325 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2326 {
2383 // assume 7-bit to be ascii ALWAYS 2327 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2329 return *cmdbuf_ptr++;
2386 2330
2387 wchar_t wc; 2331 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2333
2390 if (len == (size_t)-2) 2334 if (len == (size_t)-2)
2391 { 2335 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2336 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2337 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2338 break;
2395 } 2339 }
2396 2340
2397 if (len == (size_t)-1) 2341 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2343
2400 // assume wchar == unicode 2344 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2345 cmdbuf_ptr += len;
2402 return wc; 2346 return wc & UNICODE_MASK;
2403 } 2347 }
2404 2348
2405 return NOCHAR; 2349 return NOCHAR;
2406} 2350}
2351
2352// read the next octet
2353uint32_t
2354rxvt_term::next_octet () NOTHROW
2355{
2356 return cmdbuf_ptr < cmdbuf_endp
2357 ? (unsigned char)*cmdbuf_ptr++
2358 : NOCHAR;
2359}
2360
2361static class out_of_input out_of_input;
2407 2362
2408/* rxvt_cmd_getc () - Return next input character */ 2363/* rxvt_cmd_getc () - Return next input character */
2409/* 2364/*
2410 * Return the next input character after first passing any keyboard input 2365 * Return the next input character after first passing any keyboard input
2411 * to the command. 2366 * to the command.
2412 */ 2367 */
2413unicode_t 2368wchar_t
2414rxvt_term::cmd_getc () 2369rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2370{
2416 unicode_t c = next_char (); 2371 wchar_t c = next_char ();
2417 2372
2418 if (c == NOCHAR) 2373 if (c == NOCHAR)
2419 throw out_of_input; 2374 throw out_of_input;
2420 2375
2421 return c; 2376 return c;
2422} 2377}
2423 2378
2424unicode_t 2379uint32_t
2425rxvt_term::cmd_get8 () 2380rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2381{
2427 unicode_t c = next_octet (); 2382 uint32_t c = next_octet ();
2428 2383
2429 if (c == NOCHAR) 2384 if (c == NOCHAR)
2430 throw out_of_input; 2385 throw out_of_input;
2431 2386
2432 return c; 2387 return c;
… …
2496 { 2451 {
2497 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2498 break; /* done = 1 */ 2453 break; /* done = 1 */
2499 } 2454 }
2500 } 2455 }
2501 2456
2502 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2503 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2504 { 2459 {
2505 done = 1; 2460 done = 1;
2506 break; 2461 break;
… …
2508 } 2463 }
2509 } 2464 }
2510 2465
2511 pclose_printer (fd); 2466 pclose_printer (fd);
2512} 2467}
2513#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2514/*}}} */ 2469/*}}} */
2515 2470
2516/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2517enum { 2472enum {
2518 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
2532 case C0_ESC: 2487 case C0_ESC:
2533 process_escape_seq (); 2488 process_escape_seq ();
2534 break; 2489 break;
2535 case C0_ENQ: /* terminal Status */ 2490 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2491 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2492 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2493 else
2540 tt_write ((unsigned char *)VT100_ANS, 2494 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2495 break;
2543 case C0_BEL: /* bell */ 2496 case C0_BEL: /* bell */
2544 scr_bell (); 2497 scr_bell ();
2545 break; 2498 break;
2546 case C0_BS: /* backspace */ 2499 case C0_BS: /* backspace */
… …
2570 process_dcs_seq (); 2523 process_dcs_seq ();
2571 break; 2524 break;
2572 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
2573 process_csi_seq (); 2526 process_csi_seq ();
2574 break; 2527 break;
2575 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
2576 process_osc_seq (); 2529 process_osc_seq ();
2577 break; 2530 break;
2578#endif 2531#endif
2579 } 2532 }
2580} 2533}
… …
2645void 2598void
2646rxvt_term::process_escape_seq () 2599rxvt_term::process_escape_seq ()
2647{ 2600{
2648 unicode_t ch = cmd_getc (); 2601 unicode_t ch = cmd_getc ();
2649 2602
2650 if (PrivateModes & PrivMode_vt52) 2603 if (priv_modes & PrivMode_vt52)
2651 { 2604 {
2652 process_escape_vt52 (ch); 2605 process_escape_vt52 (ch);
2653 return; 2606 return;
2654 } 2607 }
2655 2608
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2624 break;
2672 case '+': 2625 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 2627 break;
2675#ifndef NO_FRILLS 2628#if !ENABLE_MINIMAL
2676 case '6': 2629 case '6':
2677 scr_backindex (); 2630 scr_backindex ();
2678 break; 2631 break;
2679#endif 2632#endif
2680 case '7': 2633 case '7':
2681 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
2682 break; 2635 break;
2683 case '8': 2636 case '8':
2684 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
2685 break; 2638 break;
2686#ifndef NO_FRILLS 2639#if !ENABLE_MINIMAL
2687 case '9': 2640 case '9':
2688 scr_forwardindex (); 2641 scr_forwardindex ();
2689 break; 2642 break;
2690#endif 2643#endif
2691 case '=': 2644 case '=':
… …
2701 break; 2654 break;
2702 2655
2703 /* 8.3.87: NEXT LINE */ 2656 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2657 case C1_NEL: /* ESC E */
2705 { 2658 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 2659 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 2661 }
2709 break; 2662 break;
2710 2663
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2664 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2665 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 2687 process_dcs_seq ();
2735 break; 2688 break;
2736 2689
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2742 2694
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 2697 process_csi_seq ();
… …
2807rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
2808{ 2760{
2809 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
2810 unsigned int nargs, p; 2762 unsigned int nargs, p;
2811 int n, ndef; 2763 int n, ndef;
2812 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
2813 2765
2814 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
2815 arg[--nargs] = 0;
2816 2767
2817 priv = 0; 2768 priv = 0;
2818 ch = cmd_getc (); 2769 ch = cmd_getc ();
2819 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
2820 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
2821 priv = ch; 2773 priv = ch;
2822 ch = cmd_getc (); 2774 ch = cmd_getc ();
2823 } 2775 }
2824 2776
2825 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 2806 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 2807 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 2808 if (arg[p] == -1)
2857 arg[p] = ndef; 2809 arg[p] = ndef;
2858 2810
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 /* 2811 /*
2867 * private mode handling 2812 * private mode handling
2868 */ 2813 */
2869 if (priv) 2814 if (priv)
2870 { 2815 {
2871 switch (priv) 2816 switch (priv)
2872 { 2817 {
2873 case '>': 2818 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
2820 {
2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2823 //
2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2826 // versions.
2827 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2828 tt_printf ("\033[>%d;95;0c", 'U');
2829 }
2876 break; 2830 break;
2877 case '?': 2831 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 2834 break;
… …
2985 2939
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2940 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 2941 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 2942 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2943 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2944 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 2945 break;
2992 2946
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2947 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 2948 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 2949 break;
2997 2950
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2951 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 2952 process_sgr_mode (nargs, arg);
3000 break; 2953 break;
… …
3007 break; 2960 break;
3008 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
3009 scr_report_position (); 2962 scr_report_position ();
3010 break; 2963 break;
3011 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 2965 if (option (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 2967 break;
3015 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 2970 break;
3018 } 2971 }
… …
3054 break; 3007 break;
3055 3008
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3009 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3010 if (arg[0] == 4)
3058 scr_insert_mode (0); 3011 scr_insert_mode (0);
3012 else if (arg[0] == 20)
3013 priv_modes &= ~PrivMode_LFNL;
3059 break; 3014 break;
3060 3015
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3016 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3017 if (arg[0] == 4)
3063 scr_insert_mode (1); 3018 scr_insert_mode (1);
3019 else if (arg[0] == 20)
3020 priv_modes |= PrivMode_LFNL;
3064 break; 3021 break;
3065 3022
3066 /* 3023 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3024 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3025 */
… …
3080 break; 3037 break;
3081 case CSI_75: 3038 case CSI_75:
3082 scr_cursor (RESTORE); 3039 scr_cursor (RESTORE);
3083 break; 3040 break;
3084 3041
3085#ifndef NO_FRILLS 3042#if !ENABLE_MINIMAL
3086 case CSI_74: 3043 case CSI_74:
3087 process_window_ops (arg, nargs); 3044 process_window_ops (arg, nargs);
3088 break; 3045 break;
3089#endif 3046#endif
3090 3047
… …
3097 break; 3054 break;
3098 } 3055 }
3099} 3056}
3100/*}}} */ 3057/*}}} */
3101 3058
3102#ifndef NO_FRILLS 3059#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3060/* ARGSUSED */
3104void 3061void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3062rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3063{
3107 int x, y; 3064 int x, y;
3108 XWindowAttributes wattr; 3065 XWindowAttributes wattr;
3109 Window wdummy; 3066 Window wdummy;
3067
3068 dLocal (Display *, dpy);
3110 3069
3111 if (nargs == 0) 3070 if (nargs == 0)
3112 return; 3071 return;
3113 3072
3114 switch (args[0]) 3073 switch (args[0])
3115 { 3074 {
3116 /* 3075 /*
3117 * commands 3076 * commands
3118 */ 3077 */
3119 case 1: /* deiconify window */ 3078 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3079 XMapWindow (dpy, parent[0]);
3121 break; 3080 break;
3122 case 2: /* iconify window */ 3081 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3082 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3083 break;
3126 case 3: /* set position (pixels) */ 3084 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3085 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3086 break;
3129 case 4: /* set size (pixels) */ 3087 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3089 break;
3132 case 5: /* raise window */ 3090 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3091 XRaiseWindow (dpy, parent[0]);
3134 break; 3092 break;
3135 case 6: /* lower window */ 3093 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3094 XLowerWindow (dpy, parent[0]);
3137 break; 3095 break;
3138 case 7: /* refresh window */ 3096 case 7: /* refresh window */
3139 scr_touch (true); 3097 scr_touch (true);
3140 break; 3098 break;
3141 case 8: /* set size (chars) */ 3099 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3100 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3101 (unsigned int) (args[1] * fheight));
3144 break; 3102 break;
3145 3103
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3104 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3105 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3106 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3107 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3108 (unsigned int) (args[1] * fheight));
3151 break; 3109 break;
3152
3153 3110
3154 /* 3111 /*
3155 * reports - some output format copied from XTerm 3112 * reports - some output format copied from XTerm
3156 */ 3113 */
3157 case 11: /* report window state */ 3114 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3117 break;
3161 case 13: /* report window position */ 3118 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3119 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3120 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3121 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3122 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3123 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3124 break;
3168 case 14: /* report window size (pixels) */ 3125 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3126 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3128 break;
3172 case 18: /* report text area size (chars) */ 3129 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3130 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3131 break;
3175 case 19: /* report window size (chars) */ 3132 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3133 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3134 break;
3178 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3136 {
3181 char *s; 3137 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3140 XFree (s);
3184 } 3141 }
3185 break; 3142 break;
3186 case 21: /* report window title */ 3143 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3144 {
3189 char *s; 3145 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3148 XFree (s);
3192 } 3149 }
3193 break; 3150 break;
3194 } 3151 }
3195} 3152}
3196#endif 3153#endif
3197 3154
3198/*----------------------------------------------------------------------*/ 3155/*----------------------------------------------------------------------*/
3199/* 3156/*
3200 * get input up until STRING TERMINATOR (or BEL) 3157 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3158 * ends_how is terminator used. returned input must be free()'d
3202 */ 3159 */
3203unsigned char * 3160char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3161rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3162{
3206 unicode_t prev = 0, ch; 3163 unicode_t ch;
3164 bool seen_esc = false;
3207 unsigned int n = 0; 3165 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3166 wchar_t string[STRING_MAX];
3210 3167
3211 while ((ch = cmd_getc ()) != NOCHAR) 3168 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3169 {
3213 if (prev == C0_ESC) 3170 if (seen_esc)
3214 { 3171 {
3215 if (ch == 0x5c) /* 7bit ST */ 3172 if (ch == 0x5c) /* 7bit ST */
3216 break; 3173 break;
3217 else 3174 else
3218 return NULL; 3175 return NULL;
3219 } 3176 }
3177 else if (ch == C0_ESC)
3178 {
3179 seen_esc = true;
3180 continue;
3181 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3182 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3183 break;
3184 else if (ch == C0_SYN)
3185 ch = cmd_get8 ();
3222 else if (ch < 0x20) 3186 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3187 return NULL; /* other control character - exit */
3224 3188
3225 if (n >= sizeof (string) - 1) 3189 seen_esc = false;
3190
3191 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3192 // stop at some sane length
3227 return NULL; 3193 return NULL;
3228 3194
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
3235 string[n++] = prev = ch; 3195 string[n++] = ch;
3236 } 3196 }
3237 3197
3238 string[n++] = '\0'; 3198 string[n++] = '\0';
3239 3199
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3200 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3201
3245 return s; 3202 return rxvt_wcstombs (string);
3246} 3203}
3247 3204
3248/*----------------------------------------------------------------------*/ 3205/*----------------------------------------------------------------------*/
3249/* 3206/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3207 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3208 */
3252void 3209void
3253rxvt_term::process_dcs_seq () 3210rxvt_term::process_dcs_seq ()
3254{ 3211{
3255 unsigned char *s; 3212 char *s;
3256 unicode_t eh; 3213 unicode_t eh;
3257 3214
3258 /* 3215 /*
3259 * Not handled yet 3216 * Not handled yet
3260 */ 3217 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3236 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3237 arg = arg * 10 + (ch - '0');
3281 3238
3282 if (ch == ';') 3239 if (ch == ';')
3283 { 3240 {
3284 unsigned char *s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3285 3242
3286 if (s) 3243 if (s)
3287 { 3244 {
3288 process_xterm_seq (arg, (char *)s, eh); 3245 process_xterm_seq (arg, s, eh);
3289 free (s); 3246 free (s);
3290 } 3247 }
3291 } 3248 }
3292} 3249}
3293 3250
3294void 3251void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3253{
3297 if (str[0] == '?' && !str[1]) 3254 if (str[0] == '?' && !str[1])
3298 { 3255 {
3299 if (Options & Opt_insecure) 3256 rgba c;
3300 { 3257 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3258
3302 PixColorsFocused[color].get (display, r, g, b); 3259#if XFT
3260 if (c.a != rgba::MAX_CC)
3261 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3262 else
3263#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3265 }
3306 else 3266 else
3307 set_window_color (color, str); 3267 set_window_color (color, str);
3308} 3268}
3309 3269
3310/* 3270/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3271 * 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 */ 3272 */
3335void 3273void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3274rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3275{
3338 int changed = 0;
3339 int color; 3276 int color;
3340 char *buf, *name; 3277 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3278 bool query = str[0] == '?' && !str[1];
3279 int saveop = op;
3280
3281 dLocal (Display *, dpy);
3342 3282
3343 assert (str != NULL); 3283 assert (str != NULL);
3284
3285 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3286 return;
3287
3344 switch (op) 3288 switch (op)
3345 { 3289 {
3346 case XTerm_name: 3290 case XTerm_name:
3347 set_title (str); 3291 set_title (str);
3348 /* FALLTHROUGH */ 3292 /* FALLTHROUGH */
… …
3353 set_title (str); 3297 set_title (str);
3354 break; 3298 break;
3355 case XTerm_property: 3299 case XTerm_property:
3356 if (str[0] == '?') 3300 if (str[0] == '?')
3357 { 3301 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3302 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3303 Atom actual_type;
3360 int actual_format; 3304 int actual_format;
3361 unsigned long nitems; 3305 unsigned long nitems;
3362 unsigned long bytes_after; 3306 unsigned long bytes_after;
3363 unsigned char *value = 0; 3307 unsigned char *value = 0;
3364 const char *str = ""; 3308 const char *str = "";
3365 3309
3366 if (prop 3310 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3311 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3312 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3313 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3314 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3315 && actual_type != None
3372 && actual_format == 8) 3316 && actual_format == 8)
3373 str = (const char *)(value); 3317 str = (const char *)(value);
3374 3318
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3319 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3320
3377 XFree (value); 3321 XFree (value);
3378 } 3322 }
3379 else 3323 else
3380 { 3324 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3326
3383 if (eq) 3327 if (eq)
3384 { 3328 {
3385 *eq = 0; 3329 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3330 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 } 3331 }
3391 else 3332 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3333 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3334 display->atom (str));
3394 } 3335 }
3395 break; 3336 break;
3396 3337
3397 case XTerm_Color: 3338 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3339 for (buf = (char *)str; buf && *buf;)
3399 { 3340 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3341 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3342 break;
3402 3343
3403 *name++ = '\0'; 3344 *name++ = '\0';
3404 color = atoi (buf); 3345 color = atoi (buf) + minCOLOR;
3405 3346
3406 if (color < 0 || color >= TOTAL_COLORS) 3347 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3348 break;
3408 3349
3409 if ((buf = STRCHR (name, ';')) != NULL) 3350 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3351 *buf++ = '\0';
3411 3352
3412 if (name[0] == '?' && !name[1]) 3353 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 } 3354 }
3424 break; 3355 break;
3425 case XTerm_Color00: 3356 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3427 break; 3358 break;
3428 case XTerm_Color01: 3359 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3360 process_color_seq (op, Color_bg, str, resp);
3430 break; 3361 break;
3431#ifndef NO_CURSORCOLOR 3362#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3363 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3364 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3365 break;
3435#endif 3366#endif
3436 case XTerm_Color_pointer_fg: 3367 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3368 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3369 break;
3439 case XTerm_Color_pointer_bg: 3370 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3371 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3372 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3373#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: 3374 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3375 process_color_seq (op, Color_RV, str, resp);
3451 break; 3376 break;
3377 case Rxvt_Color_BD:
3378 case URxvt_Color_BD:
3379 process_color_seq (op, Color_BD, str, resp);
3380 break;
3381 case Rxvt_Color_UL:
3382 case URxvt_Color_UL:
3383 process_color_seq (op, Color_UL, str, resp);
3384 break;
3385 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp);
3387 break;
3452#endif 3388#endif
3389#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp);
3392 {
3393 bool changed = false;
3394 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3453 3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3454 case XTerm_Pixmap: 3406 case Rxvt_Pixmap:
3455 if (*str != ';') 3407 if (!strcmp (str, "?"))
3456 { 3408 {
3457#if XPM_BACKGROUND 3409 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 3410
3470 } 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3471 if (changed) 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3472 { 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3473#ifdef XPM_BACKGROUND 3414 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 } 3415 }
3512 else 3416 else
3513 { 3417 {
3418 int changed = 0;
3419
3420 if (*str != ';')
3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3514 set_locale (str); 3430 while (str)
3515# ifdef USE_XIM 3431 {
3516 im_cb (); 3432 str++;
3517# endif 3433 if (bgPixmap.set_geometry (str))
3434 changed++;
3435 str = strchr (str, ';');
3436 }
3437 if (changed)
3438 update_background ();
3518 } 3439 }
3519 break; 3440 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 3441#endif
3530 3442
3531#ifdef MENUBAR 3443 case Rxvt_restoreFG:
3532 case XTerm_Menu: 3444 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; 3445 break;
3536#endif 3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449
3450 case XTerm_logfile:
3451 // TODO, when secure mode?
3452 break;
3453
3537#if 0 3454#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3455 case Rxvt_dumpscreen: /* no error notices */
3539 { 3456 {
3540 int fd; 3457 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3458 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3459 {
3543 scr_dump (fd); 3460 scr_dump (fd);
3544 close (fd); 3461 close (fd);
3545 } 3462 }
3546 } 3463 }
3464 break;
3465#endif
3466 case XTerm_font:
3467 op = URxvt_font;
3468 case URxvt_font:
3469#if ENABLE_STYLES
3470 case URxvt_boldFont:
3471 case URxvt_italicFont:
3472 case URxvt_boldItalicFont:
3473#endif
3474 if (query)
3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3477 ? fontset[op - URxvt_font]->fontdesc : "",
3478 resp);
3479 else
3480 {
3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
3482
3483 res = strdup (str);
3484 allocated.push_back ((void *)res);
3485 set_fonts ();
3486 }
3487 break;
3488
3489 case URxvt_version:
3490 if (query)
3491 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3492 op,
3493 rs[Rs_name], VERSION[0], VERSION[2],
3494 resp);
3495 break;
3496
3497#if !ENABLE_MINIMAL
3498 case URxvt_locale:
3499 if (query)
3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3501 else
3502 {
3503 set_locale (str);
3504 pty->set_utf8_mode (enc_utf8);
3505 init_xlocale ();
3506 }
3507 break;
3508
3509 case URxvt_view_up:
3510 case URxvt_view_down:
3511 {
3512 int lines = atoi (str);
3513
3514 if (lines)
3515 scr_page (op == URxvt_view_up ? UP : DN, lines);
3516 else
3517 scr_erase_savelines ();
3518 }
3519
3520 break;
3521#endif
3522
3523#if ENABLE_PERL
3524 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3526 ; // no responses yet
3547 break; 3527 break;
3548#endif 3528#endif
3549 } 3529 }
3550} 3530}
3551/*----------------------------------------------------------------------*/ 3531/*----------------------------------------------------------------------*/
… …
3565{ 3545{
3566 int state; 3546 int state;
3567 3547
3568 if (mode == 's') 3548 if (mode == 's')
3569 { 3549 {
3570 SavedModes |= (PrivateModes & bit); 3550 SavedModes |= (priv_modes & bit);
3571 return -1; 3551 return -1;
3572 } 3552 }
3573 else 3553 else
3574 { 3554 {
3575 if (mode == 'r') 3555 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3557 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3558 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3559 PrivMode (state, bit);
3580 } 3560 }
3581 3561
3582 return state; 3562 return state;
3583} 3563}
3584 3564
3585/* we're not using priv _yet_ */ 3565/* we're not using priv _yet_ */
3586void 3566void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 3568{
3589 unsigned int i, j; 3569 unsigned int i, j;
3590 int state; 3570 int state;
3591 3571
3592 static const struct 3572 static const struct
3593 { 3573 {
3594 const int argval; 3574 const int argval;
3595 const unsigned long bit; 3575 const unsigned long bit;
3596 }
3597
3598 argtopriv[] = { 3576 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
3600 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
3601 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3582 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3583 { 7, PrivMode_Autowrap },
3584 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3585 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3586 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 3587 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 3588#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3589 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3590#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3591 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3592 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3593 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3594 // 45 margin bell NYI
3620 // 46 start logging 3595 // 46 start logging
… …
3622 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
3623#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
3624 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
3625#endif 3600#endif
3626 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
3627 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
3628 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
3629 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3631 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
3632 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
3660 } 3634 }
3661 3635
3662 /* extra handling for values with state unkept */ 3636 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3637 switch (arg[i])
3664 { 3638 {
3639#if ENABLE_STYLES
3640 case 1021:
3641 set_option (Opt_intensityStyles, mode);
3642
3643 scr_touch (true);
3644 break;
3645#endif
3665 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
3647 case 1049:
3666 if (Options & Opt_secondaryScreen) 3648 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 3649 if (mode == 0)
3668 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
3669 else if (mode == 1) 3651 else if (mode == 1)
3670 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
3671 break; 3653 break;
… …
3682 * within VT52 mode 3664 * within VT52 mode
3683 */ 3665 */
3684 PrivMode (1, PrivMode_vt52); 3666 PrivMode (1, PrivMode_vt52);
3685 break; 3667 break;
3686 case 3: /* 80/132 */ 3668 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 3669 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3670 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 3671 break;
3690 case 4: /* smooth scrolling */ 3672 case 4: /* smooth scrolling */
3691 if (state) 3673 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 3674 break;
3696 case 5: /* reverse video */ 3675 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 3676 scr_rvideo_mode (state);
3698 break; 3677 break;
3699 case 6: /* relative/absolute origins */ 3678 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 3682 scr_autowrap (state);
3704 break; 3683 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3709 break; 3688 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 3689#ifdef scrollBar_esc
3718 case scrollBar_esc: 3690 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
3720 { 3692 {
3721 resize_all_windows (0, 0, 0); 3693 resize_all_windows (0, 0, 0);
… …
3733 break; 3705 break;
3734 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3711 break;
3740#if 0
3741 case 1001: 3712 case 1002:
3742 break; /* X11 mouse highlighting */ 3713 case 1003:
3743#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 3725 set_option (Opt_scrollTtyOutput, !state);
3749 break; 3726 break;
3750 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 3728 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 3729 break;
3756 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 3731 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 3733 scr_erase_screen (2);
3760 scr_change_screen (state); 3734 scr_change_screen (state);
3761 break; 3735 break;
3762 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 3737 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 3738 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 3740 scr_erase_screen (2);
3767 break; 3741 break;
3768 default: 3742 default:
3769 break; 3743 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 3769 rendset = 0, rendstyle = ~RS_None;
3796 break; 3770 break;
3797 case 1: 3771 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 3772 rendset = 1, rendstyle = RS_Bold;
3799 break; 3773 break;
3800 //case 2: // faint or second colour 3774 //case 2: // low intensity
3775 case 3:
3776 rendset = 1, rendstyle = RS_Italic;
3777 break;
3801 case 4: 3778 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 3779 rendset = 1, rendstyle = RS_Uline;
3803 break; 3780 break;
3804 case 5: // slowly blinking 3781 case 5: // slowly blinking
3805 case 6: // rapidly blinking 3782 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 3794 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 3795 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 3796 //...
3820 //case 19: // ninth alt font 3797 //case 19: // ninth alt font
3821 //case 20: // gothic 3798 //case 20: // gothic
3822 case 21: // disable bold, faint 3799 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 3800 rendset = 0, rendstyle = RS_Bold;
3824 break; 3801 break;
3825 case 22: 3802 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 3803 rendset = 0, rendstyle = RS_Bold;
3827 break; 3804 break;
3828 //case 23: disable italic 3805 case 23: // disable italic
3806 rendset = 0, rendstyle = RS_Italic;
3807 break;
3829 case 24: 3808 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 3809 rendset = 0, rendstyle = RS_Uline;
3831 break; 3810 break;
3832 case 25: 3811 case 25:
3812 rendset = 0, rendstyle = RS_Blink;
3813 break;
3814 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 3815 rendset = 0, rendstyle = RS_Blink;
3834 break; 3816 break;
3835 case 27: 3817 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 3818 rendset = 0, rendstyle = RS_RVid;
3837 break; 3819 break;
… …
3855 case 35: 3837 case 35:
3856 case 36: 3838 case 36:
3857 case 37: 3839 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3840 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 3841 break;
3860#ifdef TTY_256COLOR 3842 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 3843 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 3844 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3845 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 3846 i += 2;
3866 } 3847 }
3867 break; 3848 break;
3868#endif
3869 case 39: /* default fg */ 3849 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 3850 scr_color (Color_fg, Color_fg);
3871 break; 3851 break;
3872 3852
3873 case 40: 3853 case 40:
… …
3878 case 45: 3858 case 45:
3879 case 46: 3859 case 46:
3880 case 47: 3860 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3861 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 3862 break;
3883#ifdef TTY_256COLOR 3863 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 3864 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 3865 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3866 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 3867 i += 2;
3889 } 3868 }
3890 break; 3869 break;
3891#endif
3892 case 49: /* default bg */ 3870 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 3871 scr_color (Color_bg, Color_bg);
3894 break; 3872 break;
3895 3873
3896#ifndef NO_BRIGHTCOLOR 3874 //case 50: // not variable spacing
3875
3876#if !ENABLE_MINIMAL
3897 case 90: 3877 case 90:
3898 case 91: /* set bright fg color */ 3878 case 91: /* set bright fg color */
3899 case 92: 3879 case 92:
3900 case 93: 3880 case 93:
3901 case 94: 3881 case 94:
3902 case 95: 3882 case 95:
3903 case 96: 3883 case 96:
3904 case 97: 3884 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3885 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 3886 break;
3908 case 100: 3887 case 100:
3909 case 101: /* set bright bg color */ 3888 case 101: /* set bright bg color */
3910 case 102: 3889 case 102:
3911 case 103: 3890 case 103:
3912 case 104: 3891 case 104:
3913 case 105: 3892 case 105:
3914 case 106: 3893 case 106:
3915 case 107: 3894 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3895 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 3896 break;
3919#endif 3897#endif
3920
3921 } 3898 }
3922 } 3899 }
3923} 3900}
3924/*}}} */ 3901/*}}} */
3925 3902
… …
3928rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
3929{ 3906{
3930 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
3931 3908
3932 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
3933 { /* query graphics */ 3911 /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 3913 return;
3936 } 3914 }
3937 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
3938 do 3916 do
3939 ch = cmd_getc (); 3917 ch = cmd_getc ();
… …
3949 */ 3927 */
3950void 3928void
3951rxvt_term::tt_printf (const char *fmt,...) 3929rxvt_term::tt_printf (const char *fmt,...)
3952{ 3930{
3953 va_list arg_ptr; 3931 va_list arg_ptr;
3954 unsigned char buf[256]; 3932 char buf[256];
3955 3933
3956 va_start (arg_ptr, fmt); 3934 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3935 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 3936 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 3937 tt_write (buf, strlen (buf));
3960} 3938}
3961 3939
3962/* ---------------------------------------------------------------------- */ 3940/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 3941/* 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. 3942 * or generated by us in response to a query ESC sequence.
3965 */ 3943 */
3944const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3945
3966void 3946void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3947rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 3948{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3949 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3950 return;
3970 3951
3971 if (len) 3952 if (pty->pty < 0)
3953 return;
3954
3955 if (v_buflen == 0)
3956 {
3957 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3958
3959 if ((unsigned int)written == len)
3960 return;
3961
3962 data += written;
3963 len -= written;
3972 { 3964 }
3965
3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3967
3968 memcpy (v_buffer + v_buflen, data, len);
3969 v_buflen += len;
3970
3971 pty_ev.set (ev::READ | ev::WRITE);
3972}
3973
3974void rxvt_term::pty_write ()
3975{
3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3977
3978 if (written > 0)
3979 {
3980 v_buflen -= written;
3981
3973 if (v_buflen == 0) 3982 if (v_buflen == 0)
3974 { 3983 {
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); 3984 free (v_buffer);
4002 v_buffer = 0; 3985 v_buffer = 0;
4003 v_buflen = 0;
4004 3986
4005 pty_ev.set (EVENT_READ); 3987 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; 3988 return;
4018 } 3989 }
3990
3991 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 3992 }
3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3994 pty_ev.set (ev::READ);
4020} 3995}
4021 3996
4022/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4023 3998

Diff Legend

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