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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.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
… …
746{ 1028{
747 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
751 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1038 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1040 }
755} 1041}
… …
768 1054
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
772 1058
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1060
775 if (n > 0) 1061 if (n > 0)
776 { 1062 {
777 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
778 return true; 1064 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1074{
789 SET_R (this); 1075 SET_R (this);
790 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
791 1077
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1080 while (pty_fill ())
797 if (cmd_parse ()) 1081 if (cmd_parse ())
798 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
799} 1100}
800 1101
801#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
802void 1103void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
816{ 1105{
817 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
818 return; 1107 return;
819 1108
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
821 XFlush (display->display); 1110 XFlush (display->display);
822 1111
823 hidden_pointer = 1; 1112 hidden_pointer = 1;
824} 1113}
825 1114
… …
842 x = ev.x; 1131 x = ev.x;
843 y = ev.y; 1132 y = ev.y;
844 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
845 1134
846 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1136 button_number = 3;
849 }
850 else 1137 else
851 { 1138 {
852 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1141 if (button_number >= 3)
855 button_number += (64 - 3); 1142 button_number += (64 - 3);
856 } 1143 }
857 1144
858 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
859 { 1146 {
860 /* 1147 /*
861 * do not report ButtonRelease 1148 * do not report ButtonRelease
862 * no state info allowed 1149 * no state info allowed
863 */ 1150 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1169#endif
883
884 } 1170 }
885 1171
886#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1174 if (key_state & 16)
889 fputc ('C', stderr); 1175 fputc ('C', stderr);
890 if (key_state & 4) 1176 if (key_state & 4)
891 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1181 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1183 button_number,
898 x + 1, 1184 x + 1,
899 y + 1); 1185 y + 1);
900#else 1186#endif
1187
901 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
903 (32 + x + 1), 1190 (32 + x + 1),
904 (32 + y + 1)); 1191 (32 + y + 1));
905#endif
906} 1192}
907 1193
908#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
909void 1195void
910rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
917 1203
918/*{{{ process an X event */ 1204/*{{{ process an X event */
919void 1205void
920rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
921{ 1207{
1208 dDisp;
1209
922 SET_R (this); 1210 SET_R (this);
923 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
924 1212
925#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
927 { 1215 {
928 if (hidden_cursor) 1216 if (hidden_cursor)
929 { 1217 {
930 hidden_cursor = 0; 1218 hidden_cursor = 0;
931 want_refresh = 1; 1219 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1223 }
936#endif 1224#endif
937 1225
938#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1228 {
941 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1232 if (hidden_pointer)
… …
947 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank (); 1236 pointer_blank ();
949 } 1237 }
950#endif 1238#endif
951 1239
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return;
955#endif
956
957 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1242 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1008#endif
1009 1243
1010 switch (ev.type) 1244 switch (ev.type)
1011 { 1245 {
1012 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1013 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;
1014 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
1015 1315
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1318 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
1028 } 1321#endif
1029 break; 1322 break;
1030 } 1323 }
1031#endif
1032 1324
1033 case ButtonPress: 1325 case ButtonPress:
1034 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1035 break; 1327 break;
1036 1328
… …
1053 Atom ActualType; 1345 Atom ActualType;
1054 int ActualFormat; 1346 int ActualFormat;
1055 unsigned char *data; 1347 unsigned char *data;
1056 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1057 1349
1058 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1059 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1060 0L, 1000000L, 1352 0L, 1000000L,
1061 False, AnyPropertyType, 1353 False, AnyPropertyType,
1062 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1063 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1064 &data); 1356 &data);
1065 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1066 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace,
1068 data, STRLEN (data));
1069 XFree (data); 1358 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1072 } 1361 }
1073#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1074 break; 1363 break;
1075 1364
1076 case MappingNotify: 1365 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1366 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1367 break;
1079 1368
1080 /* 1369 /*
1081 * XXX: this is not the _current_ arrangement 1370 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1371 * Here's my conclusion:
… …
1107 { 1396 {
1108 TermWin.focus = 1; 1397 TermWin.focus = 1;
1109 want_refresh = 1; 1398 want_refresh = 1;
1110#ifdef USE_XIM 1399#ifdef USE_XIM
1111 if (Input_Context != NULL) 1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1112 XSetICFocus (Input_Context); 1403 XSetICFocus (Input_Context);
1404 }
1113#endif 1405#endif
1114#ifdef CURSOR_BLINK 1406#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink) 1407 if (options & Opt_cursorBlink)
1116 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 }
1117#endif 1416#endif
1118 1417
1119 } 1418 }
1120 break; 1419 break;
1121 1420
1122 case FocusOut: 1421 case FocusOut:
1123 if (TermWin.focus) 1422 if (TermWin.focus)
1124 { 1423 {
1125 TermWin.focus = 0; 1424 TermWin.focus = 0;
1126 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
1127#ifdef USE_XIM 1433#ifdef USE_XIM
1128 if (Input_Context != NULL) 1434 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context); 1435 XUnsetICFocus (Input_Context);
1130#endif 1436#endif
1131#ifdef CURSOR_BLINK 1437#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink) 1438 if (options & Opt_cursorBlink)
1133 cursor_blink_ev.stop (); 1439 cursor_blink_ev.stop ();
1134 hidden_cursor = 0; 1440 hidden_cursor = 0;
1135#endif 1441#endif
1136 1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1137 } 1449 }
1138 break; 1450 break;
1139 1451
1140 case ConfigureNotify: 1452 case ConfigureNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1453 if (ev.xconfigure.window == TermWin.parent[0])
… …
1146 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 } 1462 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1152 1464
1153 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1154 { 1466 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1467 seen_resize = 1;
1156 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1157 } 1469 }
1158#ifdef DEBUG_SIZE 1470
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent) 1472 if (options & Opt_transparent)
1166 {
1167 check_our_parents (); 1473 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif 1474#endif
1172 } 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
1173 break; 1483 break;
1174 1484
1175 case SelectionClear: 1485 case SelectionClear:
1176 selection_clear (); 1486 selection_clear ();
1177 break; 1487 break;
1178 1488
1179 case SelectionNotify: 1489 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1492 break;
1184 1493
1185 case SelectionRequest: 1494 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1187 break; 1496 break;
… …
1208 1517
1209 case GraphicsExpose: 1518 case GraphicsExpose:
1210 case Expose: 1519 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1212 { 1521 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1217 // 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))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1532
1221 // ev.xexpose.width, TermWin.height, False); 1533 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1534 }
1225 else 1535 else
1226 { 1536 {
1227 XEvent unused_event; 1537 XEvent unused_event;
1228 1538
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1230 ; 1540 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1542 ;
1233 1543
1234 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1235 { 1545 {
1236 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1238 } 1548 }
1239#ifdef MENUBAR 1549#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1551 menubar_expose ();
1242#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
1243 } 1558 }
1244 break; 1559 break;
1245 1560
1246 case MotionNotify: 1561 case MotionNotify:
1247#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
… …
1253 { 1568 {
1254 menubar_control (ev.xbutton); 1569 menubar_control (ev.xbutton);
1255 break; 1570 break;
1256 } 1571 }
1257#endif 1572#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1259 break; 1574 break;
1260 1575
1261 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1262 { 1577 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1579 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1266 ; 1581 ;
1267 1582
1268 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1269 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1587 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1591 {
1277#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
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1280#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1283 { 1607 {
1284 int dist; 1608 int dist;
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1615
1292 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1294 */ 1618 */
1295 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1622
1300 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1302 { 1625 {
1303 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1305 } 1628 }
1306 else 1629 else
1307 { 1630 {
1308 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y -
1310 (TermWin.int_bwidth + TermWin.height); 1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1311 } 1633 }
1634
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1314 MIN_IT (scroll_selection_lines, 1638 MIN_IT (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1316 } 1640 }
1317 else 1641 else
1318 { 1642 {
1319 /* we are within the text window, so we 1643 /* we are within the text window, so we
1320 * shouldn't be scrolling 1644 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1646 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1324 } 1648 }
1325#endif 1649#endif
1326#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1327
1328 } 1651 }
1329#endif 1652#endif
1330
1331 } 1653 }
1332 } 1654 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1656 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1336 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1337 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1338 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1665 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1667 scrollbar_size ());
1344 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1347 } 1671 }
1348 break; 1672 break;
1349 } 1673 }
1350} 1674}
1351 1675
1676#if TRANSPARENT
1352void 1677void
1353rxvt_term::rootwin_cb (XEvent &ev) 1678rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1679{
1355 SET_R (this); 1680 SET_R (this);
1356 SET_LOCALE (locale); 1681 SET_LOCALE (locale);
1357 1682
1358 switch (ev.type) 1683 switch (ev.type)
1359 { 1684 {
1360 case PropertyNotify: 1685 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1686 /*
1371 * 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,
1372 * 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.
1373 */ 1689 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376
1377 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])
1378 return; 1692 return;
1379 }
1380 1693
1381 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1382 case ReparentNotify: 1695 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1697 want_refresh = want_full_refresh = 1;
1385 break; 1698 break;
1386#endif
1387 } 1699 }
1388} 1700}
1701#endif
1389 1702
1390void 1703void
1391rxvt_term::button_press (XButtonEvent &ev) 1704rxvt_term::button_press (XButtonEvent &ev)
1392{ 1705{
1393 int reportmode = 0, clickintime; 1706 int reportmode = 0, clickintime;
1394 1707
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1396 if (!bypass_keystate) 1709 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1710 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711
1398 /* 1712 /*
1399 * VT window processing of button press 1713 * VT window processing of button press
1400 */ 1714 */
1401 if (ev.window == TermWin.vt) 1715 if (ev.window == TermWin.vt)
1402 { 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
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1404 if (reportmode) 1728 if (reportmode)
1405 { 1729 {
1406 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1437 } 1761 }
1438 else 1762 else
1439 { 1763 {
1440 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1442 switch (ev.button) 1767 switch (ev.button)
1443 { 1768 {
1444 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
1445 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1780 {
1448 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
1450 else 1783 else
1451 selection_extend (ev.x, ev.y, 1); 1784 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1799 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1800 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1801 selection_rotate (ev.x, ev.y);
1469 else 1802 else
1470 selection_extend (ev.x, ev.y, 1); 1803 selection_extend (ev.x, ev.y, 1);
1804
1471 MEvent.button = Button3; 1805 MEvent.button = Button3;
1472 break; 1806 break;
1473 } 1807 }
1474 } 1808 }
1809
1475 MEvent.time = ev.time; 1810 MEvent.time = ev.time;
1476 return; 1811 return;
1477 } 1812 }
1478 1813
1479 /* 1814 /*
… …
1571 break; 1906 break;
1572 case R_SB_ALIGN_BOTTOM: 1907 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 1908 csrO = scrollBar.bot - scrollBar.top;
1574 break; 1909 break;
1575 } 1910 }
1911
1576 if (scrollBar.style == R_SB_XTERM 1912 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 1913 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 1914 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 1915 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 1916
1581 scrollBar.setMotion (); 1917 scrollBar.setMotion ();
1582 break; 1918 break;
1583 1919
1584 case Button1: 1920 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1921 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 scr_page ((ev.button == Button1 ? DN : UP), 1945 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 1946 (TermWin.nrow
1611 * scrollbar_position (ev.y) 1947 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 1948 / scrollbar_size ()));
1613 } 1949 }
1950
1614 break; 1951 break;
1615 } 1952 }
1616 } 1953 }
1617 return; 1954 return;
1618 } 1955 }
… …
1630{ 1967{
1631 int reportmode = 0; 1968 int reportmode = 0;
1632 1969
1633 csrO = 0; /* reset csr Offset */ 1970 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 1971 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1972 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 1973
1637 if (scrollbar_isUpDn ()) 1974 if (scrollbar_isUpDn ())
1638 { 1975 {
1639 scrollBar.setIdle (); 1976 scrollBar.setIdle ();
1640 scrollbar_show (0); 1977 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 1979 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 1980#endif
1644
1645 } 1981 }
1982
1646#ifdef SELECTION_SCROLLING 1983#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 1984 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1985 sel_scroll_ev.stop();
1649#endif 1986#endif
1987
1650 if (ev.window == TermWin.vt) 1988 if (ev.window == TermWin.vt)
1651 { 1989 {
1990#if ISO_14755
1991 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return;
1994#endif
1652 if (reportmode) 1995 if (reportmode)
1653 { 1996 {
1654 /* mouse report from vt window */ 1997 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 1998 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 1999 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 2013 MEvent.button = AnyButton;
1671 mouse_report (ev); 2014 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2015#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2016 return;
1674 } 2017 }
2018
1675 /* 2019 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2020 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2021 * when overriding mouse reporting
1678 */ 2022 */
1679 if (PrivateModes & PrivMode_mouse_report 2023 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2024 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2025 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2026 selection_extend (ev.x, ev.y, 0);
1683 2027
1684 switch (ev.button) 2028 switch (ev.button)
… …
1699 2043
1700 v = ev.button == Button4 ? UP : DN; 2044 v = ev.button == Button4 ? UP : DN;
1701 2045
1702 if (ev.state & ShiftMask) 2046 if (ev.state & ShiftMask)
1703 i = 1; 2047 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2048 else if (options & Opt_mouseWheelScrollPage)
1705 i = TermWin.nrow - 1; 2049 i = TermWin.nrow - 1;
1706 else 2050 else
1707 i = 5; 2051 i = 5;
1708 2052
1709# ifdef MOUSE_SLIP_WHEELING 2053# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2054 if (ev.state & ControlMask)
1711 { 2055 {
1712 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)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062
2063 slip_wheel_ev.start ();
1714 } 2064 }
2065 else
2066 {
1715# endif 2067# endif
1716# ifdef JUMP_MOUSE_WHEEL 2068# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2069 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2070 scr_refresh (SMOOTH_REFRESH);
1725 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
1726 } 2081 }
1727# endif 2082#endif
1728
1729 } 2083 }
1730 break; 2084 break;
1731#endif 2085#endif
1732
1733 } 2086 }
1734 } 2087 }
1735#ifdef MENUBAR 2088#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2089 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2090 menubar_control (ev);
1738#endif 2091#endif
1739} 2092}
1740 2093
1741#ifdef TRANSPARENT 2094#ifdef TRANSPARENT
1742#if TINTING 2095#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2096/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2097
1746static void 2098typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2099
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2100void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2101{
1754 /* No saturation */ 2102 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2103 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 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;
1758 2108
1759 b = ((uint16_t *) ptr)[x]; 2109 Visual *visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2110
1761 g = (b & 0x3e0) * gm; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2112
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2113 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2114 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2115 mask_g = visual->green_mask;
1766 } 2116 mask_b = visual->blue_mask;
1767 ptr += bpl; 2117
1768 } 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;
1769 } else { 2191 } else {
1770 for (y = h; --y >= 0;) { 2192 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2193 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2194
1774 b = ((uint16_t *) ptr)[x]; 2195 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2196
1776 g = (b & 0x3e0) * gm; 2197 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2198 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2199 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2200 }
1780 b |= (!(b >> 5) - 1); 2201
1781 ((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 */
1782 | ((g >> 8) & 0x3e0) 2203 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2204 {
1784 } 2205 unsigned int tmp;
1785 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++)
1786 } 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);
1787 } 2258 }
1788} 2259 break;
1789 2260 }
1790/* RGB 16 */ 2261 case 16:
1791static void 2262 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2263 unsigned short *p1, *pf, *p, *pl;
1793{ 2264 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2265 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2266 while (p1 < pf)
1796 2267 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2268 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2269 pl = p1 + srcImage->width;
1799 /* No saturation */ 2270 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2271 {
1814 } else { 2272 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2273 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2274 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2275 }
1830 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)
1831 } 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);
1832 } 2296 }
1833} 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);
1834 2304
1835/* RGB 24 */ 2305 while (p1 < pf)
1836static void 2306 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2307 p = p1;
1838{ 2308 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2309 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2310 {
1867 } else { 2311 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2312 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2313 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2314 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2315 }
1898 ptr += bpl; 2316 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2317 }
2318 break;
2319 }
1900 } 2320 }
1901}
1902 2321
1903/* RGB 32 */ 2322 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2323}
1974
1975#endif 2324#endif
1976 2325
1977/* 2326/*
1978 * Check our parents are still who we think they are. 2327 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2328 * Do transparency updates if required
… …
1986 Atom atype; 2335 Atom atype;
1987 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
1988 Window root, oldp, *list; 2337 Window root, oldp, *list;
1989 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
1991 2341
1992 pchanged = 0; 2342 pchanged = 0;
1993 2343
1994 if (!(Options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1996 2346
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
1999 2349
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2001 2351
2002 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
2003 { 2353 {
2004 if (am_transparent) 2354 if (am_transparent)
2005 { 2355 {
2006 pchanged = 1; 2356 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
2009 } 2359 }
2010 2360
2011 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
2012 } 2362 }
2013 2363
2014 /* 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. */
2015 XSync (display->display, False); 2365 XSync (disp, False);
2016 2366
2017 /* 2367 /*
2018 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
2020 * 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.
2021 */ 2371 */
2022 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
2026 2376
2027 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
2032 2382
2033 if (!i || prop == NULL) 2383 if (!i || prop == NULL
2384#if TINTING
2385 || !rs[Rs_color + Color_tint]
2386#endif
2387 )
2034 have_pixmap = 0; 2388 have_pixmap = 0;
2035 else 2389 else
2036 { 2390 {
2037 have_pixmap = 1; 2391 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2392 rootpixmap = *(Pixmap *)prop;
… …
2049 Window cr; 2403 Window cr;
2050 XImage *image; 2404 XImage *image;
2051 GC gc; 2405 GC gc;
2052 XGCValues gcvalue; 2406 XGCValues gcvalue;
2053 2407
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2055 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2058 nx = ny = 0; 2412 nx = ny = 0;
2059 2413
… …
2071 sy = 0; 2425 sy = 0;
2072 } 2426 }
2073 2427
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
2076 allowedxerror = -1; 2432 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2434
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2081 allowedxerror = 0; 2437 allowedxerror = 0;
2082 2438
… …
2085 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2086 { 2442 {
2087 pchanged = 1; 2443 pchanged = 1;
2088 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2089 { 2445 {
2090 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2091 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2092 } 2448 }
2093 } 2449 }
2094 2450
2095 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2096 } 2452 }
2097 else 2453 else
2098 { 2454 {
2099 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2101 2457
2102#if TINTING 2458#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2460 {
2105 unsigned short shade, rm, gm, bm; 2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2463
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2465
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2467 }
2120#endif 2468#endif
2121 2469
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2123 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2128 XDestroyImage (image); 2476 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2130 TermWin.pixmap); 2478 XClearWindow (disp, TermWin.parent[0]);
2131 2479
2132 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2481 pchanged = 1;
2134 2482
2135 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2136 } 2484 }
2137 } 2485 }
2138 2486
2139 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2140 { 2490 {
2141 unsigned int n; 2491 unsigned int n;
2142 /* 2492 /*
2143 * InheritPixmap transparency 2493 * InheritPixmap transparency
2144 */ 2494 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 { 2496 {
2148 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2151 XFree (list); 2500 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2501
2154 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2155 { 2503 {
2156 if (oldp != None) 2504 if (oldp != None)
2157 pchanged = 1; 2505 pchanged = 1;
… …
2167 2515
2168 if (pchanged) 2516 if (pchanged)
2169 { 2517 {
2170 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2171 { 2519 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2522 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break; 2524 break;
2178 } 2525 }
2179 } 2526 }
2180 } 2527 }
2181 2528
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 { 2530 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2533 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2189 } 2535 }
2190 else 2536 else
2191 { 2537 {
2192#if WAIT_FOR_WM 2538#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2539 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2541 sleep (1);
2196#endif 2542#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2544 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]);
2547 }
2200 2548
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2202 am_transparent = 1; 2550 am_transparent = 1;
2203 } 2551 }
2204 2552
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 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 ();
2207 } 2569 }
2208 2570
2209 return pchanged; 2571 return pchanged;
2210} 2572}
2211#endif 2573#endif
… …
2230 if (ch == NOCHAR) // TODO: improve 2592 if (ch == NOCHAR) // TODO: improve
2231 break; 2593 break;
2232 2594
2233 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)
2234 { 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
2235 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2613 bool refreshnow = false;
2238 int nlines = 0; 2614 int nlines = 0;
2239 unicode_t *str = buf; 2615 unicode_t *str = buf;
2240 2616
2241 *str++ = ch;
2242
2243 for (;;) 2617 for (;;)
2244 { 2618 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 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))
2249 break; 2620 break;
2250 2621
2251 *str++ = ch; 2622 *str++ = ch;
2252 2623
2253 if (ch == C0_LF) 2624 if (ch == C0_LF)
2254 { 2625 {
2255 nlines++; 2626 nlines++;
2256 refresh_count++; 2627 refresh_count++;
2257 2628
2258 if (! (Options & Opt_jumpScroll) 2629 if (!(options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2260 { 2631 {
2261 refreshnow = true; 2632 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR; 2633 ch = NOCHAR;
2264 break; 2634 break;
2265 } 2635 }
2266 2636
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2638 if (nlines >= TermWin.nrow - 1)
2269 { 2639 {
2270 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0; 2641 nlines = 0;
2272 str = buf; 2642 str = buf;
… …
2276 if (str >= buf + UBUFSIZ) 2646 if (str >= buf + UBUFSIZ)
2277 { 2647 {
2278 ch = NOCHAR; 2648 ch = NOCHAR;
2279 break; 2649 break;
2280 } 2650 }
2651
2652 seq_begin = cmdbuf_ptr;
2653 ch = next_char ();
2281 } 2654 }
2282 2655
2283 scr_add_lines (buf, nlines, str - buf); 2656 scr_add_lines (buf, nlines, str - buf);
2284 2657
2285 /* 2658 /*
2286 * 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
2287 * 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.
2288 * the number of pages between refreshes is refresh_limit, which 2661 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2662 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2663 */
2294 if (refreshnow) 2664 if (refreshnow)
2295 { 2665 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2667 refresh_limit++;
2298 else 2668 else
2669 {
2670 flag = true;
2299 scr_refresh (refresh_type); 2671 scr_refresh (refresh_type);
2672 }
2300 } 2673 }
2301 2674
2302 } 2675 }
2303 else 2676 else
2304 { 2677 {
… …
2352 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2353 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
2354 2727
2355 // assume wchar == unicode 2728 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2357 return wc; 2730 return wc & UNICODE_MASK;
2358 } 2731 }
2359 2732
2360 return NOCHAR; 2733 return NOCHAR;
2361} 2734}
2362 2735
… …
2488 process_escape_seq (); 2861 process_escape_seq ();
2489 break; 2862 break;
2490 case C0_ENQ: /* terminal Status */ 2863 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2864 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2494 else 2867 else
2495 tt_write ((unsigned char *)VT100_ANS, 2868 tt_write ((unsigned char *)VT100_ANS,
2496 (unsigned int)STRLEN (VT100_ANS)); 2869 (unsigned int)strlen (VT100_ANS));
2497 break; 2870 break;
2498 case C0_BEL: /* bell */ 2871 case C0_BEL: /* bell */
2499 scr_bell (); 2872 scr_bell ();
2500 break; 2873 break;
2501 case C0_BS: /* backspace */ 2874 case C0_BS: /* backspace */
… …
2600void 2973void
2601rxvt_term::process_escape_seq () 2974rxvt_term::process_escape_seq ()
2602{ 2975{
2603 unicode_t ch = cmd_getc (); 2976 unicode_t ch = cmd_getc ();
2604 2977
2605 if (PrivateModes & PrivMode_vt52) 2978 if (priv_modes & PrivMode_vt52)
2606 { 2979 {
2607 process_escape_vt52 (ch); 2980 process_escape_vt52 (ch);
2608 return; 2981 return;
2609 } 2982 }
2610 2983
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 2998 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 2999 break;
2627 case '+': 3000 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 3001 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 3002 break;
2630#ifndef NO_FRILLS 3003#if ENABLE_FRILLS
2631 case '6': 3004 case '6':
2632 scr_backindex (); 3005 scr_backindex ();
2633 break; 3006 break;
2634#endif 3007#endif
2635 case '7': 3008 case '7':
2636 scr_cursor (SAVE); 3009 scr_cursor (SAVE);
2637 break; 3010 break;
2638 case '8': 3011 case '8':
2639 scr_cursor (RESTORE); 3012 scr_cursor (RESTORE);
2640 break; 3013 break;
2641#ifndef NO_FRILLS 3014#if ENABLE_FRILLS
2642 case '9': 3015 case '9':
2643 scr_forwardindex (); 3016 scr_forwardindex ();
2644 break; 3017 break;
2645#endif 3018#endif
2646 case '=': 3019 case '=':
… …
2825 { 3198 {
2826 switch (priv) 3199 switch (priv)
2827 { 3200 {
2828 case '>': 3201 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2831 break; 3204 break;
2832 case '?': 3205 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 3208 break;
… …
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2946 break; 3319 break;
2947 3320
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3322 tt_write ((const unsigned char *)VT100_ANS,
2950 (unsigned int) (sizeof (VT100_ANS) - 1)); 3323 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3324 break;
2952 3325
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3327 process_sgr_mode (nargs, arg);
2955 break; 3328 break;
… …
2962 break; 3335 break;
2963 case 6: /* CPR requested */ 3336 case 6: /* CPR requested */
2964 scr_report_position (); 3337 scr_report_position ();
2965 break; 3338 break;
2966 case 7: /* unofficial extension */ 3339 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3340 if (options & Opt_insecure)
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3341 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3342 break;
2970 case 8: /* unofficial extension */ 3343 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3345 break;
2973 } 3346 }
… …
3009 break; 3382 break;
3010 3383
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3384 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3385 if (arg[0] == 4)
3013 scr_insert_mode (0); 3386 scr_insert_mode (0);
3387 else if (arg[0] == 20)
3388 priv_modes &= ~PrivMode_LFNL;
3014 break; 3389 break;
3015 3390
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3391 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3392 if (arg[0] == 4)
3018 scr_insert_mode (1); 3393 scr_insert_mode (1);
3394 else if (arg[0] == 20)
3395 priv_modes |= PrivMode_LFNL;
3019 break; 3396 break;
3020 3397
3021 /* 3398 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3399 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3400 */
… …
3035 break; 3412 break;
3036 case CSI_75: 3413 case CSI_75:
3037 scr_cursor (RESTORE); 3414 scr_cursor (RESTORE);
3038 break; 3415 break;
3039 3416
3040#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
3041 case CSI_74: 3418 case CSI_74:
3042 process_window_ops (arg, nargs); 3419 process_window_ops (arg, nargs);
3043 break; 3420 break;
3044#endif 3421#endif
3045 3422
… …
3052 break; 3429 break;
3053 } 3430 }
3054} 3431}
3055/*}}} */ 3432/*}}} */
3056 3433
3057#ifndef NO_FRILLS 3434#if ENABLE_FRILLS
3058/* ARGSUSED */ 3435/* ARGSUSED */
3059void 3436void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3438{
3062 int x, y; 3439 int x, y;
3063 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3064 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3065 3443
3066 if (nargs == 0) 3444 if (nargs == 0)
3067 return; 3445 return;
3068 3446
3069 switch (args[0]) 3447 switch (args[0])
3070 { 3448 {
3071 /* 3449 /*
3072 * commands 3450 * commands
3073 */ 3451 */
3074 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3076 break; 3454 break;
3077 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3457 break;
3081 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3083 break; 3460 break;
3084 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3463 break;
3087 case 5: /* raise window */ 3464 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3089 break; 3466 break;
3090 case 6: /* lower window */ 3467 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3092 break; 3469 break;
3093 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3094 scr_touch (true); 3471 scr_touch (true);
3095 break; 3472 break;
3096 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3108 3485
3109 /* 3486 /*
3110 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3111 */ 3488 */
3112 case 11: /* report window state */ 3489 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3492 break;
3116 case 13: /* report window position */ 3493 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3499 break;
3123 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3503 break;
3127 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3129 break; 3506 break;
3130 case 19: /* report window size (chars) */ 3507 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3132 break; 3509 break;
3133 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3511 {
3136 char *s; 3512 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3138 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);
3139 } 3516 }
3140 break; 3517 break;
3141 case 21: /* report window title */ 3518 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3519 {
3144 char *s; 3520 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3146 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);
3147 } 3524 }
3148 break; 3525 break;
3149 } 3526 }
3150} 3527}
3151#endif 3528#endif
3152 3529
… …
3156 * ends_how is terminator used. returned input must be free()'d 3533 * ends_how is terminator used. returned input must be free()'d
3157 */ 3534 */
3158unsigned char * 3535unsigned char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3537{
3161 unicode_t prev = 0, ch; 3538 unicode_t ch;
3539 bool seen_esc = false;
3162 unsigned int n = 0; 3540 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3541 wchar_t string[STRING_MAX];
3165 3542
3166 while ((ch = cmd_getc ()) != NOCHAR) 3543 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3544 {
3168 if (prev == C0_ESC) 3545 if (seen_esc)
3169 { 3546 {
3170 if (ch == 0x5c) /* 7bit ST */ 3547 if (ch == 0x5c) /* 7bit ST */
3171 break; 3548 break;
3172 else 3549 else
3173 return NULL; 3550 return NULL;
3174 } 3551 }
3552 else if (ch == C0_ESC)
3553 {
3554 seen_esc = true;
3555 continue;
3556 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3557 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3558 break;
3177 else if (ch < 0x20) 3559 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3561
3562 seen_esc = false;
3179 3563
3180 if (n >= sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3181 // stop at some sane length 3565 // stop at some sane length
3182 return NULL; 3566 return NULL;
3183 3567
3184 if (ch == C0_SYN) 3568 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3569 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3570 else
3190 string[n++] = prev = ch; 3571 string[n++] = ch;
3191 } 3572 }
3192 3573
3193 string[n++] = '\0'; 3574 string[n++] = '\0';
3194 3575
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3577
3200 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
3201} 3579}
3202 3580
3203/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
3204/* 3582/*
3205 * 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)'
… …
3249void 3627void
3250rxvt_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)
3251{ 3629{
3252 if (str[0] == '?' && !str[1]) 3630 if (str[0] == '?' && !str[1])
3253 { 3631 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3632 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3633 pix_colors_focused[color].get (display, r, g, b);
3258 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);
3259 }
3260 } 3635 }
3261 else 3636 else
3262 set_window_color (color, str); 3637 set_window_color (color, str);
3263} 3638}
3264 3639
… …
3292{ 3667{
3293 int changed = 0; 3668 int changed = 0;
3294 int color; 3669 int color;
3295 char *buf, *name; 3670 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3672 int saveop = op;
3673 dDisp;
3297 3674
3298 assert (str != NULL); 3675 assert (str != NULL);
3299 switch (op) 3676 switch (op)
3300 { 3677 {
3301 case XTerm_name: 3678 case XTerm_name:
… …
3308 set_title (str); 3685 set_title (str);
3309 break; 3686 break;
3310 case XTerm_property: 3687 case XTerm_property:
3311 if (str[0] == '?') 3688 if (str[0] == '?')
3312 { 3689 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3690 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3691 Atom actual_type;
3315 int actual_format; 3692 int actual_format;
3316 unsigned long nitems; 3693 unsigned long nitems;
3317 unsigned long bytes_after; 3694 unsigned long bytes_after;
3318 unsigned char *value = 0; 3695 unsigned char *value = 0;
3319 const char *str = ""; 3696 const char *str = "";
3320 3697
3321 if (prop 3698 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3703 && actual_type != None
3327 && actual_format == 8) 3704 && actual_format == 8)
… …
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3714
3338 if (eq) 3715 if (eq)
3339 { 3716 {
3340 *eq = 0; 3717 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3718 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3719 }
3346 else 3720 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3348 display->atom (str)); 3722 display->atom (str));
3349 } 3723 }
3350 break; 3724 break;
3351 3725
3352 case XTerm_Color: 3726 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3727 for (buf = (char *)str; buf && *buf;)
3354 { 3728 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3729 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3730 break;
3357 3731
3358 *name++ = '\0'; 3732 *name++ = '\0';
3359 color = atoi (buf); 3733 color = atoi (buf);
3360 3734
3361 if (color < 0 || color >= TOTAL_COLORS) 3735 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3736 break;
3363 3737
3364 if ((buf = STRCHR (name, ';')) != NULL) 3738 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3739 *buf++ = '\0';
3366 3740
3367 if (name[0] == '?' && !name[1]) 3741 if (name[0] == '?' && !name[1])
3368 { 3742 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3743 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3746 }
3376 else 3747 else
3377 set_window_color (color + minCOLOR, name); 3748 set_window_color (color + minCOLOR, name);
3378 } 3749 }
3379 break; 3750 break;
… …
3396 break; 3767 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3768#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_BD: 3769 case XTerm_Color_BD:
3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3400 break; 3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3401 case XTerm_Color_UL: 3775 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break; 3777 break;
3404 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
3405 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;
3406 break; 3788 break;
3407#endif 3789#endif
3408 3790
3409 case XTerm_Pixmap: 3791 case XTerm_Pixmap:
3410 if (*str != ';') 3792 if (*str != ';')
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3795 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3796 set_bgPixmap (str); /* change pixmap */
3415#endif 3797#endif
3416 scr_touch (true); 3798 scr_touch (true);
3417 } 3799 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3800 while ((str = strchr (str, ';')) != NULL)
3419 { 3801 {
3420 str++; 3802 str++;
3421#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3423#endif 3805#endif
3424
3425 } 3806 }
3807
3426 if (changed) 3808 if (changed)
3427 { 3809 {
3428#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3429 resize_pixmap (); 3811 resize_pixmap ();
3430#endif 3812#endif
… …
3442 case XTerm_logfile: 3824 case XTerm_logfile:
3443 // TODO, when secure mode? 3825 // TODO, when secure mode?
3444 break; 3826 break;
3445 3827
3446 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
3447 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
3448 { 3842 {
3449 if (Options & Opt_insecure) 3843 const char *&res = rs[Rs_font + (op - URxvt_font)];
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3844
3451 TermWin.fontset->fontdesc 3845 res = strdup (str);
3452 ? TermWin.fontset->fontdesc 3846 allocated.push_back ((void *)res);
3453 : "", 3847 set_fonts ();
3454 resp);
3455 } 3848 }
3456 else
3457 change_font (str);
3458 break; 3849 break;
3459 3850
3460#ifndef NO_FRILLS 3851#if ENABLE_FRILLS
3461 case XTerm_locale: 3852 case XTerm_locale:
3462 if (query) 3853 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3466 }
3467 else 3855 else
3468 { 3856 {
3469 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3470# ifdef USE_XIM 3859# ifdef USE_XIM
3471 im_cb (); 3860 im_cb ();
3472# endif 3861# endif
3473 } 3862 }
3474 break; 3863 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif 3864#endif
3485 3865
3486#ifdef MENUBAR 3866#ifdef MENUBAR
3487 case XTerm_Menu: 3867 case XTerm_Menu:
3488 if (Options & Opt_insecure) 3868 if (options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3870 break;
3491#endif 3871#endif
3492#if 0 3872#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3873 case XTerm_dumpscreen: /* no error notices */
… …
3520{ 3900{
3521 int state; 3901 int state;
3522 3902
3523 if (mode == 's') 3903 if (mode == 's')
3524 { 3904 {
3525 SavedModes |= (PrivateModes & bit); 3905 SavedModes |= (priv_modes & bit);
3526 return -1; 3906 return -1;
3527 } 3907 }
3528 else 3908 else
3529 { 3909 {
3530 if (mode == 'r') 3910 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3911 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3912 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3913 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3914 PrivMode (state, bit);
3535 } 3915 }
3536 3916
3537 return state; 3917 return state;
3538} 3918}
… …
3556 { 3, PrivMode_132 }, 3936 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3937 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3938 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3939 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3940 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3942 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3943#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 3944 { menuBar_esc, PrivMode_menuBar },
3564#endif 3945#endif
3946 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 3948#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3949 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3950#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3951 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3952 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3953 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3954 // 45 margin bell NYI
3575 // 46 start logging 3955 // 46 start logging
… …
3616 3996
3617 /* extra handling for values with state unkept */ 3997 /* extra handling for values with state unkept */
3618 switch (arg[i]) 3998 switch (arg[i])
3619 { 3999 {
3620 case 1048: /* alternative cursor save */ 4000 case 1048: /* alternative cursor save */
4001 case 1049:
3621 if (Options & Opt_secondaryScreen) 4002 if (options & Opt_secondaryScreen)
3622 if (mode == 0) 4003 if (mode == 0)
3623 scr_cursor (RESTORE); 4004 scr_cursor (RESTORE);
3624 else if (mode == 1) 4005 else if (mode == 1)
3625 scr_cursor (SAVE); 4006 scr_cursor (SAVE);
3626 break; 4007 break;
… …
3637 * within VT52 mode 4018 * within VT52 mode
3638 */ 4019 */
3639 PrivMode (1, PrivMode_vt52); 4020 PrivMode (1, PrivMode_vt52);
3640 break; 4021 break;
3641 case 3: /* 80/132 */ 4022 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4023 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3644 break; 4025 break;
3645 case 4: /* smooth scrolling */ 4026 case 4: /* smooth scrolling */
3646 if (state) 4027 if (state)
3647 Options &= ~Opt_jumpScroll; 4028 options &= ~Opt_jumpScroll;
3648 else 4029 else
3649 Options |= Opt_jumpScroll; 4030 options |= Opt_jumpScroll;
3650 break; 4031 break;
3651 case 5: /* reverse video */ 4032 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4033 scr_rvideo_mode (state);
3653 break; 4034 break;
3654 case 6: /* relative/absolute origins */ 4035 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4039 scr_autowrap (state);
3659 break; 4040 break;
3660 /* 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 */
3661 case 9: /* X10 mouse reporting */ 4042 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4043 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4044 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4045 break;
3665#ifdef menuBar_esc 4046#ifdef menuBar_esc
3666 case menuBar_esc: 4047 case menuBar_esc:
3667#ifdef MENUBAR 4048#ifdef MENUBAR
3668 map_menuBar (state); 4049 map_menuBar (state);
… …
3688 break; 4069 break;
3689 /* case 66: - application key pad */ 4070 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4071 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4072 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4073 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4074 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4075 break;
3695#if 0 4076#if 0
3696 case 1001: 4077 case 1001:
3697 break; /* X11 mouse highlighting */ 4078 break; /* X11 mouse highlighting */
3698#endif 4079#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4080 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4081 if (state)
3701 Options &= ~Opt_scrollTtyOutput; 4082 options &= ~Opt_scrollTtyOutput;
3702 else 4083 else
3703 Options |= Opt_scrollTtyOutput; 4084 options |= Opt_scrollTtyOutput;
3704 break; 4085 break;
3705 case 1011: /* scroll to bottom on key press */ 4086 case 1011: /* scroll to bottom on key press */
3706 if (state) 4087 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4088 options |= Opt_scrollTtyKeypress;
3708 else 4089 else
3709 Options &= ~Opt_scrollTtyKeypress; 4090 options &= ~Opt_scrollTtyKeypress;
3710 break; 4091 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4092 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4093 if (options & Opt_secondaryScreen)
3713 if (current_screen != PRIMARY) 4094 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4095 scr_erase_screen (2);
3715 scr_change_screen (state); 4096 scr_change_screen (state);
3716 break; 4097 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4098 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4099 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4100 if (options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY) 4101 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4102 scr_erase_screen (2);
3722 break; 4103 break;
3723 default: 4104 default:
3724 break; 4105 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4131 rendset = 0, rendstyle = ~RS_None;
3751 break; 4132 break;
3752 case 1: 4133 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4134 rendset = 1, rendstyle = RS_Bold;
3754 break; 4135 break;
4136 //case 2: // low intensity
4137 case 3:
4138 rendset = 1, rendstyle = RS_Italic;
4139 break;
3755 case 4: 4140 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4141 rendset = 1, rendstyle = RS_Uline;
3757 break; 4142 break;
3758 case 5: 4143 case 5: // slowly blinking
4144 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4145 rendset = 1, rendstyle = RS_Blink;
3760 break; 4146 break;
3761 //case 6: // scoansi light background 4147 //case 6: // scoansi light background
3762 case 7: 4148 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4149 rendset = 1, rendstyle = RS_RVid;
3764 break; 4150 break;
3765 case 8: 4151 case 8:
3766 // invisible. NYI 4152 // invisible. NYI
3767 break; 4153 break;
4154 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4155 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4156 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4157 //case 12: // scoansi acs on, |0x80, second alt font
3771 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)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4162 rendset = 0, rendstyle = RS_Bold;
3773 break; 4163 break;
3774 case 22: 4164 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4165 rendset = 0, rendstyle = RS_Bold;
4166 break;
4167 case 23: // disable italic
4168 rendset = 0, rendstyle = RS_Italic;
3776 break; 4169 break;
3777 case 24: 4170 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4171 rendset = 0, rendstyle = RS_Uline;
3779 break; 4172 break;
3780 case 25: 4173 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4174 rendset = 0, rendstyle = RS_Blink;
3782 break; 4175 break;
4176 case 26: // variable spacing (iso 8613)
4177 rendset = 0, rendstyle = RS_Blink;
4178 break;
3783 case 27: 4179 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4180 rendset = 0, rendstyle = RS_RVid;
3785 break; 4181 break;
3786 case 28:
3787 // visible. NYI 4182 //case 28: // visible. NYI
3788 break; 4183 //case 29: // not crossed-out
3789 } 4184 }
3790 4185
3791 if (rendset != -1) 4186 if (rendset != -1)
3792 { 4187 {
3793 scr_rendition (rendset, rendstyle); 4188 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4199 case 35:
3805 case 36: 4200 case 36:
3806 case 37: 4201 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4203 break;
3809#ifdef TTY_256COLOR 4204 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4206 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4208 i += 2;
3815 } 4209 }
3816 break; 4210 break;
3817#endif
3818 case 39: /* default fg */ 4211 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4212 scr_color (Color_fg, Color_fg);
3820 break; 4213 break;
3821 4214
3822 case 40: 4215 case 40:
… …
3827 case 45: 4220 case 45:
3828 case 46: 4221 case 46:
3829 case 47: 4222 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4223 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4224 break;
3832#ifdef TTY_256COLOR 4225 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4226 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4227 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4228 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4229 i += 2;
3838 } 4230 }
3839 break; 4231 break;
3840#endif
3841 case 49: /* default bg */ 4232 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4233 scr_color (Color_bg, Color_bg);
3843 break; 4234 break;
4235
4236 //case 50: // not variable spacing
3844 4237
3845#ifndef NO_BRIGHTCOLOR 4238#ifndef NO_BRIGHTCOLOR
3846 case 90: 4239 case 90:
3847 case 91: /* set bright fg color */ 4240 case 91: /* set bright fg color */
3848 case 92: 4241 case 92:
3849 case 93: 4242 case 93:
3850 case 94: 4243 case 94:
3851 case 95: 4244 case 95:
3852 case 96: 4245 case 96:
3853 case 97: 4246 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4247 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4248 break;
3857 case 100: 4249 case 100:
3858 case 101: /* set bright bg color */ 4250 case 101: /* set bright bg color */
3859 case 102: 4251 case 102:
3860 case 103: 4252 case 103:
3861 case 104: 4253 case 104:
3862 case 105: 4254 case 105:
3863 case 106: 4255 case 106:
3864 case 107: 4256 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4258 break;
3868#endif 4259#endif
3869 4260
3870 } 4261 }
3871 } 4262 }
… …
3878{ 4269{
3879 unicode_t ch, cmd = cmd_getc (); 4270 unicode_t ch, cmd = cmd_getc ();
3880 4271
3881 if (cmd == 'Q') 4272 if (cmd == 'Q')
3882 { /* query graphics */ 4273 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4274 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4275 return;
3885 } 4276 }
3886 /* swallow other graphics sequences until terminating ':' */ 4277 /* swallow other graphics sequences until terminating ':' */
3887 do 4278 do
3888 ch = cmd_getc (); 4279 ch = cmd_getc ();
… …
3903 unsigned char buf[256]; 4294 unsigned char buf[256];
3904 4295
3905 va_start (arg_ptr, fmt); 4296 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4298 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4299 tt_write (buf, strlen (buf));
3909} 4300}
3910 4301
3911/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
3912/* 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,
3913 * or generated by us in response to a query ESC sequence. 4304 * or generated by us in response to a query ESC sequence.
3914 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
3915void 4308void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3917{ 4310{
3918 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));
3919 4314
3920 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
3921 { 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
3922 if (v_buflen == 0) 4338 if (v_buflen == 0)
3923 { 4339 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4340 free (v_buffer);
3951 v_buffer = 0; 4341 v_buffer = 0;
3952 v_buflen = 0; 4342 v_buflen = 0;
3953 4343
3954 pty_ev.set (EVENT_READ); 4344 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4345 return;
3967 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
3969} 4353}
3970 4354
3971/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
3972 4356

Diff Legend

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