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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC

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

Diff Legend

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