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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC

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

Diff Legend

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