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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.197 by root, Thu Feb 17 15:07:48 2005 UTC

… …
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-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= TermWin.ncol
141 || y < 0 || y >= TermWin.nrow)
142 return;
143
144 for (;;)
145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54;
153 break;
154 }
155
156 x--;
157 }
158
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2;
169 int len;
170
171#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch))
173 {
174 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr);
177 }
178 else
179#endif
180 {
181 ch2 = ch;
182
183 alloc = 0;
184 chr = &ch2;
185 len = 1;
186 }
187
188 int width = strlen (f->name);
189
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193
194 for (int y = 0; y < len; y++)
195 {
196 char buf[9];
197
198 ch = *chr++;
199
200 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '=');
203#if !UNICODE3
204 if (ch >= 0x10000)
205 ch = 0xfffd;
206#endif
207 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r);
209 }
210
211 scr_overlay_set (0, len, f->name);
212
213#if ENABLE_COMBINING
214 if (alloc)
215 delete [] alloc;
216#endif
217}
218#endif
219
220void
221rxvt_term::commit_iso14755 ()
222{
223 wchar_t ch[2];
224
225 ch[0] = iso14755buf & ISO_14755_MASK;
226 ch[1] = 0;
227
228 if (iso14755buf & ISO_14755_51)
229 {
230 char mb[16];
231 int len;
232
233 // allow verbatim 0-bytes and control-bytes to be entered
234 if (ch[0] >= 0x20)
235 len = wcstombs (mb, ch, 16);
236 else
237 {
238 mb[0] = ch[0];
239 len = 1;
240 }
241
242 if (len > 0)
243 tt_write ((unsigned char *)mb, len);
244 else
245 scr_bell ();
246 }
247
248 iso14755buf = 0;
249}
250
251int
252rxvt_term::hex_keyval (XKeyEvent &ev)
253{
254 // check wether this event corresponds to a hex digit
255 // if the modifiers had not been pressed.
256 for (int index = 0; index < 8; index++)
257 {
258 KeySym k = XLookupKeysym (&ev, index);
259
260 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
261 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
262 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
263 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
264 }
265
266 return -1;
267}
268#endif
61 269
62/*{{{ Convert the keypress event into a string */ 270/*{{{ Convert the keypress event into a string */
63void 271void
64rxvt_term::lookup_key (XKeyEvent &ev) 272rxvt_term::lookup_key (XKeyEvent &ev)
65{ 273{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
78 * 286 *
79 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
80 */ 288 */
81 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
84 292
85 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
86 { 294 {
87 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
147 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
148 } 356 }
149 357
150 if (valid_keysym) 358 if (valid_keysym)
151 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
152 if (TermWin.saveLines) 365 if (TermWin.saveLines)
153 { 366 {
154#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 368 if (!ctrl && !meta)
156 {
157#else 369#else
158 if (IS_SCROLL_MOD) 370 if (IS_SCROLL_MOD)
371#endif
159 { 372 {
160#endif
161 int lnsppg; 373 int lnsppg;
162 374
163#ifdef PAGING_CONTEXT_LINES 375#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 377#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 426 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 427 {
216 keysym += (XK_F11 - XK_F1); 428 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 429 shft = 0; /* turn off Shift */
218 } 430 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 431 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 432 {
221 switch (keysym) 433 switch (keysym)
222 { 434 {
223 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
226 return; 438 return;
439#if TODO
227 /* rxvt extras */ 440 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 442 change_font (FONT_UP);
230 return; 443 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 445 change_font (FONT_DN);
233 return; 446 return;
447#endif
234 } 448 }
235 } 449 }
236 } 450 }
237#ifdef PRINTPIPE 451
238 if (keysym == XK_Print) 452#if ENABLE_FRILLS || ISO_14755
239 { 453 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 454 if (shft && ctrl)
241 return;
242 } 455 {
243#endif 456 int hv;
244 457
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 458 if (iso14755buf & ISO_14755_51
246 { 459 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 460 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 461 {
250 unsigned int l; 462 commit_iso14755 ();
251 const unsigned char *kbuf0; 463 iso14755buf = ISO_14755_51;
252 464# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 465 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 466# endif
261 ) 467 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 468 }
266 469 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 470 {
471 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
472 | hv | ISO_14755_51;
473# if ISO_14755
474 iso14755_51 (iso14755buf & ISO_14755_MASK);
475# endif
268 return; 476 return;
269 } 477 }
270 else 478 else
479 {
480# if ENABLE_OVERLAY
481 scr_overlay_off ();
271#endif 482# endif
483 iso14755buf = 0;
484 }
485 }
486 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
487 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
488 if (!(iso14755buf & ISO_14755_STARTED))
489 {
490 iso14755buf |= ISO_14755_STARTED;
491# if ENABLE_OVERLAY
492 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
493 scr_overlay_set (0, 0, "ISO 14755 mode");
494# endif
495 }
496#endif
497
498#ifdef PRINTPIPE
499 if (keysym == XK_Print)
500 {
501 scr_printscreen (ctrl | shft);
502 return;
503 }
504#endif
505
506 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
507 {
272 { 508 {
273 newlen = 1; 509 newlen = 1;
274 switch (keysym) 510 switch (keysym)
275 { 511 {
276#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 513 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 514 if (priv_modes & PrivMode_HaveBackSpace)
279 { 515 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 517 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 518 kbuf[1] = '\0';
283 } 519 }
284 else 520 else
285 STRCPY (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
286 break; 522 break;
287#endif 523#endif
288#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
289 case XK_Delete: 535 case XK_Delete:
290 STRCPY (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
291 break; 537 break;
292#endif 538#endif
293 case XK_Tab: 539 case XK_Tab:
294 if (shft) 540 if (shft)
295 STRCPY (kbuf, "\033[Z"); 541 strcpy (kbuf, "\033[Z");
296 else 542 else
297 { 543 {
298#ifdef CTRL_TAB_MAKES_META 544#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 545 if (ctrl)
300 meta = 1; 546 meta = 1;
… …
306 newlen = 0; 552 newlen = 0;
307 } 553 }
308 break; 554 break;
309 555
310#ifdef XK_KP_Left 556#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 557 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 558 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 559 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 560 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 562 {
317 STRCPY (kbuf, "\033OZ"); 563 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 564 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 565 break;
320 } 566 }
321 else 567 else
322 /* translate to std. cursor key */ 568 /* translate to std. cursor key */
… …
325#endif 571#endif
326 case XK_Up: /* "\033[A" */ 572 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 573 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 574 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 575 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 576 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 577 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 578 /* do Shift first */
333 if (shft) 579 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 580 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 581 else if (ctrl)
336 { 582 {
337 kbuf[1] = 'O'; 583 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 584 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 585 }
340 else if (PrivateModes & PrivMode_aplCUR) 586 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 587 kbuf[1] = 'O';
342 break; 588 break;
343 589
344#ifndef UNSHIFTED_SCROLLKEYS 590#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 591# ifdef XK_KP_Prior
346 case XK_KP_Prior: 592 case XK_KP_Prior:
347 /* allow shift to override */ 593 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 595 {
350 STRCPY (kbuf, "\033Oy"); 596 strcpy (kbuf, "\033Oy");
351 break; 597 break;
352 } 598 }
353 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
354# endif 600# endif
355 case XK_Prior: 601 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 602 strcpy (kbuf, "\033[5~");
357 break; 603 break;
358# ifdef XK_KP_Next 604# ifdef XK_KP_Next
359 case XK_KP_Next: 605 case XK_KP_Next:
360 /* allow shift to override */ 606 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 608 {
363 STRCPY (kbuf, "\033Os"); 609 strcpy (kbuf, "\033Os");
364 break; 610 break;
365 } 611 }
366 /* FALLTHROUGH */ 612 /* FALLTHROUGH */
367# endif 613# endif
368 case XK_Next: 614 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 615 strcpy (kbuf, "\033[6~");
370 break; 616 break;
371#endif 617#endif
372 case XK_KP_Enter: 618 case XK_KP_Enter:
373 /* allow shift to override */ 619 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 621 {
376 STRCPY (kbuf, "\033OM"); 622 strcpy (kbuf, "\033OM");
623 break;
624 }
625
626 /* FALLTHROUGH */
627
628 case XK_Return:
629 if (priv_modes & PrivMode_LFNL)
630 {
631 kbuf[0] = '\015';
632 kbuf[1] = '\012';
633 kbuf[2] = '\0';
377 } 634 }
378 else 635 else
379 { 636 {
380 kbuf[0] = '\r'; 637 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 638 kbuf[1] = '\0';
382 } 639 }
383 break; 640 break;
384 641
385#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
386 case XK_KP_Begin: 643 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
388 break; 645 break;
389 646
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 647#endif
398 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 652 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 653 kbuf[2] += (keysym - XK_KP_F1);
404 break; 654 break;
405 655
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 656 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 657 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 668 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 669 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 670 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 671 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 672 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 673 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 674 {
425 STRCPY (kbuf, "\033Oj"); 675 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 676 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 677 }
428 else 678 else
429 { 679 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 680 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
432 } 682 }
433 break; 683 break;
434 684
435 case XK_Find: 685 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
437 break; 687 break;
688
689#ifdef XK_KP_End
690 case XK_KP_Insert:
691 /* allow shift to override */
692 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
693 {
694 strcpy (kbuf, "\033Op");
695 break;
696 }
697 /* FALLTHROUGH */
698#endif
438 case XK_Insert: 699 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
440 break; 701 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 703 case DXK_Remove:
443 /* FALLTHROUGH */ 704 /* FALLTHROUGH */
444#endif 705#endif
445 case XK_Execute: 706 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 707 strcpy (kbuf, "\033[3~");
447 break; 708 break;
448 case XK_Select: 709 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 710 strcpy (kbuf, "\033[4~");
450 break; 711 break;
451#ifdef XK_KP_End 712#ifdef XK_KP_End
452 case XK_KP_End: 713 case XK_KP_End:
453 /* allow shift to override */ 714 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 715 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 716 {
456 STRCPY (kbuf, "\033Oq"); 717 strcpy (kbuf, "\033Oq");
457 break; 718 break;
458 } 719 }
459 /* FALLTHROUGH */ 720 /* FALLTHROUGH */
460#endif 721#endif
461 case XK_End: 722 case XK_End:
462 STRCPY (kbuf, KS_END); 723 strcpy (kbuf, KS_END);
463 break; 724 break;
464#ifdef XK_KP_Home 725#ifdef XK_KP_Home
465 case XK_KP_Home: 726 case XK_KP_Home:
466 /* allow shift to override */ 727 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 729 {
469 STRCPY (kbuf, "\033Ow"); 730 strcpy (kbuf, "\033Ow");
470 break; 731 break;
471 } 732 }
472 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
473#endif 734#endif
474 case XK_Home: 735 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 736 strcpy (kbuf, KS_HOME);
476 break; 737 break;
477 738
478#define FKEY(n, fkey) \ 739#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 740 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 741
… …
532#undef FKEY 793#undef FKEY
533 default: 794 default:
534 newlen = 0; 795 newlen = 0;
535 break; 796 break;
536 } 797 }
798
537 if (newlen) 799 if (newlen)
538 len = STRLEN (kbuf); 800 len = strlen (kbuf);
539 } 801 }
540 802
541 /* 803 /*
542 * Pass meta for all function keys, if 'meta' option set 804 * Pass meta for all function keys, if 'meta' option set
543 */ 805 */
… …
550 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
551 { 813 {
552 len = 1; 814 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
821 }
555 else 822 else
556 { 823 {
557#ifdef META8_OPTION 824#ifdef META8_OPTION
558 /* set 8-bit on */ 825 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 826 if (meta && (meta_char == 0x80))
… …
571 } 838 }
572 839
573 if (len <= 0) 840 if (len <= 0)
574 return; /* not mapped */ 841 return; /* not mapped */
575 842
576 if (Options & Opt_scrollTtyKeypress) 843 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 844 if (TermWin.view_start)
578 { 845 {
579 TermWin.view_start = 0; 846 TermWin.view_start = 0;
580 want_refresh = 1; 847 want_refresh = 1;
581 } 848 }
… …
617#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
619} 886}
620/*}}} */ 887/*}}} */
621 888
622#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
625unsigned int 892unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 894{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 897 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 899
633 if (n > 0 && s < count) 900 if (n > 0 && s < count)
634 { 901 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 902 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 904 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 905 cmdbuf_endp -= n;
639 s += n; 906 s += n;
640 } 907 }
… …
650 917
651 cmd_parse (); 918 cmd_parse ();
652 919
653 return 0; 920 return 0;
654} 921}
655#endif /* MENUBAR_MAX */ 922#endif
656 923
657void 924void
658rxvt_term::flush () 925rxvt_term::flush ()
659{ 926{
927 flush_ev.stop ();
928
660#ifdef TRANSPARENT 929#ifdef TRANSPARENT
661 if (want_full_refresh) 930 if (want_full_refresh)
662 { 931 {
663 want_full_refresh = 0; 932 want_full_refresh = 0;
664 scr_clear (); 933 scr_clear ();
665 scr_touch (false); 934 scr_touch (false);
666 want_refresh = 1;
667 } 935 }
668#endif 936#endif
669 937
670 if (want_refresh) 938 if (want_refresh)
671 { 939 {
… …
683rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
684{ 952{
685 SET_R (this); 953 SET_R (this);
686 SET_LOCALE (locale); 954 SET_LOCALE (locale);
687 955
956 display->flush ();
957
958 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01);
960}
961
962void
963rxvt_term::flush_cb (time_watcher &w)
964{
965 SET_R (this);
966 SET_LOCALE (locale);
967
968 refresh_limit = 1;
969 refresh_count = 0;
688 flush (); 970 flush ();
689} 971}
690 972
691#ifdef CURSOR_BLINK 973#ifdef CURSOR_BLINK
692void 974void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 992 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 993 }
712} 994}
713#endif 995#endif
714 996
997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
998void
999rxvt_term::cont_scroll_cb (time_watcher &w)
1000{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 }
1008}
1009#endif
1010
1011#ifdef SELECTION_SCROLLING
1012void
1013rxvt_term::sel_scroll_cb (time_watcher &w)
1014{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 }
1022}
1023#endif
1024
1025#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1026void
1027rxvt_term::slip_wheel_cb (time_watcher &w)
1028{
1029 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed))
1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 }
1041}
1042#endif
1043
715bool 1044bool
716rxvt_term::pty_fill () 1045rxvt_term::pty_fill ()
717{ 1046{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1048
… …
725 1054
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
729 1058
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1060
732 if (n > 0) 1061 if (n > 0)
733 { 1062 {
734 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
735 return true; 1064 return true;
… …
744rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1074{
746 SET_R (this); 1075 SET_R (this);
747 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
748 1077
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1080 while (pty_fill ())
754 if (cmd_parse ()) 1081 if (cmd_parse ())
755 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
1086}
1087
1088void
1089rxvt_term::pointer_unblank ()
1090{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1092 recolour_cursor ();
1093
1094#ifdef POINTER_BLANK
1095 hidden_pointer = 0;
1096
1097 if (options & Opt_pointerBlank)
1098 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif
756} 1100}
757 1101
758#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
759void 1103void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
773{ 1105{
774 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
775 return; 1107 return;
776 1108
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
778 XFlush (display->display); 1110 XFlush (display->display);
779 1111
780 hidden_pointer = 1; 1112 hidden_pointer = 1;
781} 1113}
782 1114
… …
799 x = ev.x; 1131 x = ev.x;
800 y = ev.y; 1132 y = ev.y;
801 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
802 1134
803 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1136 button_number = 3;
806 }
807 else 1137 else
808 { 1138 {
809 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1141 if (button_number >= 3)
812 button_number += (64 - 3); 1142 button_number += (64 - 3);
813 } 1143 }
814 1144
815 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
816 { 1146 {
817 /* 1147 /*
818 * do not report ButtonRelease 1148 * do not report ButtonRelease
819 * no state info allowed 1149 * no state info allowed
820 */ 1150 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1169#endif
840
841 } 1170 }
842 1171
843#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1174 if (key_state & 16)
846 fputc ('C', stderr); 1175 fputc ('C', stderr);
847 if (key_state & 4) 1176 if (key_state & 4)
848 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1181 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1183 button_number,
855 x + 1, 1184 x + 1,
856 y + 1); 1185 y + 1);
857#else 1186#endif
1187
858 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
860 (32 + x + 1), 1190 (32 + x + 1),
861 (32 + y + 1)); 1191 (32 + y + 1));
862#endif
863} 1192}
864 1193
865#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
866void 1195void
867rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
874 1203
875/*{{{ process an X event */ 1204/*{{{ process an X event */
876void 1205void
877rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
878{ 1207{
1208 dDisp;
1209
879 SET_R (this); 1210 SET_R (this);
880 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
881 1212
882#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1215 {
885 if (hidden_cursor) 1216 if (hidden_cursor)
886 { 1217 {
887 hidden_cursor = 0; 1218 hidden_cursor = 0;
888 want_refresh = 1; 1219 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1223 }
893#endif 1224#endif
894 1225
895#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1228 {
898 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1232 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1236 pointer_blank ();
906 } 1237 }
907#endif 1238#endif
908 1239
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1242 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
965#endif
966 1243
967 switch (ev.type) 1244 switch (ev.type)
968 { 1245 {
969 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
970 lookup_key (ev.xkey); 1250 lookup_key (ev.xkey);
1251
1252 break;
1253
1254 case KeyRelease:
1255 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1257 KeySym ks;
1258
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif
1261
1262#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support
1264 if (iso14755buf)
1265 if (iso14755buf & ISO_14755_52)
1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1271 // iso14755 part 5.2 handling: release time
1272 // first: controls
1273 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f)))
1276 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1278 commit_iso14755 ();
1279 return; // case-break;
1280 }
1281
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks)
1284 {
1285 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 ();
1287 return; // case-break;
1288 }
1289
1290 scr_bell ();
1291# endif
1292 iso14755buf = 0;
971 break; 1293 break;
1294 }
1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1300 if (iso14755buf & ISO_14755_51)
1301 commit_iso14755 ();
1302#if ISO_14755
1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1313 }
1314#endif
972 1315
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
978 else 1321#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1322 break;
987 } 1323 }
988#endif
989 1324
990 case ButtonPress: 1325 case ButtonPress:
991 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
992 break; 1327 break;
993 1328
… …
1010 Atom ActualType; 1345 Atom ActualType;
1011 int ActualFormat; 1346 int ActualFormat;
1012 unsigned char *data; 1347 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1014 1349
1015 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1352 0L, 1000000L,
1018 False, AnyPropertyType, 1353 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1021 &data); 1356 &data);
1022 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1358 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1361 }
1030#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1031 break; 1363 break;
1032 1364
1033 case MappingNotify: 1365 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1366 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1367 break;
1036 1368
1037 /* 1369 /*
1038 * XXX: this is not the _current_ arrangement 1370 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1371 * Here's my conclusion:
… …
1064 { 1396 {
1065 TermWin.focus = 1; 1397 TermWin.focus = 1;
1066 want_refresh = 1; 1398 want_refresh = 1;
1067#ifdef USE_XIM 1399#ifdef USE_XIM
1068 if (Input_Context != NULL) 1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1069 XSetICFocus (Input_Context); 1403 XSetICFocus (Input_Context);
1404 }
1070#endif 1405#endif
1071#ifdef CURSOR_BLINK 1406#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink) 1407 if (options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1074#endif 1416#endif
1075 1417
1076 } 1418 }
1077 break; 1419 break;
1078 1420
1079 case FocusOut: 1421 case FocusOut:
1080 if (TermWin.focus) 1422 if (TermWin.focus)
1081 { 1423 {
1082 TermWin.focus = 0; 1424 TermWin.focus = 0;
1083 want_refresh = 1; 1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1084#ifdef USE_XIM 1433#ifdef USE_XIM
1085 if (Input_Context != NULL) 1434 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context); 1435 XUnsetICFocus (Input_Context);
1087#endif 1436#endif
1088#ifdef CURSOR_BLINK 1437#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink) 1438 if (options & Opt_cursorBlink)
1090 cursor_blink_ev.stop (); 1439 cursor_blink_ev.stop ();
1091 hidden_cursor = 0; 1440 hidden_cursor = 0;
1092#endif 1441#endif
1093 1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1094 } 1449 }
1095 break; 1450 break;
1096 1451
1097 case ConfigureNotify: 1452 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1453 if (ev.xconfigure.window == TermWin.parent[0])
… …
1103 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1462 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1464
1110 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1111 { 1466 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1467 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1114 } 1469 }
1115#ifdef DEBUG_SIZE 1470
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1472 if (options & Opt_transparent)
1123 {
1124 check_our_parents (); 1473 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif 1474#endif
1129 } 1475 }
1476 break;
1477
1478 case PropertyNotify:
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1130 break; 1483 break;
1131 1484
1132 case SelectionClear: 1485 case SelectionClear:
1133 selection_clear (); 1486 selection_clear ();
1134 break; 1487 break;
1135 1488
1136 case SelectionNotify: 1489 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1492 break;
1141 1493
1142 case SelectionRequest: 1494 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1144 break; 1496 break;
… …
1165 1517
1166 case GraphicsExpose: 1518 case GraphicsExpose:
1167 case Expose: 1519 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1169 { 1521 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1174 // I don't understand this, so I changed it :) 1526
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1532
1178 // ev.xexpose.width, TermWin.height, False); 1533 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1534 }
1182 else 1535 else
1183 { 1536 {
1184 XEvent unused_event; 1537 XEvent unused_event;
1185 1538
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 ; 1540 ;
1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 ; 1542 ;
1190 1543
1191 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1192 { 1545 {
1193 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1195 } 1548 }
1196#ifdef MENUBAR 1549#ifdef MENUBAR
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1198 menubar_expose (); 1551 menubar_expose ();
1199#endif 1552#endif
1553
1554#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1556 XClearWindow (disp, ev.xany.window);
1557#endif
1200 } 1558 }
1201 break; 1559 break;
1202 1560
1203 case MotionNotify: 1561 case MotionNotify:
1204#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
… …
1210 { 1568 {
1211 menubar_control (ev.xbutton); 1569 menubar_control (ev.xbutton);
1212 break; 1570 break;
1213 } 1571 }
1214#endif 1572#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1216 break; 1574 break;
1217 1575
1218 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1219 { 1577 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1579 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1223 ; 1581 ;
1224 1582
1225 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1226 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1587 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1591 {
1234#endif 1592#endif
1593#if ISO_14755
1594 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1598 break;
1599 }
1600#endif
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1237#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1240 { 1607 {
1241 int dist; 1608 int dist;
1242 1609
1243 pending_scroll_selection=1;
1244
1245 /* don't clobber the current delay if we are 1610 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1611 * already in the middle of scrolling.
1247 */ 1612 */
1248 if (scroll_selection_delay<=0) 1613 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1615
1251 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1253 */ 1618 */
1254 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1622
1259 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1261 { 1625 {
1262 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1264 } 1628 }
1265 else 1629 else
1266 { 1630 {
1267 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y -
1269 (TermWin.int_bwidth + TermWin.height); 1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1270 } 1633 }
1634
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1273 MIN_IT (scroll_selection_lines, 1638 MIN_IT (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1275 } 1640 }
1276 else 1641 else
1277 { 1642 {
1278 /* we are within the text window, so we 1643 /* we are within the text window, so we
1279 * shouldn't be scrolling 1644 * shouldn't be scrolling
1280 */ 1645 */
1281 pending_scroll_selection = 0; 1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop();
1282 } 1648 }
1283#endif 1649#endif
1284#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1285
1286 } 1651 }
1287#endif 1652#endif
1288
1289 } 1653 }
1290 } 1654 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1656 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1294 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1295 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1296 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1665 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1667 scrollbar_size ());
1302 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1303 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1305 } 1671 }
1306 break; 1672 break;
1307 } 1673 }
1308} 1674}
1309 1675
1676#if TRANSPARENT
1310void 1677void
1311rxvt_term::rootwin_cb (XEvent &ev) 1678rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1679{
1313 SET_R (this); 1680 SET_R (this);
1314 SET_LOCALE (locale); 1681 SET_LOCALE (locale);
1315 1682
1316 switch (ev.type) 1683 switch (ev.type)
1317 { 1684 {
1318 case PropertyNotify: 1685 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1686 /*
1329 * if user used some Esetroot compatible prog to set the root bg, 1687 * if user used some Esetroot compatible prog to set the root bg,
1330 * use the property to determine the pixmap. We use it later on. 1688 * use the property to determine the pixmap. We use it later on.
1331 */ 1689 */
1332 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334
1335 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1690 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1336 return; 1692 return;
1337 }
1338 1693
1339 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1340 case ReparentNotify: 1695 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1342 want_full_refresh = 1; 1697 want_refresh = want_full_refresh = 1;
1343 break; 1698 break;
1344#endif
1345 } 1699 }
1346} 1700}
1701#endif
1347 1702
1348void 1703void
1349rxvt_term::button_press (XButtonEvent &ev) 1704rxvt_term::button_press (XButtonEvent &ev)
1350{ 1705{
1351 int reportmode = 0, clickintime; 1706 int reportmode = 0, clickintime;
1352 1707
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1354 if (!bypass_keystate) 1709 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1710 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711
1356 /* 1712 /*
1357 * VT window processing of button press 1713 * VT window processing of button press
1358 */ 1714 */
1359 if (ev.window == TermWin.vt) 1715 if (ev.window == TermWin.vt)
1360 { 1716 {
1717#if ISO_14755
1718 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 {
1721 iso14755_54 (ev.x, ev.y);
1722 return;
1723 }
1724#endif
1725
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1362 if (reportmode) 1728 if (reportmode)
1363 { 1729 {
1364 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1395 } 1761 }
1396 else 1762 else
1397 { 1763 {
1398 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1400 switch (ev.button) 1767 switch (ev.button)
1401 { 1768 {
1402 case Button1: 1769 case Button1:
1770 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */
1772#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask);
1774#else
1775 selection.rect = false;
1776#endif
1777
1403 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1405 { 1780 {
1406 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
1408 else 1783 else
1409 selection_extend (ev.x, ev.y, 1); 1784 selection_extend (ev.x, ev.y, 1);
… …
1424 case Button3: 1799 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1800 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1801 selection_rotate (ev.x, ev.y);
1427 else 1802 else
1428 selection_extend (ev.x, ev.y, 1); 1803 selection_extend (ev.x, ev.y, 1);
1804
1429 MEvent.button = Button3; 1805 MEvent.button = Button3;
1430 break; 1806 break;
1431 } 1807 }
1432 } 1808 }
1809
1433 MEvent.time = ev.time; 1810 MEvent.time = ev.time;
1434 return; 1811 return;
1435 } 1812 }
1436 1813
1437 /* 1814 /*
… …
1503 upordown = 1; /* down */ 1880 upordown = 1; /* down */
1504 } 1881 }
1505 if (upordown) 1882 if (upordown)
1506 { 1883 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1884#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1885 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 1886#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 1887 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 1888 {
1512 if (upordown < 0) 1889 if (upordown < 0)
1513 scrollBar.setUp (); 1890 scrollBar.setUp ();
… …
1529 break; 1906 break;
1530 case R_SB_ALIGN_BOTTOM: 1907 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 1908 csrO = scrollBar.bot - scrollBar.top;
1532 break; 1909 break;
1533 } 1910 }
1911
1534 if (scrollBar.style == R_SB_XTERM 1912 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 1913 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 1914 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 1915 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 1916
1539 scrollBar.setMotion (); 1917 scrollBar.setMotion ();
1540 break; 1918 break;
1541 1919
1542 case Button1: 1920 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1921 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1567 scr_page ((ev.button == Button1 ? DN : UP), 1945 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 1946 (TermWin.nrow
1569 * scrollbar_position (ev.y) 1947 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 1948 / scrollbar_size ()));
1571 } 1949 }
1950
1572 break; 1951 break;
1573 } 1952 }
1574 } 1953 }
1575 return; 1954 return;
1576 } 1955 }
… …
1588{ 1967{
1589 int reportmode = 0; 1968 int reportmode = 0;
1590 1969
1591 csrO = 0; /* reset csr Offset */ 1970 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 1971 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1972 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 1973
1595 if (scrollbar_isUpDn ()) 1974 if (scrollbar_isUpDn ())
1596 { 1975 {
1597 scrollBar.setIdle (); 1976 scrollBar.setIdle ();
1598 scrollbar_show (0); 1977 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH; 1979 refresh_type &= ~SMOOTH_REFRESH;
1601#endif 1980#endif
1602
1603 } 1981 }
1982
1604#ifdef SELECTION_SCROLLING 1983#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 1984 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop();
1606#endif 1986#endif
1987
1607 if (ev.window == TermWin.vt) 1988 if (ev.window == TermWin.vt)
1608 { 1989 {
1990#if ISO_14755
1991 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return;
1994#endif
1609 if (reportmode) 1995 if (reportmode)
1610 { 1996 {
1611 /* mouse report from vt window */ 1997 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 1998 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 1999 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 2013 MEvent.button = AnyButton;
1628 mouse_report (ev); 2014 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 2015#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 2016 return;
1631 } 2017 }
2018
1632 /* 2019 /*
1633 * dumb hack to compensate for the failure of click-and-drag 2020 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 2021 * when overriding mouse reporting
1635 */ 2022 */
1636 if (PrivateModes & PrivMode_mouse_report 2023 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2024 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2025 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2026 selection_extend (ev.x, ev.y, 0);
1640 2027
1641 switch (ev.button) 2028 switch (ev.button)
… …
1652 case Button5: 2039 case Button5:
1653 { 2040 {
1654 int i; 2041 int i;
1655 page_dirn v; 2042 page_dirn v;
1656 2043
1657 v = (ev.button == Button4) ? UP : DN; 2044 v = ev.button == Button4 ? UP : DN;
2045
1658 if (ev.state & ShiftMask) 2046 if (ev.state & ShiftMask)
1659 i = 1; 2047 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2048 else if (options & Opt_mouseWheelScrollPage)
1661 i = TermWin.nrow - 1; 2049 i = TermWin.nrow - 1;
1662 else 2050 else
1663 i = 5; 2051 i = 5;
2052
1664# ifdef MOUSE_SLIP_WHEELING 2053# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2054 if (ev.state & ControlMask)
1666 { 2055 {
1667 mouse_slip_wheel_speed += (v ? -1 : 1); 2056 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2059
2060 if (slip_wheel_ev.at < NOW)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062
2063 slip_wheel_ev.start ();
1669 } 2064 }
2065 else
2066 {
1670# endif 2067# endif
1671# ifdef JUMP_MOUSE_WHEEL 2068# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1); 2069 scr_page (v, i);
1679 scr_refresh (SMOOTH_REFRESH); 2070 scr_refresh (SMOOTH_REFRESH);
1680 scrollbar_show (1); 2071 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING
1681 } 2081 }
1682# endif 2082#endif
1683
1684 } 2083 }
1685 break; 2084 break;
1686#endif 2085#endif
1687
1688 } 2086 }
1689 } 2087 }
1690#ifdef MENUBAR 2088#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window)) 2089 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev); 2090 menubar_control (ev);
1693#endif 2091#endif
1694} 2092}
1695 2093
1696#ifdef TRANSPARENT 2094#ifdef TRANSPARENT
1697#if TINTING 2095#if TINTING
1698/* shading taken from eterm-0.9.2 */ 2096/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 2097
1701static void 2098typedef uint32_t RUINT32T;
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706 2099
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2100void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2101{
1709 /* No saturation */ 2102 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 2103 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 int r, g, b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i;
1713 2108
1714 b = ((uint16_t *) ptr)[x]; 2109 Visual *visual = display->visual;
1715 r = (b & 0x7c00) * rm; 2110
1716 g = (b & 0x3e0) * gm; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 2112
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2113 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 2114 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 2115 mask_g = visual->green_mask;
1721 } 2116 mask_b = visual->blue_mask;
1722 ptr += bpl; 2117
1723 } 2118 /* boring lookup table pre-initialization */
2119 switch (srcImage->bits_per_pixel) {
2120 case 15:
2121 if ((mask_r != 0x7c00) ||
2122 (mask_g != 0x03e0) ||
2123 (mask_b != 0x001f))
2124 return;
2125 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2126 lookup_r = lookup;
2127 lookup_g = lookup+32;
2128 lookup_b = lookup+32+32;
2129 sh_r = 10;
2130 sh_g = 5;
2131 sh_b = 0;
2132 break;
2133 case 16:
2134 if ((mask_r != 0xf800) ||
2135 (mask_g != 0x07e0) ||
2136 (mask_b != 0x001f))
2137 return;
2138 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2139 lookup_r = lookup;
2140 lookup_g = lookup+32;
2141 lookup_b = lookup+32+64;
2142 sh_r = 11;
2143 sh_g = 5;
2144 sh_b = 0;
2145 break;
2146 case 24:
2147 if ((mask_r != 0xff0000) ||
2148 (mask_g != 0x00ff00) ||
2149 (mask_b != 0x0000ff))
2150 return;
2151 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2152 lookup_r = lookup;
2153 lookup_g = lookup+256;
2154 lookup_b = lookup+256+256;
2155 sh_r = 16;
2156 sh_g = 8;
2157 sh_b = 0;
2158 break;
2159 case 32:
2160 if ((mask_r != 0xff0000) ||
2161 (mask_g != 0x00ff00) ||
2162 (mask_b != 0x0000ff))
2163 return;
2164 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2165 lookup_r = lookup;
2166 lookup_g = lookup+256;
2167 lookup_b = lookup+256+256;
2168 sh_r = 16;
2169 sh_g = 8;
2170 sh_b = 0;
2171 break;
2172 default:
2173 return; /* we do not support this color depth */
2174 }
2175
2176 /* prepare limits for color transformation (each channel is handled separately) */
2177 if (shade < 0) {
2178 shade = -shade;
2179 if (shade < 0) shade = 0;
2180 if (shade > 100) shade = 100;
2181
2182 lower_lim_r = 65535-rm;
2183 lower_lim_g = 65535-gm;
2184 lower_lim_b = 65535-bm;
2185
2186 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2187 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2188 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2189
2190 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1724 } else { 2191 } else {
1725 for (y = h; --y >= 0;) { 2192 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2193 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2194
1729 b = ((uint16_t *) ptr)[x]; 2195 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2196
1731 g = (b & 0x3e0) * gm; 2197 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2198 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2199 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2200 }
1735 b |= (!(b >> 5) - 1); 2201
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2202 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1737 | ((g >> 8) & 0x3e0) 2203 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2204 {
1739 } 2205 unsigned int tmp;
1740 ptr += bpl; 2206
2207 tmp = lower_lim_r;
2208 lower_lim_r = lower_lim_b;
2209 lower_lim_b = tmp;
2210
2211 tmp = upper_lim_r;
2212 upper_lim_r = upper_lim_b;
2213 upper_lim_b = tmp;
2214 }
2215
2216 /* fill our lookup tables */
2217 for (i = 0; i <= mask_r>>sh_r; i++)
2218 {
2219 RUINT32T tmp;
2220 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2221 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2222 lookup_r[i] = (tmp/65535)<<sh_r;
2223 }
2224 for (i = 0; i <= mask_g>>sh_g; i++)
2225 {
2226 RUINT32T tmp;
2227 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2228 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2229 lookup_g[i] = (tmp/65535)<<sh_g;
2230 }
2231 for (i = 0; i <= mask_b>>sh_b; i++)
2232 {
2233 RUINT32T tmp;
2234 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2235 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2236 lookup_b[i] = (tmp/65535)<<sh_b;
2237 }
2238
2239 /* apply table to input image (replacing colors by newly calculated ones) */
2240 switch (srcImage->bits_per_pixel)
2241 {
2242 case 15:
2243 {
2244 unsigned short *p1, *pf, *p, *pl;
2245 p1 = (unsigned short *) srcImage->data;
2246 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2247 while (p1 < pf)
2248 {
2249 p = p1;
2250 pl = p1 + srcImage->width;
2251 for (; p < pl; p++)
1741 } 2252 {
2253 *p = lookup_r[(*p & 0x7c00)>>10] |
2254 lookup_g[(*p & 0x03e0)>> 5] |
2255 lookup_b[(*p & 0x001f)];
2256 }
2257 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1742 } 2258 }
1743} 2259 break;
1744 2260 }
1745/* RGB 16 */ 2261 case 16:
1746static void 2262 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2263 unsigned short *p1, *pf, *p, *pl;
1748{ 2264 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2265 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2266 while (p1 < pf)
1751 2267 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2268 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2269 pl = p1 + srcImage->width;
1754 /* No saturation */ 2270 for (; p < pl; p++)
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 } 2271 {
1769 } else { 2272 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2273 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2274 lookup_b[(*p & 0x001f)];
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 } 2275 }
1785 ptr += bpl; 2276 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2277 }
2278 break;
2279 }
2280 case 24:
2281 {
2282 unsigned char *p1, *pf, *p, *pl;
2283 p1 = (unsigned char *) srcImage->data;
2284 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2285 while (p1 < pf)
2286 {
2287 p = p1;
2288 pl = p1 + srcImage->width * 3;
2289 for (; p < pl; p += 3)
1786 } 2290 {
2291 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2292 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2293 p[2] = lookup_r[(p[2] & 0x0000ff)];
2294 }
2295 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2296 }
1788} 2297 break;
2298 }
2299 case 32:
2300 {
2301 RUINT32T *p1, *pf, *p, *pl;
2302 p1 = (RUINT32T *) srcImage->data;
2303 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1789 2304
1790/* RGB 24 */ 2305 while (p1 < pf)
1791static void 2306 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2307 p = p1;
1793{ 2308 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2309 for (; p < pl; p++)
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 } 2310 {
1822 } else { 2311 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2312 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2313 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2314 (*p & ~0xffffff);
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 } 2315 }
1853 ptr += bpl; 2316 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2317 }
2318 break;
2319 }
1855 } 2320 }
1856}
1857 2321
1858/* RGB 32 */ 2322 free (lookup);
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928} 2323}
1929
1930#endif 2324#endif
1931 2325
1932/* 2326/*
1933 * Check our parents are still who we think they are. 2327 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2328 * Do transparency updates if required
… …
1941 Atom atype; 2335 Atom atype;
1942 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
1943 Window root, oldp, *list; 2337 Window root, oldp, *list;
1944 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
1946 2341
1947 pchanged = 0; 2342 pchanged = 0;
1948 2343
1949 if (!(Options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
1950 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1951 2346
1952 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
1954 2349
1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1956 2351
1957 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
1958 { 2353 {
1959 if (am_transparent) 2354 if (am_transparent)
1960 { 2355 {
1961 pchanged = 1; 2356 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
1964 } 2359 }
1965 2360
1966 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
1967 } 2362 }
1968 2363
1969 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
1970 XSync (display->display, False); 2365 XSync (disp, False);
1971 2366
1972 /* 2367 /*
1973 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
1974 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
1975 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
1976 */ 2371 */
1977 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1980 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
1981 2376
1982 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
1987 2382
1988 if (!i || prop == NULL) 2383 if (!i || prop == NULL
2384#if TINTING
2385 || !rs[Rs_color + Color_tint]
2386#endif
2387 )
1989 have_pixmap = 0; 2388 have_pixmap = 0;
1990 else 2389 else
1991 { 2390 {
1992 have_pixmap = 1; 2391 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2392 rootpixmap = *(Pixmap *)prop;
… …
2004 Window cr; 2403 Window cr;
2005 XImage *image; 2404 XImage *image;
2006 GC gc; 2405 GC gc;
2007 XGCValues gcvalue; 2406 XGCValues gcvalue;
2008 2407
2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2010 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2011 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2012 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2013 nx = ny = 0; 2412 nx = ny = 0;
2014 2413
… …
2026 sy = 0; 2425 sy = 0;
2027 } 2426 }
2028 2427
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
2031 allowedxerror = -1; 2432 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 2434
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2437 allowedxerror = 0;
2037 2438
… …
2040 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2041 { 2442 {
2042 pchanged = 1; 2443 pchanged = 1;
2043 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2044 { 2445 {
2045 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2046 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2047 } 2448 }
2048 } 2449 }
2049 2450
2050 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2051 } 2452 }
2052 else 2453 else
2053 { 2454 {
2054 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2055 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2056 2457
2057#if TINTING 2458#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2059 { 2460 {
2060 unsigned short shade, rm, gm, bm; 2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2061 2463
2062 PixColors[Color_tint].get (display, rm, gm, bm); 2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2063 2465
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 } 2467 }
2075#endif 2468#endif
2076 2469
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2078 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2083 XDestroyImage (image); 2476 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2085 TermWin.pixmap); 2478 XClearWindow (disp, TermWin.parent[0]);
2086 2479
2087 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2481 pchanged = 1;
2089 2482
2090 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2091 } 2484 }
2092 } 2485 }
2093 2486
2094 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2095 { 2490 {
2096 unsigned int n; 2491 unsigned int n;
2097 /* 2492 /*
2098 * InheritPixmap transparency 2493 * InheritPixmap transparency
2099 */ 2494 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2102 { 2496 {
2103 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2105 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2106 XFree (list); 2500 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108 2501
2109 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2110 { 2503 {
2111 if (oldp != None) 2504 if (oldp != None)
2112 pchanged = 1; 2505 pchanged = 1;
… …
2122 2515
2123 if (pchanged) 2516 if (pchanged)
2124 { 2517 {
2125 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2126 { 2519 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2128 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2129 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 { 2522 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2132 break; 2524 break;
2133 } 2525 }
2134 } 2526 }
2135 } 2527 }
2136 2528
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2138 { 2530 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2142 am_transparent = 0; 2533 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2144 } 2535 }
2145 else 2536 else
2146 { 2537 {
2147#if WAIT_FOR_WM 2538#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing 2539 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1); 2541 sleep (1);
2151#endif 2542#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2544 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]);
2547 }
2155 2548
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2157 am_transparent = 1; 2550 am_transparent = 1;
2158 } 2551 }
2159 2552
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2555 }
2556
2557 if (scrollBar.win)
2558 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle ();
2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2162 } 2569 }
2163 2570
2164 return pchanged; 2571 return pchanged;
2165} 2572}
2166#endif 2573#endif
… …
2185 if (ch == NOCHAR) // TODO: improve 2592 if (ch == NOCHAR) // TODO: improve
2186 break; 2593 break;
2187 2594
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 { 2596 {
2597 if (!seen_input)
2598 {
2599 seen_input = 1;
2600 // many badly-written programs (e.g. jed) contain a race condition:
2601 // they first read the screensize and then install a SIGWINCH handler.
2602 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized.
2607 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH);
2609 }
2610
2190 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2613 bool refreshnow = false;
2193 int nlines = 0; 2614 int nlines = 0;
2194 unicode_t *str = buf; 2615 unicode_t *str = buf;
2195 2616
2196 *str++ = ch;
2197
2198 for (;;) 2617 for (;;)
2199 { 2618 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break; 2620 break;
2205 2621
2206 *str++ = ch; 2622 *str++ = ch;
2207 2623
2208 if (ch == C0_LF) 2624 if (ch == C0_LF)
2209 { 2625 {
2210 nlines++; 2626 nlines++;
2211 refresh_count++; 2627 refresh_count++;
2212 2628
2213 if (! (Options & Opt_jumpScroll) 2629 if (!(options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2215 { 2631 {
2216 refreshnow = true; 2632 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR; 2633 ch = NOCHAR;
2219 break; 2634 break;
2220 } 2635 }
2221 2636
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2638 if (nlines >= TermWin.nrow - 1)
2224 { 2639 {
2225 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0; 2641 nlines = 0;
2227 str = buf; 2642 str = buf;
… …
2231 if (str >= buf + UBUFSIZ) 2646 if (str >= buf + UBUFSIZ)
2232 { 2647 {
2233 ch = NOCHAR; 2648 ch = NOCHAR;
2234 break; 2649 break;
2235 } 2650 }
2651
2652 seq_begin = cmdbuf_ptr;
2653 ch = next_char ();
2236 } 2654 }
2237 2655
2238 scr_add_lines (buf, nlines, str - buf); 2656 scr_add_lines (buf, nlines, str - buf);
2239 2657
2240 /* 2658 /*
2241 * If there have been a lot of new lines, then update the screen 2659 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full. 2660 * What the heck I'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which 2661 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2662 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2663 */
2249 if (refreshnow) 2664 if (refreshnow)
2250 { 2665 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2667 refresh_limit++;
2253 else 2668 else
2669 {
2670 flag = true;
2254 scr_refresh (refresh_type); 2671 scr_refresh (refresh_type);
2672 }
2255 } 2673 }
2256 2674
2257 } 2675 }
2258 else 2676 else
2259 { 2677 {
… …
2273 } 2691 }
2274 2692
2275 return flag; 2693 return flag;
2276} 2694}
2277 2695
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2278// read the next character 2705// read the next character
2279unicode_t 2706unicode_t
2280rxvt_term::next_char () 2707rxvt_term::next_char ()
2281{ 2708{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2709 while (cmdbuf_ptr < cmdbuf_endp)
… …
2298 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300 2727
2301 // assume wchar == unicode 2728 // assume wchar == unicode
2302 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2303 return wc; 2730 return wc & UNICODE_MASK;
2304 } 2731 }
2305 2732
2306 return NOCHAR; 2733 return NOCHAR;
2307} 2734}
2308 2735
… …
2313 */ 2740 */
2314unicode_t 2741unicode_t
2315rxvt_term::cmd_getc () 2742rxvt_term::cmd_getc ()
2316{ 2743{
2317 unicode_t c = next_char (); 2744 unicode_t c = next_char ();
2745
2746 if (c == NOCHAR)
2747 throw out_of_input;
2748
2749 return c;
2750}
2751
2752unicode_t
2753rxvt_term::cmd_get8 ()
2754{
2755 unicode_t c = next_octet ();
2318 2756
2319 if (c == NOCHAR) 2757 if (c == NOCHAR)
2320 throw out_of_input; 2758 throw out_of_input;
2321 2759
2322 return c; 2760 return c;
… …
2423 process_escape_seq (); 2861 process_escape_seq ();
2424 break; 2862 break;
2425 case C0_ENQ: /* terminal Status */ 2863 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 2864 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2429 else 2867 else
2430 tt_write ((unsigned char *)VT100_ANS, 2868 tt_write ((unsigned char *)VT100_ANS,
2431 (unsigned int)STRLEN (VT100_ANS)); 2869 (unsigned int)strlen (VT100_ANS));
2432 break; 2870 break;
2433 case C0_BEL: /* bell */ 2871 case C0_BEL: /* bell */
2434 scr_bell (); 2872 scr_bell ();
2435 break; 2873 break;
2436 case C0_BS: /* backspace */ 2874 case C0_BS: /* backspace */
… …
2452 break; 2890 break;
2453 case C0_SI: /* shift in - acs */ 2891 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 2892 scr_charset_choose (0);
2455 break; 2893 break;
2456 2894
2895#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 2896 // 8-bit controls
2458 case 0x90: /* DCS */ 2897 case 0x90: /* DCS */
2459 process_dcs_seq (); 2898 process_dcs_seq ();
2460 break; 2899 break;
2461 case 0x9b: /* CSI */ 2900 case 0x9b: /* CSI */
2462 process_csi_seq (); 2901 process_csi_seq ();
2463 break; 2902 break;
2464 case 0x9d: /* CSI */ 2903 case 0x9d: /* CSI */
2465 process_osc_seq (); 2904 process_osc_seq ();
2466 break; 2905 break;
2906#endif
2467 } 2907 }
2468} 2908}
2469/*}}} */ 2909/*}}} */
2470 2910
2471 2911
… …
2533void 2973void
2534rxvt_term::process_escape_seq () 2974rxvt_term::process_escape_seq ()
2535{ 2975{
2536 unicode_t ch = cmd_getc (); 2976 unicode_t ch = cmd_getc ();
2537 2977
2538 if (PrivateModes & PrivMode_vt52) 2978 if (priv_modes & PrivMode_vt52)
2539 { 2979 {
2540 process_escape_vt52 (ch); 2980 process_escape_vt52 (ch);
2541 return; 2981 return;
2542 } 2982 }
2543 2983
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 2998 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 2999 break;
2560 case '+': 3000 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 3001 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 3002 break;
2563#ifndef NO_FRILLS 3003#if ENABLE_FRILLS
2564 case '6': 3004 case '6':
2565 scr_backindex (); 3005 scr_backindex ();
2566 break; 3006 break;
2567#endif 3007#endif
2568 case '7': 3008 case '7':
2569 scr_cursor (SAVE); 3009 scr_cursor (SAVE);
2570 break; 3010 break;
2571 case '8': 3011 case '8':
2572 scr_cursor (RESTORE); 3012 scr_cursor (RESTORE);
2573 break; 3013 break;
2574#ifndef NO_FRILLS 3014#if ENABLE_FRILLS
2575 case '9': 3015 case '9':
2576 scr_forwardindex (); 3016 scr_forwardindex ();
2577 break; 3017 break;
2578#endif 3018#endif
2579 case '=': 3019 case '=':
… …
2758 { 3198 {
2759 switch (priv) 3199 switch (priv)
2760 { 3200 {
2761 case '>': 3201 case '>':
2762 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
2763 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2764 break; 3204 break;
2765 case '?': 3205 case '?':
2766 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2767 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
2768 break; 3208 break;
… …
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2879 break; 3319 break;
2880 3320
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 3322 tt_write ((const unsigned char *)VT100_ANS,
2883 (unsigned int) (sizeof (VT100_ANS) - 1)); 3323 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3324 break;
2885 3325
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3327 process_sgr_mode (nargs, arg);
2888 break; 3328 break;
… …
2895 break; 3335 break;
2896 case 6: /* CPR requested */ 3336 case 6: /* CPR requested */
2897 scr_report_position (); 3337 scr_report_position ();
2898 break; 3338 break;
2899 case 7: /* unofficial extension */ 3339 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3340 if (options & Opt_insecure)
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3341 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3342 break;
2903 case 8: /* unofficial extension */ 3343 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3345 break;
2906 } 3346 }
… …
2942 break; 3382 break;
2943 3383
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3384 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3385 if (arg[0] == 4)
2946 scr_insert_mode (0); 3386 scr_insert_mode (0);
3387 else if (arg[0] == 20)
3388 priv_modes &= ~PrivMode_LFNL;
2947 break; 3389 break;
2948 3390
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3391 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3392 if (arg[0] == 4)
2951 scr_insert_mode (1); 3393 scr_insert_mode (1);
3394 else if (arg[0] == 20)
3395 priv_modes |= PrivMode_LFNL;
2952 break; 3396 break;
2953 3397
2954 /* 3398 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3399 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3400 */
… …
2968 break; 3412 break;
2969 case CSI_75: 3413 case CSI_75:
2970 scr_cursor (RESTORE); 3414 scr_cursor (RESTORE);
2971 break; 3415 break;
2972 3416
2973#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2974 case CSI_74: 3418 case CSI_74:
2975 process_window_ops (arg, nargs); 3419 process_window_ops (arg, nargs);
2976 break; 3420 break;
2977#endif 3421#endif
2978 3422
… …
2985 break; 3429 break;
2986 } 3430 }
2987} 3431}
2988/*}}} */ 3432/*}}} */
2989 3433
2990#ifndef NO_FRILLS 3434#if ENABLE_FRILLS
2991/* ARGSUSED */ 3435/* ARGSUSED */
2992void 3436void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3438{
2995 int x, y; 3439 int x, y;
2996 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
2997 Window wdummy; 3441 Window wdummy;
3442 dDisp;
2998 3443
2999 if (nargs == 0) 3444 if (nargs == 0)
3000 return; 3445 return;
3001 3446
3002 switch (args[0]) 3447 switch (args[0])
3003 { 3448 {
3004 /* 3449 /*
3005 * commands 3450 * commands
3006 */ 3451 */
3007 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3008 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3009 break; 3454 break;
3010 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3011 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3012 DefaultScreen (display->display));
3013 break; 3457 break;
3014 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3015 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3016 break; 3460 break;
3017 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3018 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3019 break; 3463 break;
3020 case 5: /* raise window */ 3464 case 5: /* raise window */
3021 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3022 break; 3466 break;
3023 case 6: /* lower window */ 3467 case 6: /* lower window */
3024 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3025 break; 3469 break;
3026 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3027 scr_touch (true); 3471 scr_touch (true);
3028 break; 3472 break;
3029 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3041 3485
3042 /* 3486 /*
3043 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3044 */ 3488 */
3045 case 11: /* report window state */ 3489 case 11: /* report window state */
3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3048 break; 3492 break;
3049 case 13: /* report window position */ 3493 case 13: /* report window position */
3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3052 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3053 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3054 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3055 break; 3499 break;
3056 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3059 break; 3503 break;
3060 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3062 break; 3506 break;
3063 case 19: /* report window size (chars) */ 3507 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3065 break; 3509 break;
3066 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3511 {
3069 char *s; 3512 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s);
3072 } 3516 }
3073 break; 3517 break;
3074 case 21: /* report window title */ 3518 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3519 {
3077 char *s; 3520 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s);
3080 } 3524 }
3081 break; 3525 break;
3082 } 3526 }
3083} 3527}
3084#endif 3528#endif
3085 3529
… …
3089 * ends_how is terminator used. returned input must be free()'d 3533 * ends_how is terminator used. returned input must be free()'d
3090 */ 3534 */
3091unsigned char * 3535unsigned char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3537{
3094 int seen_esc = 0; /* seen escape? */ 3538 unicode_t ch;
3539 bool seen_esc = false;
3095 unsigned int n = 0; 3540 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3541 wchar_t string[STRING_MAX];
3099 3542
3100 while ((ch = cmd_getc ())) 3543 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3544 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3545 if (seen_esc)
3546 {
3106 if (ch == 0x5c) /* 7bit ST */ 3547 if (ch == 0x5c) /* 7bit ST */
3107 break; 3548 break;
3108 else 3549 else
3109 return NULL; 3550 return NULL;
3110 3551 }
3111 if (ch == C0_ESC) 3552 else if (ch == C0_ESC)
3112 { 3553 {
3113 seen_esc = 1; 3554 seen_esc = true;
3114 continue; 3555 continue;
3115 } 3556 }
3557 else if (ch == C0_BEL || ch == CHAR_ST)
3558 break;
3116 else if (ch == C0_HT) 3559 else if (ch < 0x20)
3117 ch = ' '; /* translate '\t' to space */
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3119 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3561
3562 seen_esc = false;
3120 3563
3121 if (n >= sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3122 // stop at some sane length 3565 // stop at some sane length
3123 return NULL; 3566 return NULL;
3124 3567
3568 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 ();
3570 else
3125 string[n++] = ch; 3571 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3572 }
3128 3573
3129 string[n++] = '\0'; 3574 string[n++] = '\0';
3130 3575
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3577
3136 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
3137} 3579}
3138 3580
3139/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
3140/* 3582/*
3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3185void 3627void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{ 3629{
3188 if (str[0] == '?' && !str[1]) 3630 if (str[0] == '?' && !str[1])
3189 { 3631 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b; 3632 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b); 3633 pix_colors_focused[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 } 3635 }
3197 else 3636 else
3198 set_window_color (color, str); 3637 set_window_color (color, str);
3199} 3638}
3200 3639
… …
3228{ 3667{
3229 int changed = 0; 3668 int changed = 0;
3230 int color; 3669 int color;
3231 char *buf, *name; 3670 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3672 int saveop = op;
3673 dDisp;
3233 3674
3234 assert (str != NULL); 3675 assert (str != NULL);
3235 switch (op) 3676 switch (op)
3236 { 3677 {
3237 case XTerm_name: 3678 case XTerm_name:
… …
3244 set_title (str); 3685 set_title (str);
3245 break; 3686 break;
3246 case XTerm_property: 3687 case XTerm_property:
3247 if (str[0] == '?') 3688 if (str[0] == '?')
3248 { 3689 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3690 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3691 Atom actual_type;
3251 int actual_format; 3692 int actual_format;
3252 unsigned long nitems; 3693 unsigned long nitems;
3253 unsigned long bytes_after; 3694 unsigned long bytes_after;
3254 unsigned char *value = 0; 3695 unsigned char *value = 0;
3255 const char *str = ""; 3696 const char *str = "";
3256 3697
3257 if (prop 3698 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None 3703 && actual_type != None
3263 && actual_format == 8) 3704 && actual_format == 8)
… …
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3714
3274 if (eq) 3715 if (eq)
3275 { 3716 {
3276 *eq = 0; 3717 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 3718 set_utf8_property (display->atom (str), eq + 1);
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 } 3719 }
3282 else 3720 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3284 display->atom (str)); 3722 display->atom (str));
3285 } 3723 }
3286 break; 3724 break;
3287 3725
3288 case XTerm_Color: 3726 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 3727 for (buf = (char *)str; buf && *buf;)
3290 { 3728 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 3729 if ((name = strchr (buf, ';')) == NULL)
3292 break; 3730 break;
3293 3731
3294 *name++ = '\0'; 3732 *name++ = '\0';
3295 color = atoi (buf); 3733 color = atoi (buf);
3296 3734
3297 if (color < 0 || color >= TOTAL_COLORS) 3735 if (color < 0 || color >= TOTAL_COLORS)
3298 break; 3736 break;
3299 3737
3300 if ((buf = STRCHR (name, ';')) != NULL) 3738 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 3739 *buf++ = '\0';
3302 3740
3303 if (name[0] == '?' && !name[1]) 3741 if (name[0] == '?' && !name[1])
3304 { 3742 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b; 3743 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b); 3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 } 3746 }
3312 else 3747 else
3313 set_window_color (color + minCOLOR, name); 3748 set_window_color (color + minCOLOR, name);
3314 } 3749 }
3315 break; 3750 break;
… …
3332 break; 3767 break;
3333#ifndef NO_BOLD_UNDERLINE_REVERSE 3768#ifndef NO_BOLD_UNDERLINE_REVERSE
3334 case XTerm_Color_BD: 3769 case XTerm_Color_BD:
3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3336 break; 3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3337 case XTerm_Color_UL: 3775 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break; 3777 break;
3340 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break;
3781#endif
3782#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3785 check_our_parents ();
3786 if (am_transparent)
3787 want_full_refresh = want_refresh = 1;
3342 break; 3788 break;
3343#endif 3789#endif
3344 3790
3345 case XTerm_Pixmap: 3791 case XTerm_Pixmap:
3346 if (*str != ';') 3792 if (*str != ';')
… …
3349 scale_pixmap (""); /* reset to default scaling */ 3795 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 3796 set_bgPixmap (str); /* change pixmap */
3351#endif 3797#endif
3352 scr_touch (true); 3798 scr_touch (true);
3353 } 3799 }
3354 while ((str = STRCHR (str, ';')) != NULL) 3800 while ((str = strchr (str, ';')) != NULL)
3355 { 3801 {
3356 str++; 3802 str++;
3357#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3359#endif 3805#endif
3360
3361 } 3806 }
3807
3362 if (changed) 3808 if (changed)
3363 { 3809 {
3364#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3365 resize_pixmap (); 3811 resize_pixmap ();
3366#endif 3812#endif
… …
3378 case XTerm_logfile: 3824 case XTerm_logfile:
3379 // TODO, when secure mode? 3825 // TODO, when secure mode?
3380 break; 3826 break;
3381 3827
3382 case XTerm_font: 3828 case XTerm_font:
3829 op = URxvt_font;
3830 case URxvt_font:
3831#if ENABLE_STYLES
3832 case URxvt_boldFont:
3833 case URxvt_italicFont:
3834 case URxvt_boldItalicFont:
3835#endif
3383 if (query) 3836 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3840 resp);
3841 else
3384 { 3842 {
3385 if (Options & Opt_insecure) 3843 const char *&res = rs[Rs_font + (op - URxvt_font)];
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3844
3387 TermWin.fontset->fontdesc 3845 res = strdup (str);
3388 ? TermWin.fontset->fontdesc 3846 allocated.push_back ((void *)res);
3389 : "", 3847 set_fonts ();
3390 resp);
3391 } 3848 }
3392 else
3393 change_font (str);
3394 break; 3849 break;
3395 3850
3396#ifndef NO_FRILLS 3851#if ENABLE_FRILLS
3397 case XTerm_locale: 3852 case XTerm_locale:
3398 if (query) 3853 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3402 }
3403 else 3855 else
3404 { 3856 {
3405 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3406# ifdef USE_XIM 3859# ifdef USE_XIM
3407 im_cb (); 3860 im_cb ();
3408# endif 3861# endif
3409 } 3862 }
3410 break; 3863 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif 3864#endif
3421 3865
3422#ifdef MENUBAR 3866#ifdef MENUBAR
3423 case XTerm_Menu: 3867 case XTerm_Menu:
3424 if (Options & Opt_insecure) 3868 if (options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break; 3870 break;
3427#endif 3871#endif
3428#if 0 3872#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 3873 case XTerm_dumpscreen: /* no error notices */
… …
3456{ 3900{
3457 int state; 3901 int state;
3458 3902
3459 if (mode == 's') 3903 if (mode == 's')
3460 { 3904 {
3461 SavedModes |= (PrivateModes & bit); 3905 SavedModes |= (priv_modes & bit);
3462 return -1; 3906 return -1;
3463 } 3907 }
3464 else 3908 else
3465 { 3909 {
3466 if (mode == 'r') 3910 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3911 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 3912 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3913 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 3914 PrivMode (state, bit);
3471 } 3915 }
3472 3916
3473 return state; 3917 return state;
3474} 3918}
… …
3492 { 3, PrivMode_132 }, 3936 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 3937 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 3938 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 3939 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 3940 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 3942 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 3943#ifdef menuBar_esc
3499 { menuBar_esc, PrivMode_menuBar }, 3944 { menuBar_esc, PrivMode_menuBar },
3500#endif 3945#endif
3946 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor },
3501#ifdef scrollBar_esc 3948#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 3949 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 3950#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 3951 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 3952 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 3953 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 3954 // 45 margin bell NYI
3511 // 46 start logging 3955 // 46 start logging
… …
3552 3996
3553 /* extra handling for values with state unkept */ 3997 /* extra handling for values with state unkept */
3554 switch (arg[i]) 3998 switch (arg[i])
3555 { 3999 {
3556 case 1048: /* alternative cursor save */ 4000 case 1048: /* alternative cursor save */
4001 case 1049:
3557 if (Options & Opt_secondaryScreen) 4002 if (options & Opt_secondaryScreen)
3558 if (mode == 0) 4003 if (mode == 0)
3559 scr_cursor (RESTORE); 4004 scr_cursor (RESTORE);
3560 else if (mode == 1) 4005 else if (mode == 1)
3561 scr_cursor (SAVE); 4006 scr_cursor (SAVE);
3562 break; 4007 break;
… …
3573 * within VT52 mode 4018 * within VT52 mode
3574 */ 4019 */
3575 PrivMode (1, PrivMode_vt52); 4020 PrivMode (1, PrivMode_vt52);
3576 break; 4021 break;
3577 case 3: /* 80/132 */ 4022 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 4023 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3580 break; 4025 break;
3581 case 4: /* smooth scrolling */ 4026 case 4: /* smooth scrolling */
3582 if (state) 4027 if (state)
3583 Options &= ~Opt_jumpScroll; 4028 options &= ~Opt_jumpScroll;
3584 else 4029 else
3585 Options |= Opt_jumpScroll; 4030 options |= Opt_jumpScroll;
3586 break; 4031 break;
3587 case 5: /* reverse video */ 4032 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 4033 scr_rvideo_mode (state);
3589 break; 4034 break;
3590 case 6: /* relative/absolute origins */ 4035 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 4039 scr_autowrap (state);
3595 break; 4040 break;
3596 /* case 8: - auto repeat, can't do on a per window basis */ 4041 /* case 8: - auto repeat, can't do on a per window basis */
3597 case 9: /* X10 mouse reporting */ 4042 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 4043 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 4044 priv_modes &= ~PrivMode_MouseX11;
3600 break; 4045 break;
3601#ifdef menuBar_esc 4046#ifdef menuBar_esc
3602 case menuBar_esc: 4047 case menuBar_esc:
3603#ifdef MENUBAR 4048#ifdef MENUBAR
3604 map_menuBar (state); 4049 map_menuBar (state);
… …
3624 break; 4069 break;
3625 /* case 66: - application key pad */ 4070 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 4071 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 4072 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 4073 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 4074 priv_modes &= ~PrivMode_MouseX10;
3630 break; 4075 break;
3631#if 0 4076#if 0
3632 case 1001: 4077 case 1001:
3633 break; /* X11 mouse highlighting */ 4078 break; /* X11 mouse highlighting */
3634#endif 4079#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 4080 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state) 4081 if (state)
3637 Options &= ~Opt_scrollTtyOutput; 4082 options &= ~Opt_scrollTtyOutput;
3638 else 4083 else
3639 Options |= Opt_scrollTtyOutput; 4084 options |= Opt_scrollTtyOutput;
3640 break; 4085 break;
3641 case 1011: /* scroll to bottom on key press */ 4086 case 1011: /* scroll to bottom on key press */
3642 if (state) 4087 if (state)
3643 Options |= Opt_scrollTtyKeypress; 4088 options |= Opt_scrollTtyKeypress;
3644 else 4089 else
3645 Options &= ~Opt_scrollTtyKeypress; 4090 options &= ~Opt_scrollTtyKeypress;
3646 break; 4091 break;
3647 case 1047: /* secondary screen w/ clearing last */ 4092 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 4093 if (options & Opt_secondaryScreen)
3649 if (current_screen != PRIMARY) 4094 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 4095 scr_erase_screen (2);
3651 scr_change_screen (state); 4096 scr_change_screen (state);
3652 break; 4097 break;
3653 case 1049: /* secondary screen w/ clearing first */ 4098 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 4099 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 4100 if (options & Opt_secondaryScreen)
3656 if (current_screen != PRIMARY) 4101 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 4102 scr_erase_screen (2);
3658 break; 4103 break;
3659 default: 4104 default:
3660 break; 4105 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 4131 rendset = 0, rendstyle = ~RS_None;
3687 break; 4132 break;
3688 case 1: 4133 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 4134 rendset = 1, rendstyle = RS_Bold;
3690 break; 4135 break;
4136 //case 2: // low intensity
4137 case 3:
4138 rendset = 1, rendstyle = RS_Italic;
4139 break;
3691 case 4: 4140 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 4141 rendset = 1, rendstyle = RS_Uline;
3693 break; 4142 break;
3694 case 5: 4143 case 5: // slowly blinking
4144 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 4145 rendset = 1, rendstyle = RS_Blink;
3696 break; 4146 break;
3697 //case 6: // scoansi light background 4147 //case 6: // scoansi light background
3698 case 7: 4148 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 4149 rendset = 1, rendstyle = RS_RVid;
3700 break; 4150 break;
3701 case 8: 4151 case 8:
3702 // invisible. NYI 4152 // invisible. NYI
3703 break; 4153 break;
4154 //case 9: // crossed out
3704 //case 10: // scoansi acs off 4155 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 4156 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 4157 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 4158 //...
4159 //case 19: // ninth alt font
4160 //case 20: // gothic
4161 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4162 rendset = 0, rendstyle = RS_Bold;
3709 break; 4163 break;
3710 case 22: 4164 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 4165 rendset = 0, rendstyle = RS_Bold;
4166 break;
4167 case 23: // disable italic
4168 rendset = 0, rendstyle = RS_Italic;
3712 break; 4169 break;
3713 case 24: 4170 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 4171 rendset = 0, rendstyle = RS_Uline;
3715 break; 4172 break;
3716 case 25: 4173 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 4174 rendset = 0, rendstyle = RS_Blink;
3718 break; 4175 break;
4176 case 26: // variable spacing (iso 8613)
4177 rendset = 0, rendstyle = RS_Blink;
4178 break;
3719 case 27: 4179 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 4180 rendset = 0, rendstyle = RS_RVid;
3721 break; 4181 break;
3722 case 28:
3723 // visible. NYI 4182 //case 28: // visible. NYI
3724 break; 4183 //case 29: // not crossed-out
3725 } 4184 }
3726 4185
3727 if (rendset != -1) 4186 if (rendset != -1)
3728 { 4187 {
3729 scr_rendition (rendset, rendstyle); 4188 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 4199 case 35:
3741 case 36: 4200 case 36:
3742 case 37: 4201 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 4203 break;
3745#ifdef TTY_256COLOR 4204 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 4206 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 4208 i += 2;
3751 } 4209 }
3752 break; 4210 break;
3753#endif
3754 case 39: /* default fg */ 4211 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 4212 scr_color (Color_fg, Color_fg);
3756 break; 4213 break;
3757 4214
3758 case 40: 4215 case 40:
… …
3763 case 45: 4220 case 45:
3764 case 46: 4221 case 46:
3765 case 47: 4222 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4223 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 4224 break;
3768#ifdef TTY_256COLOR 4225 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 4226 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 4227 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4228 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 4229 i += 2;
3774 } 4230 }
3775 break; 4231 break;
3776#endif
3777 case 49: /* default bg */ 4232 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 4233 scr_color (Color_bg, Color_bg);
3779 break; 4234 break;
4235
4236 //case 50: // not variable spacing
3780 4237
3781#ifndef NO_BRIGHTCOLOR 4238#ifndef NO_BRIGHTCOLOR
3782 case 90: 4239 case 90:
3783 case 91: /* set bright fg color */ 4240 case 91: /* set bright fg color */
3784 case 92: 4241 case 92:
3785 case 93: 4242 case 93:
3786 case 94: 4243 case 94:
3787 case 95: 4244 case 95:
3788 case 96: 4245 case 96:
3789 case 97: 4246 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4247 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 4248 break;
3793 case 100: 4249 case 100:
3794 case 101: /* set bright bg color */ 4250 case 101: /* set bright bg color */
3795 case 102: 4251 case 102:
3796 case 103: 4252 case 103:
3797 case 104: 4253 case 104:
3798 case 105: 4254 case 105:
3799 case 106: 4255 case 106:
3800 case 107: 4256 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 4258 break;
3804#endif 4259#endif
3805 4260
3806 } 4261 }
3807 } 4262 }
… …
3814{ 4269{
3815 unicode_t ch, cmd = cmd_getc (); 4270 unicode_t ch, cmd = cmd_getc ();
3816 4271
3817 if (cmd == 'Q') 4272 if (cmd == 'Q')
3818 { /* query graphics */ 4273 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 4274 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 4275 return;
3821 } 4276 }
3822 /* swallow other graphics sequences until terminating ':' */ 4277 /* swallow other graphics sequences until terminating ':' */
3823 do 4278 do
3824 ch = cmd_getc (); 4279 ch = cmd_getc ();
… …
3839 unsigned char buf[256]; 4294 unsigned char buf[256];
3840 4295
3841 va_start (arg_ptr, fmt); 4296 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 4298 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 4299 tt_write (buf, strlen (buf));
3845} 4300}
3846 4301
3847/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
3848/* Write data to the pty as typed by the user, pasted with the mouse, 4303/* Write data to the pty as typed by the user, pasted with the mouse,
3849 * or generated by us in response to a query ESC sequence. 4304 * or generated by us in response to a query ESC sequence.
3850 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
3851void 4308void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3853{ 4310{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4311 if (v_buflen == 0)
4312 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3855 4314
3856 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
3857 { 4320 }
4321
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4323
4324 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len;
4326
4327 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328}
4329
4330void rxvt_term::pty_write ()
4331{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333
4334 if (written > 0)
4335 {
4336 v_buflen -= written;
4337
3858 if (v_buflen == 0) 4338 if (v_buflen == 0)
3859 { 4339 {
3860 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3861
3862 if ((unsigned int)written == len)
3863 return;
3864
3865 data += written;
3866 len -= written;
3867 }
3868
3869
3870 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3871
3872 memcpy (v_buffer + v_buflen, data, len);
3873 v_buflen += len;
3874 }
3875
3876 for (;;)
3877 {
3878 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3879
3880 if (written > 0)
3881 {
3882 v_buflen -= written;
3883
3884 if (v_buflen == 0)
3885 {
3886 free (v_buffer); 4340 free (v_buffer);
3887 v_buffer = 0; 4341 v_buffer = 0;
3888 v_buflen = 0; 4342 v_buflen = 0;
3889 4343
3890 pty_ev.set (EVENT_READ); 4344 pty_ev.set (EVENT_READ);
3891 return;
3892 }
3893
3894 memmove (v_buffer, v_buffer + written, v_buflen);
3895 }
3896 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3897 // original code just ignores this...
3898 destroy ();
3899 else
3900 {
3901 pty_ev.set (EVENT_READ | EVENT_WRITE);
3902 return; 4345 return;
3903 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
3905} 4353}
3906 4354
3907/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
3908 4356

Diff Legend

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