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.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.400 by ayin, Mon Jan 28 12:54:47 2008 UTC

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

Diff Legend

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