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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC

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

Diff Legend

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