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.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.455 by sf-exg, Sun Aug 22 09:36:33 2010 UTC

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

Diff Legend

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