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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.201 by root, Mon Feb 21 19:26:07 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;
… …
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 ();
… …
674 IMSendSpot (); 943 IMSendSpot ();
675#endif 944#endif
676 } 945 }
677 946
678 display->flush (); 947 display->flush ();
679
680 flush_ev.stop ();
681} 948}
682 949
683void 950void
684rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
685{ 952{
… …
761{ 1028{
762 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
763 || 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)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
766 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1; 1038 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1040 }
770} 1041}
… …
783 1054
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
787 1058
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
789 1060
790 if (n > 0) 1061 if (n > 0)
791 { 1062 {
792 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
793 return true; 1064 return true;
… …
802rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1074{
804 SET_R (this); 1075 SET_R (this);
805 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
806 1077
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1080 while (pty_fill ())
812 if (cmd_parse ()) 1081 if (cmd_parse ())
813 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
814} 1086}
815 1087
816void 1088void
817rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
818{ 1090{
… …
820 recolour_cursor (); 1092 recolour_cursor ();
821 1093
822#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1095 hidden_pointer = 0;
824 1096
825 if (Options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
826 pointer_ev.start (NOW + pointerBlankDelay); 1098 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1099#endif
828} 1100}
829 1101
830#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
831void 1103void
832rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
833{ 1105{
834 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
835 return; 1107 return;
836 1108
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
838 XFlush (display->display); 1110 XFlush (display->display);
839 1111
840 hidden_pointer = 1; 1112 hidden_pointer = 1;
841} 1113}
842 1114
… …
859 x = ev.x; 1131 x = ev.x;
860 y = ev.y; 1132 y = ev.y;
861 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
862 1134
863 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1136 button_number = 3;
866 }
867 else 1137 else
868 { 1138 {
869 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1141 if (button_number >= 3)
872 button_number += (64 - 3); 1142 button_number += (64 - 3);
873 } 1143 }
874 1144
875 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
876 { 1146 {
877 /* 1147 /*
878 * do not report ButtonRelease 1148 * do not report ButtonRelease
879 * no state info allowed 1149 * no state info allowed
880 */ 1150 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1169#endif
900
901 } 1170 }
902 1171
903#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1174 if (key_state & 16)
906 fputc ('C', stderr); 1175 fputc ('C', stderr);
907 if (key_state & 4) 1176 if (key_state & 4)
908 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1181 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1183 button_number,
915 x + 1, 1184 x + 1,
916 y + 1); 1185 y + 1);
917#else 1186#endif
1187
918 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
920 (32 + x + 1), 1190 (32 + x + 1),
921 (32 + y + 1)); 1191 (32 + y + 1));
922#endif
923} 1192}
924 1193
925#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
926void 1195void
927rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
934 1203
935/*{{{ process an X event */ 1204/*{{{ process an X event */
936void 1205void
937rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
938{ 1207{
1208 dDisp;
1209
939 SET_R (this); 1210 SET_R (this);
940 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
941 1212
942#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
944 { 1215 {
945 if (hidden_cursor) 1216 if (hidden_cursor)
946 { 1217 {
947 hidden_cursor = 0; 1218 hidden_cursor = 0;
948 want_refresh = 1; 1219 want_refresh = 1;
… …
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 } 1223 }
953#endif 1224#endif
954 1225
955#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 { 1228 {
958 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
959 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
960 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
961 if (hidden_pointer) 1232 if (hidden_pointer)
… …
964 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank (); 1236 pointer_blank ();
966 } 1237 }
967#endif 1238#endif
968 1239
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return;
972#endif
973
974 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1242 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1243
1027 switch (ev.type) 1244 switch (ev.type)
1028 { 1245 {
1029 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1030 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;
1031 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
1032 1315
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1318 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
1045 } 1321#endif
1046 break; 1322 break;
1047 } 1323 }
1048#endif
1049 1324
1050 case ButtonPress: 1325 case ButtonPress:
1051 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1052 break; 1327 break;
1053 1328
… …
1055 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1056 break; 1331 break;
1057 1332
1058 case ClientMessage: 1333 case ClientMessage:
1059 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1336 {
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1337 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1061 destroy (); 1338 destroy ();
1339#if ENABLE_EWMH
1340 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1341 XSendEvent (disp, ev.xclient.window = display->root,
1342 False, SubstructureRedirectMask | SubstructureNotifyMask,
1343 &ev);
1344#endif
1345 }
1346#if ENABLE_XEMBED
1347 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1348 {
1349 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1350 focus_in ();
1351 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1352 focus_out ();
1353 }
1354#endif
1062#ifdef OFFIX_DND 1355#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */ 1356 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1357 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile 1358 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir 1359 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink)) 1360 || ev.xclient.data.l[0] == DndLink))
1068 { 1361 {
1069 /* Get Dnd data */ 1362 /* Get Dnd data */
1070 Atom ActualType; 1363 Atom ActualType;
1071 int ActualFormat; 1364 int ActualFormat;
1072 unsigned char *data; 1365 unsigned char *data;
1073 unsigned long Size, RemainingBytes; 1366 unsigned long Size, RemainingBytes;
1074 1367
1075 XGetWindowProperty (display->display, display->root, 1368 XGetWindowProperty (disp, display->root,
1076 xa[XA_DNDSELECTION], 1369 xa[XA_DNDSELECTION],
1077 0L, 1000000L, 1370 0L, 1000000L,
1078 False, AnyPropertyType, 1371 False, AnyPropertyType,
1079 &ActualType, &ActualFormat, 1372 &ActualType, &ActualFormat,
1080 &Size, &RemainingBytes, 1373 &Size, &RemainingBytes,
1081 &data); 1374 &data);
1082 XChangeProperty (display->display, display->root, 1375 set_string_property (XA_CUT_BUFFER0, data);
1083 XA_CUT_BUFFER0, XA_STRING,
1084 8, PropModeReplace,
1085 data, STRLEN (data));
1086 XFree (data); 1376 XFree (data);
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1377 selection_paste (display->root, XA_CUT_BUFFER0, true);
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1378 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1089 } 1379 }
1090#endif /* OFFIX_DND */ 1380#endif /* OFFIX_DND */
1091 break; 1381 break;
1092 1382
1093 case MappingNotify: 1383 case MappingNotify:
… …
1118 break; 1408 break;
1119 } 1409 }
1120 break; 1410 break;
1121 1411
1122 case FocusIn: 1412 case FocusIn:
1123 if (!TermWin.focus) 1413 focus_in ();
1124 {
1125 TermWin.focus = 1;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 {
1138 PixColors = PixColorsFocused;
1139 set_colorfgbg ();
1140 scr_clear ();
1141 scr_touch (true);
1142 }
1143#endif
1144
1145 }
1146 break; 1414 break;
1147 1415
1148 case FocusOut: 1416 case FocusOut:
1149 if (TermWin.focus) 1417 focus_out ();
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break; 1418 break;
1174 1419
1175 case ConfigureNotify: 1420 case ConfigureNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1421 if (ev.xconfigure.window == TermWin.parent[0])
1177 { 1422 {
… …
1181 { /* Wrap lots of configures into one */ 1426 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width; 1427 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height; 1428 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 } 1430 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1187 1432
1188 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != width || szHint.height != height)
1434 {
1435 seen_resize = 1;
1189 resize_all_windows (width, height, 1); 1436 resize_all_windows (width, height, 1);
1437 }
1190 1438
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent) 1440 if (options & Opt_transparent)
1193 {
1194 check_our_parents (); 1441 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif 1442#endif
1199 } 1443 }
1444 break;
1445
1446 case PropertyNotify:
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450
1200 break; 1451 break;
1201 1452
1202 case SelectionClear: 1453 case SelectionClear:
1203 selection_clear (); 1454 selection_clear ();
1204 break; 1455 break;
1205 1456
1206 case SelectionNotify: 1457 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1458 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1460 break;
1211 1461
1212 case SelectionRequest: 1462 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1214 break; 1464 break;
… …
1238 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == TermWin.vt)
1239 { 1489 {
1240 do 1490 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1244 1494
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1496
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1250 1500
1251 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1252 } 1502 }
1253 else 1503 else
1254 { 1504 {
1255 XEvent unused_event; 1505 XEvent unused_event;
1256 1506
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1258 ; 1508 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1510 ;
1261 1511
1262 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1263 { 1513 {
1264 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1269 menubar_expose (); 1519 menubar_expose ();
1270#endif 1520#endif
1271 1521
1272#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1275#endif 1525#endif
1276 } 1526 }
1277 break; 1527 break;
1278 1528
1279 case MotionNotify: 1529 case MotionNotify:
… …
1286 { 1536 {
1287 menubar_control (ev.xbutton); 1537 menubar_control (ev.xbutton);
1288 break; 1538 break;
1289 } 1539 }
1290#endif 1540#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1292 break; 1542 break;
1293 1543
1294 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == TermWin.vt)
1295 { 1545 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1547 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1299 ; 1549 ;
1300 1550
1301 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, TermWin.vt,
1302 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1555 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1559 {
1310#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1313#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < TermWin.int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1316 { 1575 {
1317 int dist; 1576 int dist;
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1583
1325 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1327 */ 1586 */
1328 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1590
1333 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < TermWin.int_bwidth)
1335 { 1593 {
1336 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = TermWin.int_bwidth - ev.xbutton.y;
1338 } 1596 }
1339 else 1597 else
1340 { 1598 {
1341 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y -
1343 (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1344 } 1601 }
1602
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1347 MIN_IT (scroll_selection_lines, 1606 MIN_IT (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1349 } 1608 }
1350 else 1609 else
1351 { 1610 {
1352 /* we are within the text window, so we 1611 /* we are within the text window, so we
1353 * shouldn't be scrolling 1612 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1614 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1357 } 1616 }
1358#endif 1617#endif
1359#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1360
1361 } 1619 }
1362#endif 1620#endif
1363
1364 } 1621 }
1365 } 1622 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1624 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1369 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1370 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1371 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1633 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1635 scrollbar_size ());
1377 scr_refresh (refresh_type); 1636 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1637 refresh_limit = 0;
… …
1381 break; 1640 break;
1382 } 1641 }
1383} 1642}
1384 1643
1385void 1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!TermWin.focus)
1648 {
1649 TermWin.focus = 1;
1650 want_refresh = 1;
1651#ifdef USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#ifdef CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#ifdef OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (TermWin.focus)
1676 {
1677 TermWin.focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#ifdef USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#ifdef CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#ifdef OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1705#if TRANSPARENT
1706void
1386rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1708{
1388 SET_R (this); 1709 SET_R (this);
1389 SET_LOCALE (locale); 1710 SET_LOCALE (locale);
1390 1711
1391 switch (ev.type) 1712 switch (ev.type)
1392 { 1713 {
1393 case PropertyNotify: 1714 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1715 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1716 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1717 * use the property to determine the pixmap. We use it later on.
1406 */ 1718 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1721 return;
1412 }
1413 1722
1414 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1415 case ReparentNotify: 1724 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1726 want_refresh = want_full_refresh = 1;
1418 break; 1727 break;
1419#endif
1420 } 1728 }
1421} 1729}
1730#endif
1422 1731
1423void 1732void
1424rxvt_term::button_press (XButtonEvent &ev) 1733rxvt_term::button_press (XButtonEvent &ev)
1425{ 1734{
1426 int reportmode = 0, clickintime; 1735 int reportmode = 0, clickintime;
1427 1736
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1429 if (!bypass_keystate) 1738 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740
1431 /* 1741 /*
1432 * VT window processing of button press 1742 * VT window processing of button press
1433 */ 1743 */
1434 if (ev.window == TermWin.vt) 1744 if (ev.window == TermWin.vt)
1435 { 1745 {
1746#if ISO_14755
1747 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 {
1750 iso14755_54 (ev.x, ev.y);
1751 return;
1752 }
1753#endif
1754
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1755 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1756
1437 if (reportmode) 1757 if (reportmode)
1438 { 1758 {
1439 /* mouse report from vt window */ 1759 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1760 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1761 MEvent.state = ev.state;
… …
1470 } 1790 }
1471 else 1791 else
1472 { 1792 {
1473 if (ev.button != MEvent.button) 1793 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1794 MEvent.clicks = 0;
1795
1475 switch (ev.button) 1796 switch (ev.button)
1476 { 1797 {
1477 case Button1: 1798 case Button1:
1799 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */
1801#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask);
1803#else
1804 selection.rect = false;
1805#endif
1806
1478 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1480 { 1809 {
1481 if (MEvent.button == Button1 && clickintime) 1810 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1811 selection_rotate (ev.x, ev.y);
1483 else 1812 else
1484 selection_extend (ev.x, ev.y, 1); 1813 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1828 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1829 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1830 selection_rotate (ev.x, ev.y);
1502 else 1831 else
1503 selection_extend (ev.x, ev.y, 1); 1832 selection_extend (ev.x, ev.y, 1);
1833
1504 MEvent.button = Button3; 1834 MEvent.button = Button3;
1505 break; 1835 break;
1506 } 1836 }
1507 } 1837 }
1838
1508 MEvent.time = ev.time; 1839 MEvent.time = ev.time;
1509 return; 1840 return;
1510 } 1841 }
1511 1842
1512 /* 1843 /*
… …
1665{ 1996{
1666 int reportmode = 0; 1997 int reportmode = 0;
1667 1998
1668 csrO = 0; /* reset csr Offset */ 1999 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2000 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2001 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2002
1672 if (scrollbar_isUpDn ()) 2003 if (scrollbar_isUpDn ())
1673 { 2004 {
1674 scrollBar.setIdle (); 2005 scrollBar.setIdle ();
1675 scrollbar_show (0); 2006 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH; 2008 refresh_type &= ~SMOOTH_REFRESH;
1678#endif 2009#endif
1679
1680 } 2010 }
2011
1681#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1684#endif 2015#endif
2016
1685 if (ev.window == TermWin.vt) 2017 if (ev.window == TermWin.vt)
1686 { 2018 {
2019#if ISO_14755
2020 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return;
2023#endif
1687 if (reportmode) 2024 if (reportmode)
1688 { 2025 {
1689 /* mouse report from vt window */ 2026 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2027 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2028 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2042 MEvent.button = AnyButton;
1706 mouse_report (ev); 2043 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2044#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2045 return;
1709 } 2046 }
2047
1710 /* 2048 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2049 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2050 * when overriding mouse reporting
1713 */ 2051 */
1714 if (PrivateModes & PrivMode_mouse_report 2052 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2053 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2054 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2055 selection_extend (ev.x, ev.y, 0);
1718 2056
1719 switch (ev.button) 2057 switch (ev.button)
… …
1734 2072
1735 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
1736 2074
1737 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
1738 i = 1; 2076 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
1740 i = TermWin.nrow - 1; 2078 i = TermWin.nrow - 1;
1741 else 2079 else
1742 i = 5; 2080 i = 5;
1743 2081
1744# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
… …
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2136 int i;
1799 2137
1800 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
1801 2139
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2141
1804 /* for convenience */ 2142 /* for convenience */
1805 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2026 Atom atype; 2364 Atom atype;
2027 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2028 Window root, oldp, *list; 2366 Window root, oldp, *list;
2029 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2031 2370
2032 pchanged = 0; 2371 pchanged = 0;
2033 2372
2034 if (!(Options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2036 2375
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2039 2378
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2041 2380
2042 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2043 { 2382 {
2044 if (am_transparent) 2383 if (am_transparent)
2045 { 2384 {
2046 pchanged = 1; 2385 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2049 } 2388 }
2050 2389
2051 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2052 } 2391 }
2053 2392
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2394 XSync (disp, False);
2056 2395
2057 /* 2396 /*
2058 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
2061 */ 2400 */
2062 i = (xa[XA_XROOTPMAPID] 2401 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2066 2405
2067 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2072 2411
2073 if (!i || prop == NULL 2412 if (!i || prop == NULL
2074#if TINTING 2413#if TINTING
… …
2093 Window cr; 2432 Window cr;
2094 XImage *image; 2433 XImage *image;
2095 GC gc; 2434 GC gc;
2096 XGCValues gcvalue; 2435 XGCValues gcvalue;
2097 2436
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2441 nx = ny = 0;
2103 2442
… …
2115 sy = 0; 2454 sy = 0;
2116 } 2455 }
2117 2456
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2120 allowedxerror = -1; 2461 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2463
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2466 allowedxerror = 0;
2126 2467
… …
2129 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2130 { 2471 {
2131 pchanged = 1; 2472 pchanged = 1;
2132 if (TermWin.pixmap != None) 2473 if (TermWin.pixmap != None)
2133 { 2474 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, TermWin.pixmap);
2135 TermWin.pixmap = None; 2476 TermWin.pixmap = None;
2136 } 2477 }
2137 } 2478 }
2138 2479
2139 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2140 } 2481 }
2141 else 2482 else
2142 { 2483 {
2143 if (TermWin.pixmap != None) 2484 if (TermWin.pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, TermWin.pixmap);
2145 2486
2146#if TINTING 2487#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2489 {
2149 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2492
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2153 2494
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2155 } 2496 }
2156#endif 2497#endif
2157 2498
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2159 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2164 XDestroyImage (image); 2505 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, TermWin.parent[0]);
2167 2508
2168 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2510 pchanged = 1;
2170 2511
2171 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2172 } 2513 }
2173 } 2514 }
2174 2515
2175 if (!am_pixmap_trans) 2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2518 else
2176 { 2519 {
2177 unsigned int n; 2520 unsigned int n;
2178 /* 2521 /*
2179 * InheritPixmap transparency 2522 * InheritPixmap transparency
2180 */ 2523 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 { 2525 {
2184 oldp = TermWin.parent[i]; 2526 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2528 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2529 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2530
2190 if (TermWin.parent[i] == display->root) 2531 if (TermWin.parent[i] == display->root)
2191 { 2532 {
2192 if (oldp != None) 2533 if (oldp != None)
2193 pchanged = 1; 2534 pchanged = 1;
… …
2203 2544
2204 if (pchanged) 2545 if (pchanged)
2205 { 2546 {
2206 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2207 { 2548 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2551 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break; 2553 break;
2214 } 2554 }
2215 } 2555 }
2216 } 2556 }
2217 2557
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 { 2559 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2562 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2225 } 2564 }
2226 else 2565 else
2227 { 2566 {
2228#if WAIT_FOR_WM 2567#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing 2568 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1); 2570 sleep (1);
2232#endif 2571#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2235 { 2573 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, TermWin.parent[n]);
2238 } 2576 }
2239 2577
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2241 am_transparent = 1; 2579 am_transparent = 1;
2242 } 2580 }
2243 2581
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2583 TermWin.parent[i] = None;
2246 } 2584 }
2247 2585
2248 // this is experimental
2249 if (scrollBar.win) 2586 if (scrollBar.win)
2250 { 2587 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2254 scrollbar_show (0); 2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2255 } 2598 }
2256 2599
2257 return pchanged; 2600 return pchanged;
2258} 2601}
2259#endif 2602#endif
… …
2278 if (ch == NOCHAR) // TODO: improve 2621 if (ch == NOCHAR) // TODO: improve
2279 break; 2622 break;
2280 2623
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2625 {
2626 if (!seen_input)
2627 {
2628 seen_input = 1;
2629 // many badly-written programs (e.g. jed) contain a race condition:
2630 // they first read the screensize and then install a SIGWINCH handler.
2631 // some window managers resize the window early, and these programs
2632 // then sometimes get the size wrong.
2633 // unfortunately other programs are even more buggy and dislike
2634 // being sent SIGWINCH, so only do it when we were in fact being
2635 // resized.
2636 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH);
2638 }
2639
2283 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2642 bool refreshnow = false;
2286 int nlines = 0; 2643 int nlines = 0;
2287 unicode_t *str = buf; 2644 unicode_t *str = buf;
… …
2296 if (ch == C0_LF) 2653 if (ch == C0_LF)
2297 { 2654 {
2298 nlines++; 2655 nlines++;
2299 refresh_count++; 2656 refresh_count++;
2300 2657
2301 if (!(Options & Opt_jumpScroll) 2658 if (!(options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2660 {
2304 refreshnow = true; 2661 refreshnow = true;
2305 ch = NOCHAR; 2662 ch = NOCHAR;
2306 break; 2663 break;
… …
2333 * the number of pages between refreshes is refresh_limit, which 2690 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2691 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2692 */
2336 if (refreshnow) 2693 if (refreshnow)
2337 { 2694 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2696 refresh_limit++;
2340 else 2697 else
2341 { 2698 {
2342 flag = true; 2699 flag = true;
2343 scr_refresh (refresh_type); 2700 scr_refresh (refresh_type);
… …
2397 if (len == (size_t)-1) 2754 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2756
2400 // assume wchar == unicode 2757 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2758 cmdbuf_ptr += len;
2402 return wc; 2759 return wc & UNICODE_MASK;
2403 } 2760 }
2404 2761
2405 return NOCHAR; 2762 return NOCHAR;
2406} 2763}
2407 2764
… …
2533 process_escape_seq (); 2890 process_escape_seq ();
2534 break; 2891 break;
2535 case C0_ENQ: /* terminal Status */ 2892 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2893 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2539 else 2896 else
2540 tt_write ((unsigned char *)VT100_ANS, 2897 tt_write ((unsigned char *)VT100_ANS,
2541 (unsigned int)STRLEN (VT100_ANS)); 2898 (unsigned int)strlen (VT100_ANS));
2542 break; 2899 break;
2543 case C0_BEL: /* bell */ 2900 case C0_BEL: /* bell */
2544 scr_bell (); 2901 scr_bell ();
2545 break; 2902 break;
2546 case C0_BS: /* backspace */ 2903 case C0_BS: /* backspace */
… …
2645void 3002void
2646rxvt_term::process_escape_seq () 3003rxvt_term::process_escape_seq ()
2647{ 3004{
2648 unicode_t ch = cmd_getc (); 3005 unicode_t ch = cmd_getc ();
2649 3006
2650 if (PrivateModes & PrivMode_vt52) 3007 if (priv_modes & PrivMode_vt52)
2651 { 3008 {
2652 process_escape_vt52 (ch); 3009 process_escape_vt52 (ch);
2653 return; 3010 return;
2654 } 3011 }
2655 3012
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3027 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3028 break;
2672 case '+': 3029 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3030 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3031 break;
2675#ifndef NO_FRILLS 3032#if ENABLE_FRILLS
2676 case '6': 3033 case '6':
2677 scr_backindex (); 3034 scr_backindex ();
2678 break; 3035 break;
2679#endif 3036#endif
2680 case '7': 3037 case '7':
2681 scr_cursor (SAVE); 3038 scr_cursor (SAVE);
2682 break; 3039 break;
2683 case '8': 3040 case '8':
2684 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
2685 break; 3042 break;
2686#ifndef NO_FRILLS 3043#if ENABLE_FRILLS
2687 case '9': 3044 case '9':
2688 scr_forwardindex (); 3045 scr_forwardindex ();
2689 break; 3046 break;
2690#endif 3047#endif
2691 case '=': 3048 case '=':
… …
2870 { 3227 {
2871 switch (priv) 3228 switch (priv)
2872 { 3229 {
2873 case '>': 3230 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 3231 if (ch == CSI_DA) /* secondary device attributes */
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3232 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2876 break; 3233 break;
2877 case '?': 3234 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3235 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3236 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3237 break;
… …
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2991 break; 3348 break;
2992 3349
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3351 tt_write ((const unsigned char *)VT100_ANS,
2995 (unsigned int) (sizeof (VT100_ANS) - 1)); 3352 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3353 break;
2997 3354
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3356 process_sgr_mode (nargs, arg);
3000 break; 3357 break;
… …
3007 break; 3364 break;
3008 case 6: /* CPR requested */ 3365 case 6: /* CPR requested */
3009 scr_report_position (); 3366 scr_report_position ();
3010 break; 3367 break;
3011 case 7: /* unofficial extension */ 3368 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3369 if (options & Opt_insecure)
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3370 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3371 break;
3015 case 8: /* unofficial extension */ 3372 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3374 break;
3018 } 3375 }
… …
3054 break; 3411 break;
3055 3412
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3413 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3414 if (arg[0] == 4)
3058 scr_insert_mode (0); 3415 scr_insert_mode (0);
3416 else if (arg[0] == 20)
3417 priv_modes &= ~PrivMode_LFNL;
3059 break; 3418 break;
3060 3419
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3420 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3421 if (arg[0] == 4)
3063 scr_insert_mode (1); 3422 scr_insert_mode (1);
3423 else if (arg[0] == 20)
3424 priv_modes |= PrivMode_LFNL;
3064 break; 3425 break;
3065 3426
3066 /* 3427 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3428 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3429 */
… …
3080 break; 3441 break;
3081 case CSI_75: 3442 case CSI_75:
3082 scr_cursor (RESTORE); 3443 scr_cursor (RESTORE);
3083 break; 3444 break;
3084 3445
3085#ifndef NO_FRILLS 3446#if ENABLE_FRILLS
3086 case CSI_74: 3447 case CSI_74:
3087 process_window_ops (arg, nargs); 3448 process_window_ops (arg, nargs);
3088 break; 3449 break;
3089#endif 3450#endif
3090 3451
… …
3097 break; 3458 break;
3098 } 3459 }
3099} 3460}
3100/*}}} */ 3461/*}}} */
3101 3462
3102#ifndef NO_FRILLS 3463#if ENABLE_FRILLS
3103/* ARGSUSED */ 3464/* ARGSUSED */
3104void 3465void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3466rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3467{
3107 int x, y; 3468 int x, y;
3108 XWindowAttributes wattr; 3469 XWindowAttributes wattr;
3109 Window wdummy; 3470 Window wdummy;
3471 dDisp;
3110 3472
3111 if (nargs == 0) 3473 if (nargs == 0)
3112 return; 3474 return;
3113 3475
3114 switch (args[0]) 3476 switch (args[0])
3115 { 3477 {
3116 /* 3478 /*
3117 * commands 3479 * commands
3118 */ 3480 */
3119 case 1: /* deiconify window */ 3481 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3482 XMapWindow (disp, TermWin.parent[0]);
3121 break; 3483 break;
3122 case 2: /* iconify window */ 3484 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3485 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3486 break;
3126 case 3: /* set position (pixels) */ 3487 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3128 break; 3489 break;
3129 case 4: /* set size (pixels) */ 3490 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3492 break;
3132 case 5: /* raise window */ 3493 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3494 XRaiseWindow (disp, TermWin.parent[0]);
3134 break; 3495 break;
3135 case 6: /* lower window */ 3496 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3497 XLowerWindow (disp, TermWin.parent[0]);
3137 break; 3498 break;
3138 case 7: /* refresh window */ 3499 case 7: /* refresh window */
3139 scr_touch (true); 3500 scr_touch (true);
3140 break; 3501 break;
3141 case 8: /* set size (chars) */ 3502 case 8: /* set size (chars) */
… …
3153 3514
3154 /* 3515 /*
3155 * reports - some output format copied from XTerm 3516 * reports - some output format copied from XTerm
3156 */ 3517 */
3157 case 11: /* report window state */ 3518 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3521 break;
3161 case 13: /* report window position */ 3522 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3525 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3526 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3527 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3528 break;
3168 case 14: /* report window size (pixels) */ 3529 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3532 break;
3172 case 18: /* report text area size (chars) */ 3533 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3174 break; 3535 break;
3175 case 19: /* report window size (chars) */ 3536 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break; 3538 break;
3178 case 20: /* report icon label */ 3539 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3540 {
3181 char *s; 3541 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3542 XGetIconName (disp, TermWin.parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s);
3184 } 3545 }
3185 break; 3546 break;
3186 case 21: /* report window title */ 3547 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3548 {
3189 char *s; 3549 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3550 XFetchName (disp, TermWin.parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s);
3192 } 3553 }
3193 break; 3554 break;
3194 } 3555 }
3195} 3556}
3196#endif 3557#endif
3197 3558
… …
3201 * ends_how is terminator used. returned input must be free()'d 3562 * ends_how is terminator used. returned input must be free()'d
3202 */ 3563 */
3203unsigned char * 3564unsigned char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3565rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3566{
3206 unicode_t prev = 0, ch; 3567 unicode_t ch;
3568 bool seen_esc = false;
3207 unsigned int n = 0; 3569 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3570 wchar_t string[STRING_MAX];
3210 3571
3211 while ((ch = cmd_getc ()) != NOCHAR) 3572 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3573 {
3213 if (prev == C0_ESC) 3574 if (seen_esc)
3214 { 3575 {
3215 if (ch == 0x5c) /* 7bit ST */ 3576 if (ch == 0x5c) /* 7bit ST */
3216 break; 3577 break;
3217 else 3578 else
3218 return NULL; 3579 return NULL;
3219 } 3580 }
3581 else if (ch == C0_ESC)
3582 {
3583 seen_esc = true;
3584 continue;
3585 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3586 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3587 break;
3222 else if (ch < 0x20) 3588 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3589 return NULL; /* other control character - exit */
3590
3591 seen_esc = false;
3224 3592
3225 if (n >= sizeof (string) - 1) 3593 if (n >= sizeof (string) - 1)
3226 // stop at some sane length 3594 // stop at some sane length
3227 return NULL; 3595 return NULL;
3228 3596
3229 if (ch == C0_SYN) 3597 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3598 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3599 else
3235 string[n++] = prev = ch; 3600 string[n++] = ch;
3236 } 3601 }
3237 3602
3238 string[n++] = '\0'; 3603 string[n++] = '\0';
3239 3604
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3605 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3606
3245 return s; 3607 return (unsigned char *)rxvt_wcstombs (string);
3246} 3608}
3247 3609
3248/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
3249/* 3611/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3294void 3656void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{ 3658{
3297 if (str[0] == '?' && !str[1]) 3659 if (str[0] == '?' && !str[1])
3298 { 3660 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3661 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3662 pix_colors_focused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3663 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3664 }
3306 else 3665 else
3307 set_window_color (color, str); 3666 set_window_color (color, str);
3308} 3667}
3309 3668
3310/* 3669/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3671 */
3335void 3672void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3673rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3337{ 3674{
3338 int changed = 0; 3675 int changed = 0;
3339 int color; 3676 int color;
3340 char *buf, *name; 3677 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3678 bool query = str[0] == '?' && !str[1];
3679 int saveop = op;
3680 dDisp;
3342 3681
3343 assert (str != NULL); 3682 assert (str != NULL);
3344 switch (op) 3683 switch (op)
3345 { 3684 {
3346 case XTerm_name: 3685 case XTerm_name:
… …
3353 set_title (str); 3692 set_title (str);
3354 break; 3693 break;
3355 case XTerm_property: 3694 case XTerm_property:
3356 if (str[0] == '?') 3695 if (str[0] == '?')
3357 { 3696 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3697 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3698 Atom actual_type;
3360 int actual_format; 3699 int actual_format;
3361 unsigned long nitems; 3700 unsigned long nitems;
3362 unsigned long bytes_after; 3701 unsigned long bytes_after;
3363 unsigned char *value = 0; 3702 unsigned char *value = 0;
3364 const char *str = ""; 3703 const char *str = "";
3365 3704
3366 if (prop 3705 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3706 && XGetWindowProperty (disp, TermWin.parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3707 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3708 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3709 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3710 && actual_type != None
3372 && actual_format == 8) 3711 && actual_format == 8)
… …
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3720 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3721
3383 if (eq) 3722 if (eq)
3384 { 3723 {
3385 *eq = 0; 3724 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3725 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3726 }
3391 else 3727 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3728 XDeleteProperty (disp, TermWin.parent[0],
3393 display->atom (str)); 3729 display->atom (str));
3394 } 3730 }
3395 break; 3731 break;
3396 3732
3397 case XTerm_Color: 3733 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3734 for (buf = (char *)str; buf && *buf;)
3399 { 3735 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3736 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3737 break;
3402 3738
3403 *name++ = '\0'; 3739 *name++ = '\0';
3404 color = atoi (buf); 3740 color = atoi (buf);
3405 3741
3406 if (color < 0 || color >= TOTAL_COLORS) 3742 if (color < 0 || color >= TOTAL_COLORS)
3407 break; 3743 break;
3408 3744
3409 if ((buf = STRCHR (name, ';')) != NULL) 3745 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3746 *buf++ = '\0';
3411 3747
3412 if (name[0] == '?' && !name[1]) 3748 if (name[0] == '?' && !name[1])
3413 { 3749 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3750 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3751 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3752 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3753 }
3421 else 3754 else
3422 set_window_color (color + minCOLOR, name); 3755 set_window_color (color + minCOLOR, name);
3423 } 3756 }
3424 break; 3757 break;
… …
3446 case XTerm_Color_UL: 3779 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3780 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break; 3781 break;
3449 case XTerm_Color_RV: 3782 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3783 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3784 break;
3785 case URxvt_Color_IT:
3786 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3787 break;
3788#endif
3789#if TRANSPARENT && TINTING
3790 case URxvt_Color_tint:
3791 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3792 check_our_parents ();
3793 if (am_transparent)
3794 want_full_refresh = want_refresh = 1;
3451 break; 3795 break;
3452#endif 3796#endif
3453 3797
3454 case XTerm_Pixmap: 3798 case XTerm_Pixmap:
3455 if (*str != ';') 3799 if (*str != ';')
… …
3458 scale_pixmap (""); /* reset to default scaling */ 3802 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3803 set_bgPixmap (str); /* change pixmap */
3460#endif 3804#endif
3461 scr_touch (true); 3805 scr_touch (true);
3462 } 3806 }
3463 while ((str = STRCHR (str, ';')) != NULL) 3807 while ((str = strchr (str, ';')) != NULL)
3464 { 3808 {
3465 str++; 3809 str++;
3466#if XPM_BACKGROUND 3810#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3811 changed += scale_pixmap (str);
3468#endif 3812#endif
3469
3470 } 3813 }
3814
3471 if (changed) 3815 if (changed)
3472 { 3816 {
3473#ifdef XPM_BACKGROUND 3817#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3818 resize_pixmap ();
3475#endif 3819#endif
… …
3486 3830
3487 case XTerm_logfile: 3831 case XTerm_logfile:
3488 // TODO, when secure mode? 3832 // TODO, when secure mode?
3489 break; 3833 break;
3490 3834
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR 3835#ifdef MENUBAR
3532 case XTerm_Menu: 3836 case URxvt_Menu:
3533 if (Options & Opt_insecure) 3837 if (options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3839 break;
3536#endif 3840#endif
3537#if 0 3841#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3842 case XTerm_dumpscreen: /* no error notices */
… …
3542 { 3846 {
3543 scr_dump (fd); 3847 scr_dump (fd);
3544 close (fd); 3848 close (fd);
3545 } 3849 }
3546 } 3850 }
3851 break;
3852#endif
3853 case XTerm_font:
3854 op = URxvt_font;
3855 case URxvt_font:
3856#if ENABLE_STYLES
3857 case URxvt_boldFont:
3858 case URxvt_italicFont:
3859 case URxvt_boldItalicFont:
3860#endif
3861 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3865 resp);
3866 else
3867 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869
3870 res = strdup (str);
3871 allocated.push_back ((void *)res);
3872 set_fonts ();
3873 }
3874 break;
3875
3876#if ENABLE_FRILLS
3877 case URxvt_locale:
3878 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3880 else
3881 {
3882 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8);
3884 init_xlocale ();
3885 }
3886 break;
3887
3888 case URxvt_view_up:
3889 case URxvt_view_down:
3890 int lines = atoi (str);
3891
3892 if (lines)
3893 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894 else
3895 {
3896 scr_erase_savelines ();
3897 }
3898
3547 break; 3899 break;
3548#endif 3900#endif
3549 } 3901 }
3550} 3902}
3551/*----------------------------------------------------------------------*/ 3903/*----------------------------------------------------------------------*/
… …
3565{ 3917{
3566 int state; 3918 int state;
3567 3919
3568 if (mode == 's') 3920 if (mode == 's')
3569 { 3921 {
3570 SavedModes |= (PrivateModes & bit); 3922 SavedModes |= (priv_modes & bit);
3571 return -1; 3923 return -1;
3572 } 3924 }
3573 else 3925 else
3574 { 3926 {
3575 if (mode == 'r') 3927 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3928 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3929 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3930 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3931 PrivMode (state, bit);
3580 } 3932 }
3581 3933
3582 return state; 3934 return state;
3583} 3935}
… …
3601 { 3, PrivMode_132 }, 3953 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3954 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3955 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3956 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3957 { 7, PrivMode_Autowrap },
3958 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3959 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3960#ifdef menuBar_esc
3608 { menuBar_esc, PrivMode_menuBar }, 3961 { menuBar_esc, PrivMode_menuBar },
3609#endif 3962#endif
3963 // 18, 19 printing-related
3964 { 25, PrivMode_VisibleCursor },
3610#ifdef scrollBar_esc 3965#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3966 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3967#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3968 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3969 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3970 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3971 // 45 margin bell NYI
3620 // 46 start logging 3972 // 46 start logging
… …
3661 4013
3662 /* extra handling for values with state unkept */ 4014 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4015 switch (arg[i])
3664 { 4016 {
3665 case 1048: /* alternative cursor save */ 4017 case 1048: /* alternative cursor save */
4018 case 1049:
3666 if (Options & Opt_secondaryScreen) 4019 if (options & Opt_secondaryScreen)
3667 if (mode == 0) 4020 if (mode == 0)
3668 scr_cursor (RESTORE); 4021 scr_cursor (RESTORE);
3669 else if (mode == 1) 4022 else if (mode == 1)
3670 scr_cursor (SAVE); 4023 scr_cursor (SAVE);
3671 break; 4024 break;
… …
3682 * within VT52 mode 4035 * within VT52 mode
3683 */ 4036 */
3684 PrivMode (1, PrivMode_vt52); 4037 PrivMode (1, PrivMode_vt52);
3685 break; 4038 break;
3686 case 3: /* 80/132 */ 4039 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4040 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3689 break; 4042 break;
3690 case 4: /* smooth scrolling */ 4043 case 4: /* smooth scrolling */
3691 if (state) 4044 if (state)
3692 Options &= ~Opt_jumpScroll; 4045 options &= ~Opt_jumpScroll;
3693 else 4046 else
3694 Options |= Opt_jumpScroll; 4047 options |= Opt_jumpScroll;
3695 break; 4048 break;
3696 case 5: /* reverse video */ 4049 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4050 scr_rvideo_mode (state);
3698 break; 4051 break;
3699 case 6: /* relative/absolute origins */ 4052 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4056 scr_autowrap (state);
3704 break; 4057 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4058 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4059 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4060 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4061 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4062 break;
3710#ifdef menuBar_esc 4063#ifdef menuBar_esc
3711 case menuBar_esc: 4064 case menuBar_esc:
3712#ifdef MENUBAR 4065#ifdef MENUBAR
3713 map_menuBar (state); 4066 map_menuBar (state);
… …
3733 break; 4086 break;
3734 /* case 66: - application key pad */ 4087 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4088 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4089 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4090 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4091 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4092 break;
3740#if 0 4093#if 0
3741 case 1001: 4094 case 1001:
3742 break; /* X11 mouse highlighting */ 4095 break; /* X11 mouse highlighting */
3743#endif 4096#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4097 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state) 4098 if (state)
3746 Options &= ~Opt_scrollTtyOutput; 4099 options &= ~Opt_scrollTtyOutput;
3747 else 4100 else
3748 Options |= Opt_scrollTtyOutput; 4101 options |= Opt_scrollTtyOutput;
3749 break; 4102 break;
3750 case 1011: /* scroll to bottom on key press */ 4103 case 1011: /* scroll to bottom on key press */
3751 if (state) 4104 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4105 options |= Opt_scrollTtyKeypress;
3753 else 4106 else
3754 Options &= ~Opt_scrollTtyKeypress; 4107 options &= ~Opt_scrollTtyKeypress;
3755 break; 4108 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4109 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4110 if (options & Opt_secondaryScreen)
3758 if (current_screen != PRIMARY) 4111 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4112 scr_erase_screen (2);
3760 scr_change_screen (state); 4113 scr_change_screen (state);
3761 break; 4114 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4115 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4116 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4117 if (options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY) 4118 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4119 scr_erase_screen (2);
3767 break; 4120 break;
3768 default: 4121 default:
3769 break; 4122 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4148 rendset = 0, rendstyle = ~RS_None;
3796 break; 4149 break;
3797 case 1: 4150 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4151 rendset = 1, rendstyle = RS_Bold;
3799 break; 4152 break;
3800 //case 2: // faint or second colour 4153 //case 2: // low intensity
4154 case 3:
4155 rendset = 1, rendstyle = RS_Italic;
4156 break;
3801 case 4: 4157 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4158 rendset = 1, rendstyle = RS_Uline;
3803 break; 4159 break;
3804 case 5: // slowly blinking 4160 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4161 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4173 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4174 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4175 //...
3820 //case 19: // ninth alt font 4176 //case 19: // ninth alt font
3821 //case 20: // gothic 4177 //case 20: // gothic
3822 case 21: // disable bold, faint 4178 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4179 rendset = 0, rendstyle = RS_Bold;
3824 break; 4180 break;
3825 case 22: 4181 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4182 rendset = 0, rendstyle = RS_Bold;
3827 break; 4183 break;
3828 //case 23: disable italic 4184 case 23: // disable italic
4185 rendset = 0, rendstyle = RS_Italic;
4186 break;
3829 case 24: 4187 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4188 rendset = 0, rendstyle = RS_Uline;
3831 break; 4189 break;
3832 case 25: 4190 case 25:
4191 rendset = 0, rendstyle = RS_Blink;
4192 break;
4193 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4194 rendset = 0, rendstyle = RS_Blink;
3834 break; 4195 break;
3835 case 27: 4196 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4197 rendset = 0, rendstyle = RS_RVid;
3837 break; 4198 break;
… …
3855 case 35: 4216 case 35:
3856 case 36: 4217 case 36:
3857 case 37: 4218 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4220 break;
3860#ifdef TTY_256COLOR 4221 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4223 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4225 i += 2;
3866 } 4226 }
3867 break; 4227 break;
3868#endif
3869 case 39: /* default fg */ 4228 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4229 scr_color (Color_fg, Color_fg);
3871 break; 4230 break;
3872 4231
3873 case 40: 4232 case 40:
… …
3878 case 45: 4237 case 45:
3879 case 46: 4238 case 46:
3880 case 47: 4239 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4240 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4241 break;
3883#ifdef TTY_256COLOR 4242 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4243 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4244 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4245 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4246 i += 2;
3889 } 4247 }
3890 break; 4248 break;
3891#endif
3892 case 49: /* default bg */ 4249 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4250 scr_color (Color_bg, Color_bg);
3894 break; 4251 break;
4252
4253 //case 50: // not variable spacing
3895 4254
3896#ifndef NO_BRIGHTCOLOR 4255#ifndef NO_BRIGHTCOLOR
3897 case 90: 4256 case 90:
3898 case 91: /* set bright fg color */ 4257 case 91: /* set bright fg color */
3899 case 92: 4258 case 92:
3900 case 93: 4259 case 93:
3901 case 94: 4260 case 94:
3902 case 95: 4261 case 95:
3903 case 96: 4262 case 96:
3904 case 97: 4263 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4264 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4265 break;
3908 case 100: 4266 case 100:
3909 case 101: /* set bright bg color */ 4267 case 101: /* set bright bg color */
3910 case 102: 4268 case 102:
3911 case 103: 4269 case 103:
3912 case 104: 4270 case 104:
3913 case 105: 4271 case 105:
3914 case 106: 4272 case 106:
3915 case 107: 4273 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4275 break;
3919#endif 4276#endif
3920 4277
3921 } 4278 }
3922 } 4279 }
… …
3929{ 4286{
3930 unicode_t ch, cmd = cmd_getc (); 4287 unicode_t ch, cmd = cmd_getc ();
3931 4288
3932 if (cmd == 'Q') 4289 if (cmd == 'Q')
3933 { /* query graphics */ 4290 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4291 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4292 return;
3936 } 4293 }
3937 /* swallow other graphics sequences until terminating ':' */ 4294 /* swallow other graphics sequences until terminating ':' */
3938 do 4295 do
3939 ch = cmd_getc (); 4296 ch = cmd_getc ();
… …
3954 unsigned char buf[256]; 4311 unsigned char buf[256];
3955 4312
3956 va_start (arg_ptr, fmt); 4313 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4314 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4315 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4316 tt_write (buf, strlen (buf));
3960} 4317}
3961 4318
3962/* ---------------------------------------------------------------------- */ 4319/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4320/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4321 * or generated by us in response to a query ESC sequence.
3965 */ 4322 */
4323const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4324
3966void 4325void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4326rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3968{ 4327{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4328 if (v_buflen == 0)
4329 {
4330 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3970 4331
3971 if (len) 4332 if ((unsigned int)written == len)
4333 return;
4334
4335 data += written;
4336 len -= written;
3972 { 4337 }
4338
4339 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4340
4341 memcpy (v_buffer + v_buflen, data, len);
4342 v_buflen += len;
4343
4344 pty_ev.set (EVENT_READ | EVENT_WRITE);
4345}
4346
4347void rxvt_term::pty_write ()
4348{
4349 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4350
4351 if (written > 0)
4352 {
4353 v_buflen -= written;
4354
3973 if (v_buflen == 0) 4355 if (v_buflen == 0)
3974 { 4356 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4357 free (v_buffer);
4002 v_buffer = 0; 4358 v_buffer = 0;
4003 v_buflen = 0; 4359 v_buflen = 0;
4004 4360
4005 pty_ev.set (EVENT_READ); 4361 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4362 return;
4018 } 4363 }
4364
4365 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4366 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this...
4369 destroy ();
4020} 4370}
4021 4371
4022/*----------------------- end-of-file (C source) -----------------------*/ 4372/*----------------------- end-of-file (C source) -----------------------*/
4023 4373

Diff Legend

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