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

Diff Legend

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