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

Diff Legend

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