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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.379 by root, Fri Dec 14 02:29:48 2007 UTC

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

Diff Legend

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