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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.388 by ayin, Mon Dec 31 01:16:47 2007 UTC

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

Diff Legend

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