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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.399 by ayin, Mon Jan 28 10:54:54 2008 UTC

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

Diff Legend

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