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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.436 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

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

Diff Legend

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