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

Diff Legend

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