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

Diff Legend

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