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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.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 ();
799} 1265}
800 1266
801void 1267void
802rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
803{ 1269{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
805 recolour_cursor (); 1271 recolour_cursor ();
806 1272
807#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1274 hidden_pointer = 0;
809 1275
810 if (Options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1278#endif
813} 1279}
814 1280
815#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
816void 1282void
817rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
818{ 1284{
819 if (! (Options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
820 return; 1286 return;
821 1287
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
823 XFlush (display->display); 1289 XFlush (dpy);
824 1290
825 hidden_pointer = 1; 1291 hidden_pointer = 1;
826} 1292}
827 1293
828void 1294void
829rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
830{ 1296{
831 SET_R (this); 1297 make_current ();
832 SET_LOCALE (locale);
833 1298
834 pointer_blank (); 1299 pointer_blank ();
835} 1300}
836#endif 1301#endif
837 1302
… …
844 x = ev.x; 1309 x = ev.x;
845 y = ev.y; 1310 y = ev.y;
846 pixel_position (&x, &y); 1311 pixel_position (&x, &y);
847 1312
848 if (MEvent.button == AnyButton) 1313 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1314 button_number = 3;
851 }
852 else 1315 else
853 { 1316 {
854 button_number = MEvent.button - Button1; 1317 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1318 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1319 if (button_number >= 3)
857 button_number += (64 - 3); 1320 button_number += (64 - 3);
858 } 1321 }
859 1322
860 if (PrivateModes & PrivMode_MouseX10) 1323 if (priv_modes & PrivMode_MouseX10)
861 { 1324 {
862 /* 1325 /*
863 * do not report ButtonRelease 1326 * do not report ButtonRelease
864 * no state info allowed 1327 * no state info allowed
865 */ 1328 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1347#endif
885
886 } 1348 }
887 1349
888#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1352 if (key_state & 16)
891 fputc ('C', stderr); 1353 fputc ('C', stderr);
892 if (key_state & 4) 1354 if (key_state & 4)
893 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1359 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1361 button_number,
900 x + 1, 1362 x + 1,
901 y + 1); 1363 y + 1);
902#else 1364#endif
1365
903 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
905 (32 + x + 1), 1368 (32 + x + 1),
906 (32 + y + 1)); 1369 (32 + y + 1));
907#endif
908} 1370}
909
910#ifdef USING_W11LIB
911void
912rxvt_W11_process_x_event (XEvent *ev)
913{
914 rxvt_t *r = rxvt_get_r ();
915
916 x_cb (*ev);
917}
918#endif
919 1371
920/*{{{ process an X event */ 1372/*{{{ process an X event */
921void 1373void
922rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
923{ 1375{
924 SET_R (this); 1376 make_current ();
925 SET_LOCALE (locale);
926 1377
927#if defined(CURSOR_BLINK) 1378 dLocal (Display *, dpy);
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
929 {
930 if (hidden_cursor)
931 {
932 hidden_cursor = 0;
933 want_refresh = 1;
934 }
935 1379
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
937 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
938#endif 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
939
940#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 {
943 if (ev.type == MotionNotify
944 || ev.type == ButtonPress
945 || ev.type == ButtonRelease)
946 if (hidden_pointer)
947 pointer_unblank ();
948
949 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank ();
951 }
952#endif
953
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return; 1383 return;
957#endif
958 1384
1385 // for XQueryPointer
959 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1388 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1010#endif
1011 1389
1012 switch (ev.type) 1390 switch (ev.type)
1013 { 1391 {
1014 case KeyPress: 1392 case KeyPress:
1015 lookup_key (ev.xkey); 1393 key_press (ev.xkey);
1016 break; 1394 break;
1017 1395
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease: 1396 case KeyRelease:
1020 { 1397 key_release (ev.xkey);
1021 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0;
1030 }
1031 break; 1398 break;
1032 }
1033#endif
1034 1399
1035 case ButtonPress: 1400 case ButtonPress:
1036 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1037 break; 1402 break;
1038 1403
… …
1040 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1041 break; 1406 break;
1042 1407
1043 case ClientMessage: 1408 case ClientMessage:
1044 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1046 destroy ();
1047#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink))
1053 { 1411 {
1054 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1055 Atom ActualType; 1413 {
1056 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1057 unsigned char *data; 1415 {
1058 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1059 1417 {
1060 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1061 xa[XA_DNDSELECTION], 1419 destroy ();
1062 0L, 1000000L, 1420 }
1063 False, AnyPropertyType, 1421#if ENABLE_EWMH
1064 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1065 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1066 &data); 1425 &ev);
1067 XChangeProperty (display->display, display->root, 1426#endif
1068 XA_CUT_BUFFER0, XA_STRING, 1427 }
1069 8, PropModeReplace, 1428 }
1070 data, STRLEN (data)); 1429#if ENABLE_XEMBED
1071 XFree (data); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1431 {
1073 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
1074 } 1438 }
1075#endif /* OFFIX_DND */
1076 break; 1439 break;
1077 1440
1078 case MappingNotify: 1441 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1443 break;
1081 1444
1082 /* 1445 /*
1083 * XXX: this is not the _current_ arrangement 1446 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1447 * Here's my conclusion:
… …
1103 break; 1466 break;
1104 } 1467 }
1105 break; 1468 break;
1106 1469
1107 case FocusIn: 1470 case FocusIn:
1108 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])
1109 { 1486 {
1110 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1488 ;
1112#ifdef USE_XIM 1489
1113 if (Input_Context != NULL) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1114 XSetICFocus (Input_Context);
1115#endif
1116#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 { 1491 {
1123 PixColors = PixColorsFocused; 1492 seen_resize = 1;
1124 set_colorfgbg (); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1125 scr_clear ();
1126 scr_touch (true);
1127 } 1494 }
1128#endif
1129 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
1130 } 1502 }
1131 break; 1503 break;
1132 1504
1133 case FocusOut:
1134 if (TermWin.focus)
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 }
1158 break;
1159
1160 case ConfigureNotify: 1505 case PropertyNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1162 { 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1163 int height, width; 1508 && ev.xproperty.state == PropertyNewValue)
1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1164 1510
1165 do
1166 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172
1173 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1);
1177 }
1178#ifdef DEBUG_SIZE
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent)
1186 {
1187 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif
1192 }
1193 break; 1511 break;
1194 1512
1195 case SelectionClear: 1513 case SelectionClear:
1196 selection_clear (); 1514 selection_clear ();
1197 break; 1515 break;
1198 1516
1199 case SelectionNotify: 1517 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1518 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1520 break;
1204 1521
1205 case SelectionRequest: 1522 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1207 break; 1524 break;
1208 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
1209 case UnmapNotify: 1534 case UnmapNotify:
1210 TermWin.mapped = 0; 1535 mapped = 0;
1211#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1213#endif 1538#endif
1214 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1215
1216 case MapNotify:
1217 TermWin.mapped = 1;
1218#ifdef TEXT_BLINK
1219 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1220#endif
1221 break; 1540 break;
1222 1541
1223#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1224 case ReparentNotify: 1543 case ReparentNotify:
1225 rootwin_cb (ev); 1544 rootwin_cb (ev);
1226 break; 1545 break;
1227#endif /* TRANSPARENT */ 1546#endif /* TRANSPARENT */
1228 1547
1229 case GraphicsExpose: 1548 case GraphicsExpose:
1230 case Expose: 1549 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == vt)
1232 { 1551 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1552 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1237 // 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))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1562
1241 // ev.xexpose.width, TermWin.height, False);
1242#endif
1243 want_refresh = 1; 1563 want_refresh = 1;
1244 } 1564 }
1245 else 1565 else
1246 { 1566 {
1247 XEvent unused_event; 1567 XEvent unused_event;
1248 1568
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1250 ; 1570 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1572 ;
1253 1573
1254 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1255 { 1575 {
1256 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1257 scrollbar_show (0); 1577 scrollbar_show (0);
1258 } 1578 }
1259#ifdef MENUBAR 1579
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1580#ifdef TRANSPARENT
1261 menubar_expose (); 1581 if (am_transparent && ev.xany.window == parent[0])
1582 XClearWindow (dpy, ev.xany.window);
1262#endif 1583#endif
1263 } 1584 }
1264 break; 1585 break;
1265 1586
1266 case MotionNotify: 1587 case MotionNotify:
1267#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1268 if (hidden_pointer) 1589 if (hidden_pointer)
1269 pointer_unblank (); 1590 pointer_unblank ();
1270#endif 1591#endif
1271#if MENUBAR 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1272 if (isMenuBarWindow (ev.xany.window)) 1593 break;
1594
1595 if (ev.xany.window == vt)
1273 { 1596 {
1274 menubar_control (ev.xbutton); 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1275 break; 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1276 } 1599 ; // nop
1277#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1279 break;
1280
1281 if (ev.xany.window == TermWin.vt)
1282 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1601 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1286 ; 1603 ;
1287 1604
1288 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (dpy, vt,
1289 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1609 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1613 {
1297#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
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1300#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1629 {
1304 int dist; 1630 int dist;
1305 1631
1306 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1637
1312 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1314 */ 1640 */
1315 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1644
1320 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1322 { 1647 {
1323 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1325 } 1650 }
1326 else 1651 else
1327 { 1652 {
1328 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1655 }
1656
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1334 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1336 } 1662 }
1337 else 1663 else
1338 { 1664 {
1339 /* we are within the text window, so we 1665 /* we are within the text window, so we
1340 * shouldn't be scrolling 1666 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1668 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1669 sel_scroll_ev.stop();
1344 } 1670 }
1345#endif 1671#endif
1346#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1347
1348 } 1673 }
1349#endif 1674#endif
1350
1351 } 1675 }
1352 } 1676 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1678 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1356 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1357 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1358 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1687 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1689 scrollbar_size ());
1364 scr_refresh (refresh_type); 1690 want_refresh = 1;
1365 refresh_limit = 0; 1691 refresh_limit = 0;
1366 scrollbar_show (1); 1692 scrollbar_show (1);
1367 } 1693 }
1368 break; 1694 break;
1369 } 1695 }
1370}
1371 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
1372void 1821void
1373rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1823{
1375 SET_R (this); 1824 make_current ();
1376 SET_LOCALE (locale);
1377 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
1378 switch (ev.type) 1831 switch (ev.type)
1379 { 1832 {
1380 case PropertyNotify: 1833 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1834 /*
1391 * 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,
1392 * 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.
1393 */ 1837 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 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])
1398 return; 1840 return;
1399 }
1400 1841
1401 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1402 case ReparentNotify: 1843 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1405 break; 1846 break;
1847 }
1406#endif 1848# endif
1407 }
1408} 1849}
1850#endif
1409 1851
1410void 1852void
1411rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1412{ 1854{
1413 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1414 1856
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1416 if (!bypass_keystate) 1859 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1861
1418 /* 1862 /*
1419 * VT window processing of button press 1863 * VT window processing of button press
1420 */ 1864 */
1421 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1422 { 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
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1879 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1880
1424 if (reportmode) 1881 if (reportmode)
1425 { 1882 {
1426 /* mouse report from vt window */ 1883 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1884 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1885 MEvent.state = ev.state;
1429#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1430 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1431 { 1888 {
1432 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1433 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1434 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1435 { 1893 {
1436 /* only report double clicks */ 1894 /* only report double clicks */
1437 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1438 mouse_report (ev); 1896 mouse_report (ev);
… …
1457 } 1915 }
1458 else 1916 else
1459 { 1917 {
1460 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1920
1462 switch (ev.button) 1921 switch (ev.button)
1463 { 1922 {
1464 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
1465 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1467 { 1934 {
1468 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1470 else 1937 else
1471 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1953 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1489 else 1956 else
1490 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1958
1491 MEvent.button = Button3; 1959 MEvent.button = Button3;
1492 break; 1960 break;
1493 } 1961 }
1494 } 1962 }
1963
1495 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1496 return; 1965 return;
1497 } 1966 }
1498 1967
1499 /* 1968 /*
… …
1591 break; 2060 break;
1592 case R_SB_ALIGN_BOTTOM: 2061 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 2062 csrO = scrollBar.bot - scrollBar.top;
1594 break; 2063 break;
1595 } 2064 }
2065
1596 if (scrollBar.style == R_SB_XTERM 2066 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 2067 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 2068 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 2069 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 2070
1601 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1602 break; 2072 break;
1603 2073
1604 case Button1: 2074 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2075 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 case Button3: 2079 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 2080 if (scrollBar.style != R_SB_XTERM)
1611 { 2081 {
1612 if (scrollbar_above_slider (ev.y)) 2082 if (scrollbar_above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 2084 scr_page (UP, nrow - 1);
1615# else 2085# else
1616 scr_page (UP, TermWin.nrow / 4); 2086 scr_page (UP, nrow / 4);
1617# endif 2087# endif
1618 else if (scrollbar_below_slider (ev.y)) 2088 else if (scrollbar_below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 2089# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 2090 scr_page (DN, nrow - 1);
1621# else 2091# else
1622 scr_page (DN, TermWin.nrow / 4); 2092 scr_page (DN, nrow / 4);
1623# endif 2093# endif
1624 else 2094 else
1625 scrollBar.setMotion (); 2095 scrollBar.setMotion ();
1626 } 2096 }
1627 else 2097 else
1628 { 2098 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 2099 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 2100 (nrow
1631 * scrollbar_position (ev.y) 2101 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 2102 / scrollbar_size ()));
1633 } 2103 }
2104
1634 break; 2105 break;
1635 } 2106 }
1636 } 2107 }
2108
1637 return; 2109 return;
1638 } 2110 }
1639#if MENUBAR
1640 /*
1641 * Menubar window processing of button press
1642 */
1643 if (isMenuBarWindow (ev.window))
1644 menubar_control (ev);
1645#endif
1646} 2111}
1647 2112
1648void 2113void
1649rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1650{ 2115{
1651 int reportmode = 0; 2116 int reportmode = 0;
1652 2117
1653 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2119 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2121
1657 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1658 { 2123 {
1659 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1660 scrollbar_show (0); 2125 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH;
1663#endif
1664
1665 } 2126 }
2127
1666#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
1669#endif 2131#endif
2132
1670 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1671 { 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
1672 if (reportmode) 2144 if (reportmode)
1673 { 2145 {
1674 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1691 mouse_report (ev); 2163 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2165 return;
1694 } 2166 }
2167
1695 /* 2168 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2170 * when overriding mouse reporting
1698 */ 2171 */
1699 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2173 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1703 2176
1704 switch (ev.button) 2177 switch (ev.button)
1705 { 2178 {
1706 case Button1: 2179 case Button1:
1707 case Button3: 2180 case Button3:
1708 selection_make (ev.time); 2181 selection_make (ev.time);
1709 break; 2182 break;
2183
1710 case Button2: 2184 case Button2:
1711 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);
1712 break; 2187 break;
2188
1713#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
1714 case Button4: 2190 case Button4:
1715 case Button5: 2191 case Button5:
1716 { 2192 {
1717 int i; 2193 int i;
… …
1719 2195
1720 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
1721 2197
1722 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1723 i = 1; 2199 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
1725 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1726 else 2202 else
1727 i = 5; 2203 i = 5;
1728 2204
1729# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1731 { 2207 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1735 2211
1736 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738 2214
1739 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
1740 } 2216 }
1741 else 2217 else
1742 { 2218 {
1743# endif 2219# endif
1744# ifdef JUMP_MOUSE_WHEEL
1745 scr_page (v, i); 2220 scr_page (v, i);
1746 scr_refresh (SMOOTH_REFRESH);
1747 scrollbar_show (1); 2221 scrollbar_show (1);
1748# else
1749 while (i--)
1750 {
1751 scr_page (v, 1);
1752 scr_refresh (SMOOTH_REFRESH);
1753 scrollbar_show (1);
1754 }
1755# endif
1756# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
1757 } 2223 }
1758#endif 2224# endif
1759 } 2225 }
1760 break; 2226 break;
1761#endif 2227#endif
1762 } 2228 }
1763 } 2229 }
1764#ifdef MENUBAR
1765 else if (isMenuBarWindow (ev.window))
1766 menubar_control (ev);
1767#endif
1768} 2230}
1769 2231
1770#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
1771#if TINTING 2233#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2234/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2235
1775static void 2236typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2237
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2239{
1783 /* No saturation */ 2240 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2241 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 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;
1787 2246
1788 b = ((uint16_t *) ptr)[x]; 2247 Visual *visual = term->visual;
1789 r = (b & 0x7c00) * rm; 2248
1790 g = (b & 0x3e0) * gm; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2250
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2251 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2252 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2253 mask_g = visual->green_mask;
1795 } 2254 mask_b = visual->blue_mask;
1796 ptr += bpl; 2255
1797 } 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;
1798 } else { 2329 } else {
1799 for (y = h; --y >= 0;) { 2330 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2331 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2332
1803 b = ((uint16_t *) ptr)[x]; 2333 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2334
1805 g = (b & 0x3e0) * gm; 2335 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2336 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2337 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2338 }
1809 b |= (!(b >> 5) - 1); 2339
1810 ((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 */
1811 | ((g >> 8) & 0x3e0) 2341 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2342 {
1813 } 2343 unsigned int tmp;
1814 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++)
1815 } 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);
1816 } 2396 }
1817} 2397 break;
1818 2398 }
1819/* RGB 16 */ 2399 case 16:
1820static void 2400 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2401 unsigned short *p1, *pf, *p, *pl;
1822{ 2402 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2403 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2404 while (p1 < pf)
1825 2405 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2406 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2407 pl = p1 + srcImage->width;
1828 /* No saturation */ 2408 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2409 {
1843 } else { 2410 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2411 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2412 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2413 }
1859 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)
1860 } 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);
1861 } 2434 }
1862} 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);
1863 2442
1864/* RGB 24 */ 2443 while (p1 < pf)
1865static void 2444 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2445 p = p1;
1867{ 2446 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2447 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2448 {
1896 } else { 2449 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2450 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2451 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2452 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2453 }
1927 ptr += bpl; 2454 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2455 }
2456 break;
2457 }
1929 } 2458 }
1930}
1931 2459
1932/* RGB 32 */ 2460 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2461}
2003
2004#endif 2462#endif
2005 2463
2006/* 2464/*
2007 * Check our parents are still who we think they are. 2465 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2466 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2020 2478
2021 pchanged = 0; 2479 pchanged = 0;
2022 2480
2023 if (!(Options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2025 2483
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2028 2486
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2030 2488
2031 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2032 { 2490 {
2033 if (am_transparent) 2491 if (am_transparent)
2034 { 2492 {
2035 pchanged = 1; 2493 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2038 } 2496 }
2039 2497
2040 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2041 } 2499 }
2042 2500
2043 /* 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. */
2044 XSync (display->display, False); 2502 XSync (dpy, False);
2045 2503
2046 /* 2504 /*
2047 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2049 * 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.
2050 */ 2508 */
2051 i = (xa[XA_XROOTPMAPID] 2509 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2055 2513
2056 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2061 2519
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2520 if (!i || prop == NULL
2521#if TINTING
2522 || !ISSET_PIXCOLOR (Color_tint)
2523#endif
2524 )
2063 have_pixmap = 0; 2525 have_pixmap = 0;
2064 else 2526 else
2065 { 2527 {
2066 have_pixmap = 1; 2528 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2529 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2540 Window cr;
2079 XImage *image; 2541 XImage *image;
2080 GC gc; 2542 GC gc;
2081 XGCValues gcvalue; 2543 XGCValues gcvalue;
2082 2544
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2549 nx = ny = 0;
2088 2550
… …
2098 nh += sy; 2560 nh += sy;
2099 ny = -sy; 2561 ny = -sy;
2100 sy = 0; 2562 sy = 0;
2101 } 2563 }
2102 2564
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2105 allowedxerror = -1; 2569 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2571
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2574 allowedxerror = 0;
2111 2575
2112 if (image == NULL) 2576 if (image == NULL)
2113 { 2577 {
2114 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2115 { 2579 {
2116 pchanged = 1; 2580 pchanged = 1;
2117 if (TermWin.pixmap != None) 2581 if (pixmap != None)
2118 { 2582 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2583 XFreePixmap (dpy, pixmap);
2120 TermWin.pixmap = None; 2584 pixmap = None;
2121 } 2585 }
2122 } 2586 }
2123 2587
2124 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2125 } 2589 }
2126 else 2590 else
2127 { 2591 {
2128 if (TermWin.pixmap != None) 2592 if (pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2593 XFreePixmap (dpy, pixmap);
2130 2594
2131#if TINTING 2595#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2597 {
2134 unsigned short rm, gm, bm; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2135 if (rs[Rs_shade]) 2599
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2600 rgba c;
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2139 2602
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2604 }
2151#endif 2605#endif
2152 2606
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2154 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2611 XFreeGC (dpy, gc);
2159 XDestroyImage (image); 2612 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2614 XClearWindow (dpy, parent[0]);
2161 2615
2162 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2617 pchanged = 1;
2164 2618
2165 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2166 } 2620 }
2167 } 2621 }
2168 2622
2169 if (!am_pixmap_trans) 2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2170 { 2626 {
2171 unsigned int n; 2627 unsigned int n;
2172 /* 2628 /*
2173 * InheritPixmap transparency 2629 * InheritPixmap transparency
2174 */ 2630 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2177 { 2632 {
2178 oldp = TermWin.parent[i]; 2633 oldp = parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2180 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2635 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2636
2184 if (TermWin.parent[i] == display->root) 2637 if (parent[i] == display->root)
2185 { 2638 {
2186 if (oldp != None) 2639 if (oldp != None)
2187 pchanged = 1; 2640 pchanged = 1;
2188 2641
2189 break; 2642 break;
2190 } 2643 }
2191 2644
2192 if (oldp != TermWin.parent[i]) 2645 if (oldp != parent[i])
2193 pchanged = 1; 2646 pchanged = 1;
2194 } 2647 }
2195 2648
2196 n = 0; 2649 n = 0;
2197 2650
2198 if (pchanged) 2651 if (pchanged)
2199 {
2200 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2201 { 2653 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2655
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2657 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2207 break; 2659 break;
2208 } 2660 }
2209 } 2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2210 } 2664 {
2211
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2667 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2219 } 2669 }
2220 else 2670 else
2221 { 2671 {
2222#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1);
2226#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2673 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2675 XClearWindow (dpy, parent[n]);
2676 }
2230 2677
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2232 am_transparent = 1; 2679 am_transparent = 1;
2233 } 2680 }
2234 2681
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2236 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 ();
2237 } 2698 }
2238 2699
2239 return pchanged; 2700 return pchanged;
2240} 2701}
2241#endif 2702#endif
… …
2244 2705
2245bool 2706bool
2246rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2247{ 2708{
2248 bool flag = false; 2709 bool flag = false;
2249 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2250 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2251 2712
2252 for (;;) 2713 for (;;)
2253 { 2714 {
2254 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2255 { 2716 {
2256 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2257 ch = next_char (); 2718 ch = next_char ();
2258 }
2259 2719
2260 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2261 break; 2721 break;
2722 }
2262 2723
2263 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)
2264 { 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
2265 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2742 bool refreshnow = false;
2268 int nlines = 0; 2743 int nlines = 0;
2269 unicode_t *str = buf; 2744 wchar_t *str = buf;
2270 2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2746
2273 for (;;) 2747 for (;;)
2274 { 2748 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 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))
2279 break; 2750 break;
2280 2751
2281 *str++ = ch; 2752 *str++ = ch;
2282 2753
2283 if (ch == C0_LF) 2754 if (ch == C0_LF || str >= eol)
2284 { 2755 {
2756 if (ch == C0_LF)
2285 nlines++; 2757 nlines++;
2758
2286 refresh_count++; 2759 refresh_count++;
2287 2760
2288 if (! (Options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2290 { 2763 {
2291 refreshnow = true; 2764 refreshnow = true;
2292 flag = true; 2765 refresh_count = 0;
2293 ch = NOCHAR; 2766 ch = NOCHAR;
2294 break; 2767 break;
2295 } 2768 }
2296 2769
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2771 if (nlines >= nrow - 1)
2299 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2300 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2301 nlines = 0; 2777 nlines = 0;
2302 str = buf; 2778 str = buf;
2779 eol = str + min (ncol, UBUFSIZ);
2303 } 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
2304 } 2793 }
2305 2794
2306 if (str >= buf + UBUFSIZ) 2795 seq_begin = cmdbuf_ptr;
2307 { 2796 ch = next_char ();
2308 ch = NOCHAR;
2309 break;
2310 }
2311 } 2797 }
2312 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2313 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2314 2802
2315 /* 2803 /*
2316 * 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
2317 * 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.
2318 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2808 */
2324 if (refreshnow) 2809 if (refreshnow)
2325 { 2810 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2812 refresh_limit++;
2328 else 2813 else
2814 {
2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2329 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2819 }
2330 } 2820 }
2331 2821
2332 } 2822 }
2333 else 2823 else
2334 { 2824 {
… …
2348 } 2838 }
2349 2839
2350 return flag; 2840 return flag;
2351} 2841}
2352 2842
2353// read the next octet
2354unicode_t
2355rxvt_term::next_octet ()
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? *cmdbuf_ptr++
2359 : NOCHAR;
2360}
2361
2362// read the next character 2843// read the next character
2363unicode_t 2844wchar_t
2364rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2365{ 2846{
2366 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2367 { 2848 {
2368 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2369 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2370 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2371 2852
2372 wchar_t wc; 2853 wchar_t wc;
2373 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);
2374 2855
2375 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2376 { 2857 {
2377 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2378 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2379 break; 2860 break;
2380 } 2861 }
2381 2862
2382 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2383 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
2384 2865
2385 // assume wchar == unicode 2866 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2387 return wc; 2868 return wc & UNICODE_MASK;
2388 } 2869 }
2389 2870
2390 return NOCHAR; 2871 return NOCHAR;
2391} 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;
2392 2884
2393/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2394/* 2886/*
2395 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2396 * to the command. 2888 * to the command.
2397 */ 2889 */
2398unicode_t 2890wchar_t
2399rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2400{ 2892{
2401 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2402 2894
2403 if (c == NOCHAR) 2895 if (c == NOCHAR)
2404 throw out_of_input; 2896 throw out_of_input;
2405 2897
2406 return c; 2898 return c;
2407} 2899}
2408 2900
2409unicode_t 2901uint32_t
2410rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{ 2903{
2412 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2413 2905
2414 if (c == NOCHAR) 2906 if (c == NOCHAR)
2415 throw out_of_input; 2907 throw out_of_input;
2416 2908
2417 return c; 2909 return c;
… …
2517 case C0_ESC: 3009 case C0_ESC:
2518 process_escape_seq (); 3010 process_escape_seq ();
2519 break; 3011 break;
2520 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2524 else 3015 else
2525 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2526 (unsigned int)STRLEN (VT100_ANS));
2527 break; 3017 break;
2528 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2529 scr_bell (); 3019 scr_bell ();
2530 break; 3020 break;
2531 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
2630void 3120void
2631rxvt_term::process_escape_seq () 3121rxvt_term::process_escape_seq ()
2632{ 3122{
2633 unicode_t ch = cmd_getc (); 3123 unicode_t ch = cmd_getc ();
2634 3124
2635 if (PrivateModes & PrivMode_vt52) 3125 if (priv_modes & PrivMode_vt52)
2636 { 3126 {
2637 process_escape_vt52 (ch); 3127 process_escape_vt52 (ch);
2638 return; 3128 return;
2639 } 3129 }
2640 3130
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3146 break;
2657 case '+': 3147 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3149 break;
2660#ifndef NO_FRILLS 3150#if !ENABLE_MINIMAL
2661 case '6': 3151 case '6':
2662 scr_backindex (); 3152 scr_backindex ();
2663 break; 3153 break;
2664#endif 3154#endif
2665 case '7': 3155 case '7':
2666 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
2667 break; 3157 break;
2668 case '8': 3158 case '8':
2669 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
2670 break; 3160 break;
2671#ifndef NO_FRILLS 3161#if !ENABLE_MINIMAL
2672 case '9': 3162 case '9':
2673 scr_forwardindex (); 3163 scr_forwardindex ();
2674 break; 3164 break;
2675#endif 3165#endif
2676 case '=': 3166 case '=':
… …
2686 break; 3176 break;
2687 3177
2688 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
2689 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
2690 { 3180 {
2691 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
2692 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2693 } 3183 }
2694 break; 3184 break;
2695 3185
2696 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
2697 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
2719 process_dcs_seq (); 3209 process_dcs_seq ();
2720 break; 3210 break;
2721 3211
2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2723 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
2724 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2725 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2726 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
2727 3216
2728 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2729 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
2730 process_csi_seq (); 3219 process_csi_seq ();
… …
2839 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
2840 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
2841 if (arg[p] == -1) 3330 if (arg[p] == -1)
2842 arg[p] = ndef; 3331 arg[p] = ndef;
2843 3332
2844#ifdef DEBUG_CMD
2845 fprintf (stderr, "CSI ");
2846 for (p = 0; p < nargs; p++)
2847 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2848 fprintf (stderr, "%c\n", ch);
2849#endif
2850
2851 /* 3333 /*
2852 * private mode handling 3334 * private mode handling
2853 */ 3335 */
2854 if (priv) 3336 if (priv)
2855 { 3337 {
2856 switch (priv) 3338 switch (priv)
2857 { 3339 {
2858 case '>': 3340 case '>':
2859 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 //
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
2861 break; 3352 break;
2862 case '?': 3353 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3356 break;
… …
2970 3461
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3462 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 3463 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 3464 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 3467 break;
2977 3468
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2980 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3471 break;
2982 3472
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
2985 break; 3475 break;
… …
2992 break; 3482 break;
2993 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
2994 scr_report_position (); 3484 scr_report_position ();
2995 break; 3485 break;
2996 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3487 if (option (Opt_insecure))
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3489 break;
3000 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3492 break;
3003 } 3493 }
… …
3039 break; 3529 break;
3040 3530
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3531 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3532 if (arg[0] == 4)
3043 scr_insert_mode (0); 3533 scr_insert_mode (0);
3534 else if (arg[0] == 20)
3535 priv_modes &= ~PrivMode_LFNL;
3044 break; 3536 break;
3045 3537
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3538 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3539 if (arg[0] == 4)
3048 scr_insert_mode (1); 3540 scr_insert_mode (1);
3541 else if (arg[0] == 20)
3542 priv_modes |= PrivMode_LFNL;
3049 break; 3543 break;
3050 3544
3051 /* 3545 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3546 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3547 */
… …
3065 break; 3559 break;
3066 case CSI_75: 3560 case CSI_75:
3067 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3068 break; 3562 break;
3069 3563
3070#ifndef NO_FRILLS 3564#if !ENABLE_MINIMAL
3071 case CSI_74: 3565 case CSI_74:
3072 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3073 break; 3567 break;
3074#endif 3568#endif
3075 3569
… …
3082 break; 3576 break;
3083 } 3577 }
3084} 3578}
3085/*}}} */ 3579/*}}} */
3086 3580
3087#ifndef NO_FRILLS 3581#if !ENABLE_MINIMAL
3088/* ARGSUSED */ 3582/* ARGSUSED */
3089void 3583void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3585{
3092 int x, y; 3586 int x, y;
3093 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3094 Window wdummy; 3588 Window wdummy;
3589
3590 dLocal (Display *, dpy);
3095 3591
3096 if (nargs == 0) 3592 if (nargs == 0)
3097 return; 3593 return;
3098 3594
3099 switch (args[0]) 3595 switch (args[0])
3100 { 3596 {
3101 /* 3597 /*
3102 * commands 3598 * commands
3103 */ 3599 */
3104 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3601 XMapWindow (dpy, parent[0]);
3106 break; 3602 break;
3107 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3604 XIconifyWindow (dpy, parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3605 break;
3111 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3113 break; 3608 break;
3114 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3611 break;
3117 case 5: /* raise window */ 3612 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3119 break; 3614 break;
3120 case 6: /* lower window */ 3615 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3122 break; 3617 break;
3123 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3124 scr_touch (true); 3619 scr_touch (true);
3125 break; 3620 break;
3126 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3622 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3623 (unsigned int) (args[1] * fheight));
3129 break; 3624 break;
3130 3625
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3626 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3627 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3629 set_widthheight ((unsigned int)width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
3136 break; 3631 break;
3137
3138 3632
3139 /* 3633 /*
3140 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3141 */ 3635 */
3142 case 11: /* report window state */ 3636 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3639 break;
3146 case 13: /* report window position */ 3640 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3646 break;
3153 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3650 break;
3157 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3653 break;
3160 case 19: /* report window size (chars) */ 3654 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3656 break;
3163 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3658 {
3166 char *s; 3659 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3168 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);
3169 } 3663 }
3170 break; 3664 break;
3171 case 21: /* report window title */ 3665 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3666 {
3174 char *s; 3667 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3176 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);
3177 } 3671 }
3178 break; 3672 break;
3179 } 3673 }
3180} 3674}
3181#endif 3675#endif
3182 3676
3183/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3184/* 3678/*
3185 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3186 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3187 */ 3681 */
3188unsigned char * 3682char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3684{
3191 unicode_t prev = 0, ch; 3685 unicode_t ch;
3686 bool seen_esc = false;
3192 unsigned int n = 0; 3687 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3688 wchar_t string[STRING_MAX];
3195 3689
3196 while ((ch = cmd_getc ()) != NOCHAR) 3690 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3691 {
3198 if (prev == C0_ESC) 3692 if (seen_esc)
3199 { 3693 {
3200 if (ch == 0x5c) /* 7bit ST */ 3694 if (ch == 0x5c) /* 7bit ST */
3201 break; 3695 break;
3202 else 3696 else
3203 return NULL; 3697 return NULL;
3204 } 3698 }
3699 else if (ch == C0_ESC)
3700 {
3701 seen_esc = true;
3702 continue;
3703 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3207 else if (ch < 0x20) 3708 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3209 3710
3210 if (n >= sizeof (string) - 1) 3711 seen_esc = false;
3712
3713 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3714 // stop at some sane length
3212 return NULL; 3715 return NULL;
3213 3716
3214 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else
3220 string[n++] = prev = ch; 3717 string[n++] = ch;
3221 } 3718 }
3222 3719
3223 string[n++] = '\0'; 3720 string[n++] = '\0';
3224 3721
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3723
3230 return s; 3724 return rxvt_wcstombs (string);
3231} 3725}
3232 3726
3233/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3234/* 3728/*
3235 * 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)'
3236 */ 3730 */
3237void 3731void
3238rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3239{ 3733{
3240 unsigned char *s; 3734 char *s;
3241 unicode_t eh; 3735 unicode_t eh;
3242 3736
3243 /* 3737 /*
3244 * Not handled yet 3738 * Not handled yet
3245 */ 3739 */
… …
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3266 3760
3267 if (ch == ';') 3761 if (ch == ';')
3268 { 3762 {
3269 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3270 3764
3271 if (s) 3765 if (s)
3272 { 3766 {
3273 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3274 free (s); 3768 free (s);
3275 } 3769 }
3276 } 3770 }
3277} 3771}
3278 3772
3279void 3773void
3280rxvt_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)
3281{ 3775{
3282 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3283 { 3777 {
3284 if (Options & Opt_insecure) 3778 rgba c;
3285 { 3779 pix_colors_focused[color].get (c);
3286 unsigned short r, g, b; 3780
3287 PixColorsFocused[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
3288 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);
3289 }
3290 } 3787 }
3291 else 3788 else
3292 set_window_color (color, str); 3789 set_window_color (color, str);
3293} 3790}
3294 3791
3295/* 3792/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3794 */
3320void 3795void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3322{ 3797{
3323 int changed = 0;
3324 int color; 3798 int color;
3325 char *buf, *name; 3799 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3801 int saveop = op;
3802
3803 dLocal (Display *, dpy);
3327 3804
3328 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
3329 switch (op) 3810 switch (op)
3330 { 3811 {
3331 case XTerm_name: 3812 case XTerm_name:
3332 set_title (str); 3813 set_title (str);
3333 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3338 set_title (str); 3819 set_title (str);
3339 break; 3820 break;
3340 case XTerm_property: 3821 case XTerm_property:
3341 if (str[0] == '?') 3822 if (str[0] == '?')
3342 { 3823 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3824 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3825 Atom actual_type;
3345 int actual_format; 3826 int actual_format;
3346 unsigned long nitems; 3827 unsigned long nitems;
3347 unsigned long bytes_after; 3828 unsigned long bytes_after;
3348 unsigned char *value = 0; 3829 unsigned char *value = 0;
3349 const char *str = ""; 3830 const char *str = "";
3350 3831
3351 if (prop 3832 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3837 && actual_type != None
3357 && actual_format == 8) 3838 && actual_format == 8)
3358 str = (const char *)(value); 3839 str = (const char *)(value);
3359 3840
3360 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3361 3842
3362 XFree (value); 3843 XFree (value);
3363 } 3844 }
3364 else 3845 else
3365 { 3846 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3847 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3848
3368 if (eq) 3849 if (eq)
3369 { 3850 {
3370 *eq = 0; 3851 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3852 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3853 }
3376 else 3854 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3855 XDeleteProperty (dpy, parent[0],
3378 display->atom (str)); 3856 display->atom (str));
3379 } 3857 }
3380 break; 3858 break;
3381 3859
3382 case XTerm_Color: 3860 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3861 for (buf = (char *)str; buf && *buf;)
3384 { 3862 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3864 break;
3387 3865
3388 *name++ = '\0'; 3866 *name++ = '\0';
3389 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3390 3868
3391 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3392 break; 3870 break;
3393 3871
3394 if ((buf = STRCHR (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3873 *buf++ = '\0';
3396 3874
3397 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3398 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 }
3406 else
3407 set_window_color (color + minCOLOR, name);
3408 } 3876 }
3409 break; 3877 break;
3410 case XTerm_Color00: 3878 case XTerm_Color00:
3411 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3412 break; 3880 break;
3413 case XTerm_Color01: 3881 case XTerm_Color01:
3414 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3415 break; 3883 break;
3416#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3417 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3418 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3419 break; 3887 break;
3420#endif 3888#endif
3421 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3422 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3423 break; 3891 break;
3424 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3425 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3426 break; 3894 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break;
3431 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break;
3434 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3436 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;
3437#endif 3910#endif
3911#if TRANSPARENT && TINTING
3912 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp);
3438 3914
3915 check_our_parents ();
3916
3917 if (am_transparent)
3918 want_full_refresh = want_refresh = 1;
3919
3920 break;
3921#endif
3922
3439 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3440 if (*str != ';') 3925 if (*str != ';')
3441 { 3926 {
3442#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3443 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3445#endif
3446 scr_touch (true); 3930 scr_touch (true);
3931#endif
3447 } 3932 }
3933
3934 int changed = 0;
3935
3448 while ((str = STRCHR (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3449 { 3937 {
3450 str++; 3938 str++;
3451#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3453#endif 3941#endif
3454
3455 } 3942 }
3943
3456 if (changed) 3944 if (changed)
3457 { 3945 {
3458#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3947 resize_pixmap ();
3460#endif
3461 scr_touch (true); 3948 scr_touch (true);
3949#endif
3462 } 3950 }
3951 }
3463 break; 3952 break;
3464 3953
3465 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3466 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3467 break; 3956 break;
3468 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3469 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3470 break; 3959 break;
3471 3960
3472 case XTerm_logfile: 3961 case XTerm_logfile:
3473 // TODO, when secure mode? 3962 // TODO, when secure mode?
3474 break; 3963 break;
3475 3964
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR
3517 case XTerm_Menu:
3518 if (Options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break;
3521#endif
3522#if 0 3965#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3524 { 3967 {
3525 int fd; 3968 int fd;
3526 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)
3527 { 3970 {
3528 scr_dump (fd); 3971 scr_dump (fd);
3529 close (fd); 3972 close (fd);
3530 } 3973 }
3531 } 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
3532 break; 4038 break;
3533#endif 4039#endif
3534 } 4040 }
3535} 4041}
3536/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3550{ 4056{
3551 int state; 4057 int state;
3552 4058
3553 if (mode == 's') 4059 if (mode == 's')
3554 { 4060 {
3555 SavedModes |= (PrivateModes & bit); 4061 SavedModes |= (priv_modes & bit);
3556 return -1; 4062 return -1;
3557 } 4063 }
3558 else 4064 else
3559 { 4065 {
3560 if (mode == 'r') 4066 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 4068 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4069 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 4070 PrivMode (state, bit);
3565 } 4071 }
3566 4072
3567 return state; 4073 return state;
3568} 4074}
3569 4075
3570/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3571void 4077void
3572rxvt_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)
3573{ 4079{
3574 unsigned int i, j; 4080 unsigned int i, j;
3575 int state; 4081 int state;
3576 4082
3577 static const struct 4083 static const struct
… …
3586 { 3, PrivMode_132 }, 4092 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 4093 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 4099 // 18, 19 printing-related
3593 { menuBar_esc, PrivMode_menuBar }, 4100 { 25, PrivMode_VisibleCursor },
3594#endif
3595#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 4103#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 4104 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 4105 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 4106 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 4107 // 45 margin bell NYI
3605 // 46 start logging 4108 // 46 start logging
… …
3645 } 4148 }
3646 4149
3647 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4151 switch (arg[i])
3649 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
3650 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4161 case 1049:
3651 if (Options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 4163 if (mode == 0)
3653 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
3654 else if (mode == 1) 4165 else if (mode == 1)
3655 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
3656 break; 4167 break;
… …
3667 * within VT52 mode 4178 * within VT52 mode
3668 */ 4179 */
3669 PrivMode (1, PrivMode_vt52); 4180 PrivMode (1, PrivMode_vt52);
3670 break; 4181 break;
3671 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
3674 break; 4185 break;
3675 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
3676 if (state) 4187 set_option (Opt_jumpScroll, !state);
3677 Options &= ~Opt_jumpScroll;
3678 else
3679 Options |= Opt_jumpScroll;
3680 break; 4188 break;
3681 case 5: /* reverse video */ 4189 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
3683 break; 4191 break;
3684 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4196 scr_autowrap (state);
3689 break; 4197 break;
3690 /* 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 */
3691 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4202 break;
3695#ifdef menuBar_esc
3696 case menuBar_esc:
3697#ifdef MENUBAR
3698 map_menuBar (state);
3699#endif
3700 break;
3701#endif
3702#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
3703 case scrollBar_esc: 4204 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
3705 { 4206 {
3706 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
3718 break; 4219 break;
3719 /* case 66: - application key pad */ 4220 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4221 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4222 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4223 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4224 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4225 break;
3725#if 0 4226#if 0
3726 case 1001: 4227 case 1001:
3727 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
3728#endif 4229#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state)
3731 Options &= ~Opt_scrollTtyOutput;
3732 else
3733 Options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
3734 break; 4232 break;
3735 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
3736 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
3738 else
3739 Options &= ~Opt_scrollTtyKeypress;
3740 break; 4235 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4239 scr_erase_screen (2);
3745 scr_change_screen (state); 4240 scr_change_screen (state);
3746 break; 4241 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4243 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4246 scr_erase_screen (2);
3752 break; 4247 break;
3753 default: 4248 default:
3754 break; 4249 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4275 rendset = 0, rendstyle = ~RS_None;
3781 break; 4276 break;
3782 case 1: 4277 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4278 rendset = 1, rendstyle = RS_Bold;
3784 break; 4279 break;
3785 //case 2: // faint or second colour 4280 //case 2: // low intensity
4281 case 3:
4282 rendset = 1, rendstyle = RS_Italic;
4283 break;
3786 case 4: 4284 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4285 rendset = 1, rendstyle = RS_Uline;
3788 break; 4286 break;
3789 case 5: // slowly blinking 4287 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4288 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4300 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4301 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4302 //...
3805 //case 19: // ninth alt font 4303 //case 19: // ninth alt font
3806 //case 20: // gothic 4304 //case 20: // gothic
3807 case 21: // disable bold, faint 4305 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4306 rendset = 0, rendstyle = RS_Bold;
3809 break; 4307 break;
3810 case 22: 4308 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4309 rendset = 0, rendstyle = RS_Bold;
3812 break; 4310 break;
3813 //case 23: disable italic 4311 case 23: // disable italic
4312 rendset = 0, rendstyle = RS_Italic;
4313 break;
3814 case 24: 4314 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4315 rendset = 0, rendstyle = RS_Uline;
3816 break; 4316 break;
3817 case 25: 4317 case 25:
4318 rendset = 0, rendstyle = RS_Blink;
4319 break;
4320 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4321 rendset = 0, rendstyle = RS_Blink;
3819 break; 4322 break;
3820 case 27: 4323 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4324 rendset = 0, rendstyle = RS_RVid;
3822 break; 4325 break;
… …
3840 case 35: 4343 case 35:
3841 case 36: 4344 case 36:
3842 case 37: 4345 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4346 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4347 break;
3845#ifdef TTY_256COLOR 4348 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4349 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4350 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4351 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4352 i += 2;
3851 } 4353 }
3852 break; 4354 break;
3853#endif
3854 case 39: /* default fg */ 4355 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4356 scr_color (Color_fg, Color_fg);
3856 break; 4357 break;
3857 4358
3858 case 40: 4359 case 40:
… …
3863 case 45: 4364 case 45:
3864 case 46: 4365 case 46:
3865 case 47: 4366 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4368 break;
3868#ifdef TTY_256COLOR 4369 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4370 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4371 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4372 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4373 i += 2;
3874 } 4374 }
3875 break; 4375 break;
3876#endif
3877 case 49: /* default bg */ 4376 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
3879 break; 4378 break;
3880 4379
3881#ifndef NO_BRIGHTCOLOR 4380 //case 50: // not variable spacing
4381
4382#if !ENABLE_MINIMAL
3882 case 90: 4383 case 90:
3883 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
3884 case 92: 4385 case 92:
3885 case 93: 4386 case 93:
3886 case 94: 4387 case 94:
3887 case 95: 4388 case 95:
3888 case 96: 4389 case 96:
3889 case 97: 4390 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4391 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4392 break;
3893 case 100: 4393 case 100:
3894 case 101: /* set bright bg color */ 4394 case 101: /* set bright bg color */
3895 case 102: 4395 case 102:
3896 case 103: 4396 case 103:
3897 case 104: 4397 case 104:
3898 case 105: 4398 case 105:
3899 case 106: 4399 case 106:
3900 case 107: 4400 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4402 break;
3904#endif 4403#endif
3905
3906 } 4404 }
3907 } 4405 }
3908} 4406}
3909/*}}} */ 4407/*}}} */
3910 4408
… …
3914{ 4412{
3915 unicode_t ch, cmd = cmd_getc (); 4413 unicode_t ch, cmd = cmd_getc ();
3916 4414
3917 if (cmd == 'Q') 4415 if (cmd == 'Q')
3918 { /* query graphics */ 4416 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4417 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4418 return;
3921 } 4419 }
3922 /* swallow other graphics sequences until terminating ':' */ 4420 /* swallow other graphics sequences until terminating ':' */
3923 do 4421 do
3924 ch = cmd_getc (); 4422 ch = cmd_getc ();
… …
3934 */ 4432 */
3935void 4433void
3936rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
3937{ 4435{
3938 va_list arg_ptr; 4436 va_list arg_ptr;
3939 unsigned char buf[256]; 4437 char buf[256];
3940 4438
3941 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4441 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4442 tt_write (buf, strlen (buf));
3945} 4443}
3946 4444
3947/* ---------------------------------------------------------------------- */ 4445/* ---------------------------------------------------------------------- */
3948/* 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,
3949 * or generated by us in response to a query ESC sequence. 4447 * or generated by us in response to a query ESC sequence.
3950 */ 4448 */
4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4450
3951void 4451void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
3953{ 4453{
3954 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;
3955 4456
3956 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;
3957 { 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
3958 if (v_buflen == 0) 4487 if (v_buflen == 0)
3959 { 4488 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4489 free (v_buffer);
3987 v_buffer = 0; 4490 v_buffer = 0;
3988 v_buflen = 0; 4491 v_buflen = 0;
3989 4492
3990 pty_ev.set (EVENT_READ); 4493 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4494 return;
4003 } 4495 }
4496
4497 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4498 }
4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4500 pty_ev.set (EVENT_READ);
4005} 4501}
4006 4502
4007/*----------------------- end-of-file (C source) -----------------------*/ 4503/*----------------------- end-of-file (C source) -----------------------*/
4008 4504

Diff Legend

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