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

Diff Legend

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