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

Diff Legend

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