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

Diff Legend

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