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

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

Diff Legend

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