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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.313 by root, Wed Jul 5 22:46:14 2006 UTC

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

Diff Legend

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