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.179 by root, Wed Dec 15 05:39:08 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
… …
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 <wchar.h>
54#include <signal.h>
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;
… …
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
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
665 scr_touch (false); 923 scr_touch (false);
666 want_refresh = 1;
667 } 924 }
668#endif 925#endif
669 926
670 if (want_refresh) 927 if (want_refresh)
671 { 928 {
672 scr_refresh (refresh_type); 929 scr_refresh (refresh_type);
673 scrollbar_show (1); 930 scrollbar_show (1);
674#ifdef USE_XIM 931#ifdef USE_XIM
675 IMSendSpot (); 932 IMSendSpot ();
676#endif 933#endif
677
678 } 934 }
679 935
680 display->flush (); 936 display->flush ();
681} 937}
682 938
… …
684rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
685{ 941{
686 SET_R (this); 942 SET_R (this);
687 SET_LOCALE (locale); 943 SET_LOCALE (locale);
688 944
945 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949}
950
951void
952rxvt_term::flush_cb (time_watcher &w)
953{
954 SET_R (this);
955 SET_LOCALE (locale);
956
957 refresh_limit = 1;
958 refresh_count = 0;
689 flush (); 959 flush ();
690} 960}
691 961
692#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
693void 963void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 982 }
713} 983}
714#endif 984#endif
715 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
716bool 1029bool
717rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
718{ 1031{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033
1034 if (CBUFSIZ == n)
1035 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0;
1038 }
720 1039
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
724 1043
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1045
727 if (n > 0) 1046 if (n > 0)
728 { 1047 {
729 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
730 return true; 1049 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1059{
741 SET_R (this); 1060 SET_R (this);
742 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
743 1062
1063 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ())
1066 if (cmd_parse ())
1067 break;
1068
744 if (revents & EVENT_WRITE) 1069 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1070 pty_write ();
746 else if (revents & EVENT_READ) 1071}
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 1072
760 if (cmd_parse ()) 1073void
761 break; 1074rxvt_term::pointer_unblank ()
762 } 1075{
763 } 1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1077 recolour_cursor ();
1078
1079#ifdef POINTER_BLANK
1080 hidden_pointer = 0;
1081
1082 if (options & Opt_pointerBlank)
1083 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif
764} 1085}
765 1086
766#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
767void 1088void
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 () 1089rxvt_term::pointer_blank ()
781{ 1090{
782 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
783 return; 1092 return;
784 1093
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1095 XFlush (display->display);
787 1096
… …
807 x = ev.x; 1116 x = ev.x;
808 y = ev.y; 1117 y = ev.y;
809 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
810 1119
811 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1121 button_number = 3;
814 }
815 else 1122 else
816 { 1123 {
817 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1126 if (button_number >= 3)
820 button_number += (64 - 3); 1127 button_number += (64 - 3);
821 } 1128 }
822 1129
823 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
824 { 1131 {
825 /* 1132 /*
826 * do not report ButtonRelease 1133 * do not report ButtonRelease
827 * no state info allowed 1134 * no state info allowed
828 */ 1135 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1154#endif
848
849 } 1155 }
850 1156
851#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1159 if (key_state & 16)
854 fputc ('C', stderr); 1160 fputc ('C', stderr);
855 if (key_state & 4) 1161 if (key_state & 4)
856 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1166 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1168 button_number,
863 x + 1, 1169 x + 1,
864 y + 1); 1170 y + 1);
865#else 1171#endif
1172
866 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
868 (32 + x + 1), 1175 (32 + x + 1),
869 (32 + y + 1)); 1176 (32 + y + 1));
870#endif
871} 1177}
872 1178
873#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
874void 1180void
875rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1192{
887 SET_R (this); 1193 SET_R (this);
888 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
889 1195
890#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1198 {
893 if (hidden_cursor) 1199 if (hidden_cursor)
894 { 1200 {
895 hidden_cursor = 0; 1201 hidden_cursor = 0;
896 want_refresh = 1; 1202 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1206 }
901#endif 1207#endif
902 1208
903#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1211 {
906 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1215 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1219 pointer_blank ();
914 } 1220 }
915#endif 1221#endif
916 1222
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1225 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 1226
975 switch (ev.type) 1227 switch (ev.type)
976 { 1228 {
977 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
978 lookup_key (ev.xkey); 1233 lookup_key (ev.xkey);
1234
1235 break;
1236
1237 case KeyRelease:
1238 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
979 break; 1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
980 1298
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
986 else 1304#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; 1305 break;
995 } 1306 }
996#endif
997 1307
998 case ButtonPress: 1308 case ButtonPress:
999 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
1000 break; 1310 break;
1001 1311
… …
1013 && (ev.xclient.data.l[0] == DndFile 1323 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1324 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1325 || ev.xclient.data.l[0] == DndLink))
1016 { 1326 {
1017 /* Get Dnd data */ 1327 /* Get Dnd data */
1018 Atom ActualType; 1328 Atom ActualType;
1019 int ActualFormat; 1329 int ActualFormat;
1020 unsigned char *data; 1330 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1331 unsigned long Size, RemainingBytes;
1022 1332
1023 XGetWindowProperty (display->display, display->root, 1333 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1334 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1335 0L, 1000000L,
1026 False, AnyPropertyType, 1336 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1029 &data); 1339 &data);
1030 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1341 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1344 }
1037#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1038 break; 1346 break;
1039 1347
1040 case MappingNotify: 1348 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1349 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1350 break;
1043 1351
1044 /* 1352 /*
1045 * XXX: this is not the _current_ arrangement 1353 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1354 * Here's my conclusion:
… …
1071 { 1379 {
1072 TermWin.focus = 1; 1380 TermWin.focus = 1;
1073 want_refresh = 1; 1381 want_refresh = 1;
1074#ifdef USE_XIM 1382#ifdef USE_XIM
1075 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1077#endif 1388#endif
1078#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1081#endif 1399#endif
1082 1400
1083 } 1401 }
1084 break; 1402 break;
1085 1403
1086 case FocusOut: 1404 case FocusOut:
1087 if (TermWin.focus) 1405 if (TermWin.focus)
1088 { 1406 {
1089 TermWin.focus = 0; 1407 TermWin.focus = 0;
1090 want_refresh = 1; 1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1091#ifdef USE_XIM 1416#ifdef USE_XIM
1092 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1094#endif 1419#endif
1095#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1423 hidden_cursor = 0;
1099#endif 1424#endif
1100 1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1101 } 1432 }
1102 break; 1433 break;
1103 1434
1104 case ConfigureNotify: 1435 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1445 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1447
1117 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1118 { 1449 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1450 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1121 } 1452 }
1122#ifdef DEBUG_SIZE 1453
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1456 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1457#endif
1136
1137 } 1458 }
1459 break;
1460
1461 case PropertyNotify:
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1138 break; 1466 break;
1139 1467
1140 case SelectionClear: 1468 case SelectionClear:
1141 selection_clear (); 1469 selection_clear ();
1142 break; 1470 break;
1143 1471
1144 case SelectionNotify: 1472 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1475 break;
1149 1476
1150 case SelectionRequest: 1477 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1152 break; 1479 break;
… …
1173 1500
1174 case GraphicsExpose: 1501 case GraphicsExpose:
1175 case Expose: 1502 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1503 if (ev.xany.window == TermWin.vt)
1177 { 1504 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1505 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1506 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1507 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1509
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1515
1186 // ev.xexpose.width, TermWin.height, False); 1516 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1517 }
1190 else 1518 else
1191 { 1519 {
1192 XEvent unused_event; 1520 XEvent unused_event;
1193 1521
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1523 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1525 ;
1199 &unused_event)) ; 1526
1200 if (isScrollbarWindow (ev.xany.window)) 1527 if (isScrollbarWindow (ev.xany.window))
1201 { 1528 {
1202 scrollBar.setIdle (); 1529 scrollBar.setIdle ();
1203 scrollbar_show (0); 1530 scrollbar_show (0);
1204 } 1531 }
1205#ifdef MENUBAR 1532#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1534 menubar_expose ();
1208#endif 1535#endif
1536
1537#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window);
1540#endif
1209 } 1541 }
1210 break; 1542 break;
1211 1543
1212 case MotionNotify: 1544 case MotionNotify:
1213#ifdef POINTER_BLANK 1545#ifdef POINTER_BLANK
… …
1219 { 1551 {
1220 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1221 break; 1553 break;
1222 } 1554 }
1223#endif 1555#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1557 break;
1226 1558
1227 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1228 { 1560 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1562 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1232 ; 1564 ;
1233 1565
1234 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1235 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1570 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1574 {
1243#endif 1575#endif
1576#if ISO_14755
1577 // 5.4
1578 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1579 {
1580 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1581 break;
1582 }
1583#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1246#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1590 {
1250 int dist; 1591 int dist;
1251 1592
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1593 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1594 * already in the middle of scrolling.
1256 */ 1595 */
1257 if (scroll_selection_delay<=0) 1596 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1598
1260 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1262 */ 1601 */
1263 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1605
1268 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1270 { 1608 {
1271 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1611 }
1274 else 1612 else
1275 { 1613 {
1276 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1616 }
1617
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1282 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1284 } 1623 }
1285 else 1624 else
1286 { 1625 {
1287 /* we are within the text window, so we 1626 /* we are within the text window, so we
1288 * shouldn't be scrolling 1627 * shouldn't be scrolling
1289 */ 1628 */
1290 pending_scroll_selection = 0; 1629 if (sel_scroll_ev.active)
1630 sel_scroll_ev.stop();
1291 } 1631 }
1292#endif 1632#endif
1293#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1294
1295 } 1634 }
1296#endif 1635#endif
1297
1298 } 1636 }
1299 } 1637 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1639 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1303 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1304 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1305 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1648 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1650 scrollbar_size ());
1311 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1314 } 1654 }
1315 break; 1655 break;
1316 } 1656 }
1317} 1657}
1318 1658
1659#if TRANSPARENT
1319void 1660void
1320rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1662{
1322 SET_R (this); 1663 SET_R (this);
1323 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1324 1665
1325 switch (ev.type) 1666 switch (ev.type)
1326 { 1667 {
1327 case PropertyNotify: 1668 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 /* 1669 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1670 * 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. 1671 * use the property to determine the pixmap. We use it later on.
1340 */ 1672 */
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]) 1673 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1674 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1675 return;
1346 }
1347 1676
1348 /* FALLTHROUGH */ 1677 /* FALLTHROUGH */
1349 case ReparentNotify: 1678 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1680 want_refresh = want_full_refresh = 1;
1353 break; 1681 break;
1354#endif
1355 } 1682 }
1356} 1683}
1684#endif
1357 1685
1358void 1686void
1359rxvt_term::button_press (XButtonEvent &ev) 1687rxvt_term::button_press (XButtonEvent &ev)
1360{ 1688{
1361 int reportmode = 0, clickintime; 1689 int reportmode = 0, clickintime;
1362 1690
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1691 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1692 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1693 reportmode = !! (priv_modes & PrivMode_mouse_report);
1694
1366 /* 1695 /*
1367 * VT window processing of button press 1696 * VT window processing of button press
1368 */ 1697 */
1369 if (ev.window == TermWin.vt) 1698 if (ev.window == TermWin.vt)
1370 { 1699 {
1700#if ISO_14755
1701 // 5.4
1702 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703 {
1704 iso14755_54 (ev.x, ev.y);
1705 return;
1706 }
1707#endif
1708
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1709 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1710
1372 if (reportmode) 1711 if (reportmode)
1373 { 1712 {
1374 /* mouse report from vt window */ 1713 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1714 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1715 MEvent.state = ev.state;
… …
1405 } 1744 }
1406 else 1745 else
1407 { 1746 {
1408 if (ev.button != MEvent.button) 1747 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1748 MEvent.clicks = 0;
1749
1410 switch (ev.button) 1750 switch (ev.button)
1411 { 1751 {
1412 case Button1: 1752 case Button1:
1753 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */
1755#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask);
1757#else
1758 selection.rect = false;
1759#endif
1760
1413 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1763 {
1416 if (MEvent.button == Button1 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1418 else 1766 else
1419 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1782 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1783 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1784 selection_rotate (ev.x, ev.y);
1437 else 1785 else
1438 selection_extend (ev.x, ev.y, 1); 1786 selection_extend (ev.x, ev.y, 1);
1787
1439 MEvent.button = Button3; 1788 MEvent.button = Button3;
1440 break; 1789 break;
1441 } 1790 }
1442 } 1791 }
1792
1443 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1444 return; 1794 return;
1445 } 1795 }
1446 1796
1447 /* 1797 /*
… …
1513 upordown = 1; /* down */ 1863 upordown = 1; /* down */
1514 } 1864 }
1515 if (upordown) 1865 if (upordown)
1516 { 1866 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1867#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1868 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1869#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1870 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1871 {
1522 if (upordown < 0) 1872 if (upordown < 0)
1523 scrollBar.setUp (); 1873 scrollBar.setUp ();
… …
1539 break; 1889 break;
1540 case R_SB_ALIGN_BOTTOM: 1890 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1891 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1892 break;
1543 } 1893 }
1894
1544 if (scrollBar.style == R_SB_XTERM 1895 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1896 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1897 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1898 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1899
1549 scrollBar.setMotion (); 1900 scrollBar.setMotion ();
1550 break; 1901 break;
1551 1902
1552 case Button1: 1903 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1904 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1928 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1929 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1930 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1931 / scrollbar_size ()));
1581 } 1932 }
1933
1582 break; 1934 break;
1583 } 1935 }
1584 } 1936 }
1585 return; 1937 return;
1586 } 1938 }
… …
1598{ 1950{
1599 int reportmode = 0; 1951 int reportmode = 0;
1600 1952
1601 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 1954 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 1956
1605 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1606 { 1958 {
1607 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1608 scrollbar_show (0); 1960 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1963#endif
1612
1613 } 1964 }
1965
1614#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1967 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop();
1616#endif 1969#endif
1970
1617 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1618 { 1972 {
1973#if ISO_14755
1974 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return;
1977#endif
1619 if (reportmode) 1978 if (reportmode)
1620 { 1979 {
1621 /* mouse report from vt window */ 1980 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 1981 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 1982 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 1996 MEvent.button = AnyButton;
1638 mouse_report (ev); 1997 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 1999 return;
1641 } 2000 }
2001
1642 /* 2002 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2004 * when overriding mouse reporting
1645 */ 2005 */
1646 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2007 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1650 2010
1651 switch (ev.button) 2011 switch (ev.button)
… …
1662 case Button5: 2022 case Button5:
1663 { 2023 {
1664 int i; 2024 int i;
1665 page_dirn v; 2025 page_dirn v;
1666 2026
1667 v = (ev.button == Button4) ? UP : DN; 2027 v = ev.button == Button4 ? UP : DN;
2028
1668 if (ev.state & ShiftMask) 2029 if (ev.state & ShiftMask)
1669 i = 1; 2030 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2031 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2032 i = TermWin.nrow - 1;
1672 else 2033 else
1673 i = 5; 2034 i = 5;
2035
1674# ifdef MOUSE_SLIP_WHEELING 2036# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2037 if (ev.state & ControlMask)
1676 { 2038 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2039 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2042
2043 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045
2046 slip_wheel_ev.start ();
1679 } 2047 }
2048 else
2049 {
1680# endif 2050# endif
1681# ifdef JUMP_MOUSE_WHEEL 2051# 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); 2052 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2053 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2054 scrollbar_show (1);
2055# else
2056 while (i--)
2057 {
2058 scr_page (v, 1);
2059 scr_refresh (SMOOTH_REFRESH);
2060 scrollbar_show (1);
2061 }
2062# endif
2063# ifdef MOUSE_SLIP_WHEELING
1691 } 2064 }
1692# endif 2065#endif
1693
1694 } 2066 }
1695 break; 2067 break;
1696#endif 2068#endif
1697
1698 } 2069 }
1699 } 2070 }
1700#ifdef MENUBAR 2071#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2072 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2073 menubar_control (ev);
1703#endif 2074#endif
1704} 2075}
1705 2076
1706
1707#ifdef TRANSPARENT 2077#ifdef TRANSPARENT
2078#if TINTING
2079/* taken from aterm-0.4.2 */
2080
2081typedef uint32_t RUINT32T;
2082
2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2084{
2085 int sh_r, sh_g, sh_b;
2086 RUINT32T mask_r, mask_g, mask_b;
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i;
2091
2092 Visual* visual = display->visual;
2093
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095
2096 /* for convenience */
2097 mask_r = visual->red_mask;
2098 mask_g = visual->green_mask;
2099 mask_b = visual->blue_mask;
2100
2101 /* boring lookup table pre-initialization */
2102 switch (srcImage->bits_per_pixel) {
2103 case 15:
2104 if ((mask_r != 0x7c00) ||
2105 (mask_g != 0x03e0) ||
2106 (mask_b != 0x001f))
2107 return;
2108 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2109 lookup_r = lookup;
2110 lookup_g = lookup+32;
2111 lookup_b = lookup+32+32;
2112 sh_r = 10;
2113 sh_g = 5;
2114 sh_b = 0;
2115 break;
2116 case 16:
2117 if ((mask_r != 0xf800) ||
2118 (mask_g != 0x07e0) ||
2119 (mask_b != 0x001f))
2120 return;
2121 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2122 lookup_r = lookup;
2123 lookup_g = lookup+32;
2124 lookup_b = lookup+32+64;
2125 sh_r = 11;
2126 sh_g = 5;
2127 sh_b = 0;
2128 break;
2129 case 24:
2130 if ((mask_r != 0xff0000) ||
2131 (mask_g != 0x00ff00) ||
2132 (mask_b != 0x0000ff))
2133 return;
2134 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2135 lookup_r = lookup;
2136 lookup_g = lookup+256;
2137 lookup_b = lookup+256+256;
2138 sh_r = 16;
2139 sh_g = 8;
2140 sh_b = 0;
2141 break;
2142 case 32:
2143 if ((mask_r != 0xff0000) ||
2144 (mask_g != 0x00ff00) ||
2145 (mask_b != 0x0000ff))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2148 lookup_r = lookup;
2149 lookup_g = lookup+256;
2150 lookup_b = lookup+256+256;
2151 sh_r = 16;
2152 sh_g = 8;
2153 sh_b = 0;
2154 break;
2155 default:
2156 return; /* we do not support this color depth */
2157 }
2158
2159 /* prepare limits for color transformation (each channel is handled separately) */
2160 if (shade < 0) {
2161 shade = -shade;
2162 if (shade < 0) shade = 0;
2163 if (shade > 100) shade = 100;
2164
2165 lower_lim_r = 65535-rm;
2166 lower_lim_g = 65535-gm;
2167 lower_lim_b = 65535-bm;
2168
2169 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2170 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2171 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2172
2173 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2174 } else {
2175 if (shade < 0) shade = 0;
2176 if (shade > 100) shade = 100;
2177
2178 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2179
2180 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2181 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2182 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2183 }
2184
2185 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2186 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2187 {
2188 unsigned int tmp;
2189
2190 tmp = lower_lim_r;
2191 lower_lim_r = lower_lim_b;
2192 lower_lim_b = tmp;
2193
2194 tmp = upper_lim_r;
2195 upper_lim_r = upper_lim_b;
2196 upper_lim_b = tmp;
2197 }
2198
2199 /* fill our lookup tables */
2200 for (i = 0; i <= mask_r>>sh_r; i++)
2201 {
2202 RUINT32T tmp;
2203 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2204 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2205 lookup_r[i] = (tmp/65535)<<sh_r;
2206 }
2207 for (i = 0; i <= mask_g>>sh_g; i++)
2208 {
2209 RUINT32T tmp;
2210 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2211 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2212 lookup_g[i] = (tmp/65535)<<sh_g;
2213 }
2214 for (i = 0; i <= mask_b>>sh_b; i++)
2215 {
2216 RUINT32T tmp;
2217 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2218 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2219 lookup_b[i] = (tmp/65535)<<sh_b;
2220 }
2221
2222 /* apply table to input image (replacing colors by newly calculated ones) */
2223 switch (srcImage->bits_per_pixel)
2224 {
2225 case 15:
2226 {
2227 unsigned short *p1, *pf, *p, *pl;
2228 p1 = (unsigned short *) srcImage->data;
2229 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2230 while (p1 < pf)
2231 {
2232 p = p1;
2233 pl = p1 + srcImage->width;
2234 for (; p < pl; p++)
2235 {
2236 *p = lookup_r[(*p & 0x7c00)>>10] |
2237 lookup_g[(*p & 0x03e0)>> 5] |
2238 lookup_b[(*p & 0x001f)];
2239 }
2240 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2241 }
2242 break;
2243 }
2244 case 16:
2245 {
2246 unsigned short *p1, *pf, *p, *pl;
2247 p1 = (unsigned short *) srcImage->data;
2248 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2249 while (p1 < pf)
2250 {
2251 p = p1;
2252 pl = p1 + srcImage->width;
2253 for (; p < pl; p++)
2254 {
2255 *p = lookup_r[(*p & 0xf800)>>11] |
2256 lookup_g[(*p & 0x07e0)>> 5] |
2257 lookup_b[(*p & 0x001f)];
2258 }
2259 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2260 }
2261 break;
2262 }
2263 case 24:
2264 {
2265 unsigned char *p1, *pf, *p, *pl;
2266 p1 = (unsigned char *) srcImage->data;
2267 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2268 while (p1 < pf)
2269 {
2270 p = p1;
2271 pl = p1 + srcImage->width * 3;
2272 for (; p < pl; p += 3)
2273 {
2274 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2275 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2276 p[2] = lookup_r[(p[2] & 0x0000ff)];
2277 }
2278 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2279 }
2280 break;
2281 }
2282 case 32:
2283 {
2284 RUINT32T *p1, *pf, *p, *pl;
2285 p1 = (RUINT32T *) srcImage->data;
2286 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2287
2288 while (p1 < pf)
2289 {
2290 p = p1;
2291 pl = p1 + srcImage->width;
2292 for (; p < pl; p++)
2293 {
2294 *p = lookup_r[(*p & 0xff0000)>>16] |
2295 lookup_g[(*p & 0x00ff00)>> 8] |
2296 lookup_b[(*p & 0x0000ff)] |
2297 (*p & ~0xffffff);
2298 }
2299 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2300 }
2301 break;
2302 }
2303 }
2304
2305 free (lookup);
2306}
2307#endif
2308
1708/* 2309/*
1709 * Check our parents are still who we think they are. 2310 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2311 * Do transparency updates if required
1711 */ 2312 */
1712int 2313int
1713rxvt_term::check_our_parents () 2314rxvt_term::check_our_parents ()
1714{ 2315{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2316 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2317 unsigned long nitems, bytes_after;
1717 Atom atype; 2318 Atom atype;
1718 unsigned char *prop = NULL; 2319 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2320 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
1722 2323
1723 pchanged = 0; 2324 pchanged = 0;
1724 2325
1725 if (! (Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
1727 2328
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
1730 2331
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2333
1732 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
1733 { 2335 {
1734 if (am_transparent) 2336 if (am_transparent)
1735 { 2337 {
1736 pchanged = 1; 2338 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
1740 } 2341 }
2342
1741 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
1742 } 2344 }
1743 2345
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2346 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2347 XSync (display->display, False);
… …
1747 /* 2349 /*
1748 * Make the frame window set by the window manager have 2350 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2351 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2352 * windows for each client, so we have to take care about that.
1751 */ 2353 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2354 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2357 &nitems, &bytes_after, &prop) == Success);
2358
1756 if (!i || prop == NULL) 2359 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success);
2364
2365 if (!i || prop == NULL
2366#if TINTING
2367 || !rs[Rs_color + Color_tint]
2368#endif
2369 )
1757 have_pixmap = 0; 2370 have_pixmap = 0;
1758 else 2371 else
1759 { 2372 {
1760 have_pixmap = 1; 2373 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2374 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2375 XFree (prop);
1763 } 2376 }
2377
1764 if (have_pixmap) 2378 if (have_pixmap)
1765 { 2379 {
1766 /* 2380 /*
1767 * Copy display->root pixmap transparency 2381 * Copy display->root pixmap transparency
1768 */ 2382 */
… …
1772 XImage *image; 2386 XImage *image;
1773 GC gc; 2387 GC gc;
1774 XGCValues gcvalue; 2388 XGCValues gcvalue;
1775 2389
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2391 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2392 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2393 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2394 nx = ny = 0;
1781 2395
1782 if (sx < 0) 2396 if (sx < 0)
… …
1793 sy = 0; 2407 sy = 0;
1794 } 2408 }
1795 2409
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412
2413 XSync (display->display, False);
1798 allowedxerror = -1; 2414 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2416
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2418 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2419 allowedxerror = 0;
2420
1804 if (image == NULL) 2421 if (image == NULL)
1805 { 2422 {
1806 if (am_transparent && am_pixmap_trans) 2423 if (am_transparent && am_pixmap_trans)
1807 { 2424 {
1808 pchanged = 1; 2425 pchanged = 1;
… …
1810 { 2427 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2428 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2429 TermWin.pixmap = None;
1813 } 2430 }
1814 } 2431 }
2432
1815 am_pixmap_trans = 0; 2433 am_pixmap_trans = 0;
1816 } 2434 }
1817 else 2435 else
1818 { 2436 {
1819 if (TermWin.pixmap != None) 2437 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2438 XFreePixmap (display->display, TermWin.pixmap);
2439
2440#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint))
2442 {
2443 unsigned short rm, gm, bm;
2444 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2445
2446 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2447
2448 ShadeXImage (display, image, shade, rm, gm, bm);
2449 }
2450#endif
2451
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2453 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2456 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2457 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2458 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2460 XClearWindow (display->display, TermWin.parent[0]);
2461
1833 if (!am_transparent || !am_pixmap_trans) 2462 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2463 pchanged = 1;
2464
1835 am_transparent = am_pixmap_trans = 1; 2465 am_transparent = am_pixmap_trans = 1;
1836 } 2466 }
1837 } 2467 }
1838 2468
1839 if (!am_pixmap_trans) 2469 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2471 else
1840 { 2472 {
1841 unsigned int n; 2473 unsigned int n;
1842 /* 2474 /*
1843 * InheritPixmap transparency 2475 * InheritPixmap transparency
1844 */ 2476 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2478 {
1849 oldp = TermWin.parent[i]; 2479 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2480 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2481 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2482 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2483
1854 if (TermWin.parent[i] == display->root) 2484 if (TermWin.parent[i] == display->root)
1855 { 2485 {
1856 if (oldp != None) 2486 if (oldp != None)
1857 pchanged = 1; 2487 pchanged = 1;
2488
1858 break; 2489 break;
1859 } 2490 }
2491
1860 if (oldp != TermWin.parent[i]) 2492 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2493 pchanged = 1;
1862 } 2494 }
1863 2495
1864 n = 0; 2496 n = 0;
… …
1866 if (pchanged) 2498 if (pchanged)
1867 { 2499 {
1868 for (; n < (unsigned int)i; n++) 2500 for (; n < (unsigned int)i; n++)
1869 { 2501 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2502 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) 2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2504 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2506 break;
1876 } 2507 }
1877 } 2508 }
1878 } 2509 }
1879 2510
1880 if (n > (int) (sizeof (TermWin.parent) 2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2512 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2515 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2516 /* XXX: also turn off Opt_transparent? */
1890 } 2517 }
1891 else 2518 else
1892 { 2519 {
2520#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2521 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2522 * 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); 2523 sleep (1);
1903# endif 2524#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2525 for (n = 0; n < (unsigned int)i; n++)
2526 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2528 XClearWindow (display->display, TermWin.parent[n]);
2529 }
2530
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2532 am_transparent = 1;
1911 } 2533 }
1912 2534
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2536 TermWin.parent[i] = None;
1915 } 2537 }
2538
2539 if (scrollBar.win)
2540 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle ();
2543 scrollbar_show (0);
2544 }
2545
2546 if (am_transparent)
2547 {
2548 want_refresh = want_full_refresh = 1;
2549 if (am_pixmap_trans)
2550 flush ();
2551 }
2552
1916 return pchanged; 2553 return pchanged;
1917} 2554}
1918#endif 2555#endif
1919 2556
1920/*}}} */ 2557/*}}} */
… …
1935 } 2572 }
1936 2573
1937 if (ch == NOCHAR) // TODO: improve 2574 if (ch == NOCHAR) // TODO: improve
1938 break; 2575 break;
1939 2576
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2577 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2578 {
2579 if (!seen_input)
1941 { 2580 {
2581 seen_input = 1;
2582 // many badly-written programs (e.g. jed) contain a race condition:
2583 // they first read the screensize and then install a SIGWINCH handler.
2584 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized.
2589 if (seen_resize)
2590 kill (-cmd_pid, SIGWINCH);
2591 }
2592
1942 /* Read a text string from the input buffer */ 2593 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2594 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2595 bool refreshnow = false;
1945 int nlines = 0; 2596 int nlines = 0;
1946 unicode_t *str = buf; 2597 unicode_t *str = buf;
1947 2598
1948 *str++ = ch;
1949
1950 for (;;) 2599 for (;;)
1951 { 2600 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2601 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2602 break;
1957 2603
1958 *str++ = ch; 2604 *str++ = ch;
1959 2605
1960 if (ch == '\n') 2606 if (ch == C0_LF)
1961 { 2607 {
1962 nlines++; 2608 nlines++;
1963 refresh_count++; 2609 refresh_count++;
1964 2610
1965 if (! (Options & Opt_jumpScroll) 2611 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2612 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2613 {
1968 refreshnow = true; 2614 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2615 ch = NOCHAR;
1971 break; 2616 break;
1972 } 2617 }
1973 2618
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2619 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2620 if (nlines >= TermWin.nrow - 1)
1976 { 2621 {
1977 scr_add_lines (buf, nlines, str - buf); 2622 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2623 nlines = 0;
1979 str = buf; 2624 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2628 if (str >= buf + UBUFSIZ)
1984 { 2629 {
1985 ch = NOCHAR; 2630 ch = NOCHAR;
1986 break; 2631 break;
1987 } 2632 }
2633
2634 seq_begin = cmdbuf_ptr;
2635 ch = next_char ();
1988 } 2636 }
1989 2637
1990 scr_add_lines (buf, nlines, str - buf); 2638 scr_add_lines (buf, nlines, str - buf);
1991 2639
1992 /* 2640 /*
1993 * If there have been a lot of new lines, then update the screen 2641 * 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. 2642 * 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 2643 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2644 * 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 */ 2645 */
2001 if (refreshnow) 2646 if (refreshnow)
2002 { 2647 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2648 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2649 refresh_limit++;
2005 2650 else
2651 {
2652 flag = true;
2006 scr_refresh (refresh_type); 2653 scr_refresh (refresh_type);
2654 }
2007 } 2655 }
2008 2656
2009 } 2657 }
2010 else 2658 else
2011 { 2659 {
… …
2025 } 2673 }
2026 2674
2027 return flag; 2675 return flag;
2028} 2676}
2029 2677
2678// read the next octet
2679unicode_t
2680rxvt_term::next_octet ()
2681{
2682 return cmdbuf_ptr < cmdbuf_endp
2683 ? *cmdbuf_ptr++
2684 : NOCHAR;
2685}
2686
2030// read the next character 2687// read the next character
2031unicode_t 2688unicode_t
2032rxvt_term::next_char () 2689rxvt_term::next_char ()
2033{ 2690{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2691 while (cmdbuf_ptr < cmdbuf_endp)
… …
2065 */ 2722 */
2066unicode_t 2723unicode_t
2067rxvt_term::cmd_getc () 2724rxvt_term::cmd_getc ()
2068{ 2725{
2069 unicode_t c = next_char (); 2726 unicode_t c = next_char ();
2727
2728 if (c == NOCHAR)
2729 throw out_of_input;
2730
2731 return c;
2732}
2733
2734unicode_t
2735rxvt_term::cmd_get8 ()
2736{
2737 unicode_t c = next_octet ();
2070 2738
2071 if (c == NOCHAR) 2739 if (c == NOCHAR)
2072 throw out_of_input; 2740 throw out_of_input;
2073 2741
2074 return c; 2742 return c;
… …
2156/*}}} */ 2824/*}}} */
2157 2825
2158/* *INDENT-OFF* */ 2826/* *INDENT-OFF* */
2159enum { 2827enum {
2160 C1_40 = 0x40, 2828 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2829 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, 2830 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, 2831 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 2832 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2833};
2166/* *INDENT-ON* */ 2834/* *INDENT-ON* */
2167 2835
2168/*{{{ process non-printing single characters */ 2836/*{{{ process non-printing single characters */
2169void 2837void
… …
2174 case C0_ESC: 2842 case C0_ESC:
2175 process_escape_seq (); 2843 process_escape_seq ();
2176 break; 2844 break;
2177 case C0_ENQ: /* terminal Status */ 2845 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2846 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2847 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2848 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2849 else
2183 tt_write ((unsigned char *)VT100_ANS, 2850 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2851 (unsigned int)strlen (VT100_ANS));
2185 break; 2852 break;
2186 case C0_BEL: /* bell */ 2853 case C0_BEL: /* bell */
2187 scr_bell (); 2854 scr_bell ();
2188 break; 2855 break;
2189 case C0_BS: /* backspace */ 2856 case C0_BS: /* backspace */
… …
2205 break; 2872 break;
2206 case C0_SI: /* shift in - acs */ 2873 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2874 scr_charset_choose (0);
2208 break; 2875 break;
2209 2876
2877#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2878 // 8-bit controls
2211 case 0x90: /* DCS */ 2879 case 0x90: /* DCS */
2212 process_dcs_seq (); 2880 process_dcs_seq ();
2213 break; 2881 break;
2214 case 0x9b: /* CSI */ 2882 case 0x9b: /* CSI */
2215 process_csi_seq (); 2883 process_csi_seq ();
2216 break; 2884 break;
2217 case 0x9d: /* CSI */ 2885 case 0x9d: /* CSI */
2218 process_osc_seq (); 2886 process_osc_seq ();
2219 break; 2887 break;
2888#endif
2220 } 2889 }
2221} 2890}
2222/*}}} */ 2891/*}}} */
2223 2892
2224 2893
… …
2286void 2955void
2287rxvt_term::process_escape_seq () 2956rxvt_term::process_escape_seq ()
2288{ 2957{
2289 unicode_t ch = cmd_getc (); 2958 unicode_t ch = cmd_getc ();
2290 2959
2291 if (PrivateModes & PrivMode_vt52) 2960 if (priv_modes & PrivMode_vt52)
2292 { 2961 {
2293 process_escape_vt52 (ch); 2962 process_escape_vt52 (ch);
2294 return; 2963 return;
2295 } 2964 }
2296 2965
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2980 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2981 break;
2313 case '+': 2982 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2983 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2984 break;
2316#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2317 case '6': 2986 case '6':
2318 scr_backindex (); 2987 scr_backindex ();
2319 break; 2988 break;
2320#endif 2989#endif
2321 case '7': 2990 case '7':
2322 scr_cursor (SAVE); 2991 scr_cursor (SAVE);
2323 break; 2992 break;
2324 case '8': 2993 case '8':
2325 scr_cursor (RESTORE); 2994 scr_cursor (RESTORE);
2326 break; 2995 break;
2327#ifndef NO_FRILLS 2996#if ENABLE_FRILLS
2328 case '9': 2997 case '9':
2329 scr_forwardindex (); 2998 scr_forwardindex ();
2330 break; 2999 break;
2331#endif 3000#endif
2332 case '=': 3001 case '=':
… …
2342 break; 3011 break;
2343 3012
2344 /* 8.3.87: NEXT LINE */ 3013 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3014 case C1_NEL: /* ESC E */
2346 { 3015 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3016 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3017 scr_add_lines (nlcr, 1, 2);
2349 } 3018 }
2350 break; 3019 break;
2351 3020
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3021 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3032 case C1_RI: /* ESC M */
2364 scr_index (DN); 3033 scr_index (DN);
2365 break; 3034 break;
2366 3035
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3036 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3037 /*case C1_SS2: scr_single_shift (2); break; */
2369 3038
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3039 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3040 /*case C1_SS3: scr_single_shift (3); break; */
2372 3041
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3042 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3043 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3044 process_dcs_seq ();
2376 break; 3045 break;
… …
2391 process_osc_seq (); 3060 process_osc_seq ();
2392 break; 3061 break;
2393 3062
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3063 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3064 case 'c':
3065 mbstate.reset ();
2396 scr_poweron (); 3066 scr_poweron ();
2397 scrollbar_show (1); 3067 scrollbar_show (1);
2398 break; 3068 break;
2399 3069
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3070 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3082
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3083/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3084/* *INDENT-OFF* */
2415enum { 3085enum {
2416 CSI_ICH = 0x40, 3086 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3087 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 , 3088 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, 3089 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, 3090 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, 3091 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, 3092 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, */ 3107 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, [, \, ], ^, _, */ 3108 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, */ 3109 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, */ 3110 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, */ 3111 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, {, |, }, ~, */ 3112 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3113 };
2444/* *INDENT-ON* */ 3114/* *INDENT-ON* */
2445 3115
2446void 3116void
2447rxvt_term::process_csi_seq () 3117rxvt_term::process_csi_seq ()
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3300 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3301 break;
2632 3302
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3303 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3304 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3305 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3306 break;
2637 3307
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3308 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3309 process_sgr_mode (nargs, arg);
2640 break; 3310 break;
… …
2646 tt_printf ("\033[0n"); 3316 tt_printf ("\033[0n");
2647 break; 3317 break;
2648 case 6: /* CPR requested */ 3318 case 6: /* CPR requested */
2649 scr_report_position (); 3319 scr_report_position ();
2650 break; 3320 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3321 case 7: /* unofficial extension */
3322 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3323 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3324 break;
2655#endif
2656 case 8: /* unofficial extension */ 3325 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3326 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3327 break;
2659 } 3328 }
2660 break; 3329 break;
2661 3330
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3331 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3364 break;
2696 3365
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3366 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3367 if (arg[0] == 4)
2699 scr_insert_mode (0); 3368 scr_insert_mode (0);
3369 else if (arg[0] == 20)
3370 priv_modes &= ~PrivMode_LFNL;
2700 break; 3371 break;
2701 3372
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3373 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3374 if (arg[0] == 4)
2704 scr_insert_mode (1); 3375 scr_insert_mode (1);
3376 else if (arg[0] == 20)
3377 priv_modes |= PrivMode_LFNL;
2705 break; 3378 break;
2706 3379
2707 /* 3380 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3381 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3382 */
… …
2721 break; 3394 break;
2722 case CSI_75: 3395 case CSI_75:
2723 scr_cursor (RESTORE); 3396 scr_cursor (RESTORE);
2724 break; 3397 break;
2725 3398
2726#ifndef NO_FRILLS 3399#if ENABLE_FRILLS
2727 case CSI_74: 3400 case CSI_74:
2728 process_window_ops (arg, nargs); 3401 process_window_ops (arg, nargs);
2729 break; 3402 break;
2730#endif 3403#endif
2731 3404
… …
2738 break; 3411 break;
2739 } 3412 }
2740} 3413}
2741/*}}} */ 3414/*}}} */
2742 3415
2743#ifndef NO_FRILLS 3416#if ENABLE_FRILLS
2744/* ARGSUSED */ 3417/* ARGSUSED */
2745void 3418void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3419rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3420{
2748 int x, y; 3421 int x, y;
… …
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3474 break;
2802 case 13: /* report window position */ 3475 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3478 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3479 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3480 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3481 break;
2809 case 14: /* report window size (pixels) */ 3482 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
… …
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3488 break;
2816 case 19: /* report window size (chars) */ 3489 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3491 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3492 case 20: /* report icon label */
3493 {
3494 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3495 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s);
3498 }
2823 break; 3499 break;
2824 case 21: /* report window title */ 3500 case 21: /* report window title */
3501 {
3502 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3503 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s);
3506 }
2827 break; 3507 break;
2828#endif
2829 } 3508 }
2830} 3509}
2831#endif 3510#endif
2832 3511
2833/*----------------------------------------------------------------------*/ 3512/*----------------------------------------------------------------------*/
2834/* 3513/*
2835 * get input up until STRING TERMINATOR (or BEL) 3514 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3515 * ends_how is terminator used. returned input must be free()'d
2837 */ 3516 */
2838unsigned char * 3517unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3518rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3519{
2841 int seen_esc = 0; /* seen escape? */ 3520 unicode_t ch;
3521 bool seen_esc = false;
2842 unsigned int n = 0; 3522 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3523 wchar_t string[STRING_MAX];
2846 3524
2847 while ((ch = cmd_getc ())) 3525 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3526 {
2849 if (ch == C0_BEL 3527 if (seen_esc)
2850 || ch == CHAR_ST 3528 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3529 if (ch == 0x5c) /* 7bit ST */
2852 break; 3530 break;
2853 3531 else
3532 return NULL;
3533 }
2854 if (ch == C0_ESC) 3534 else if (ch == C0_ESC)
2855 { 3535 {
2856 seen_esc = 1; 3536 seen_esc = true;
2857 continue; 3537 continue;
2858 } 3538 }
2859 else if (ch == '\t') 3539 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3540 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3541 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3542 return NULL; /* other control character - exit */
2863 3543
3544 seen_esc = false;
3545
2864 if (n < sizeof (string) - 1) 3546 if (n >= sizeof (string) - 1)
3547 // stop at some sane length
3548 return NULL;
3549
3550 if (ch == C0_SYN)
3551 string[n++] = cmd_get8 ();
3552 else
2865 string[n++] = ch; 3553 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3554 }
2869 3555
2870 string[n++] = '\0'; 3556 string[n++] = '\0';
2871 3557
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3558 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3559
2877 return s; 3560 return (unsigned char *)rxvt_wcstombs (string);
2878} 3561}
2879 3562
2880/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
2881/* 3564/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
2915 { 3598 {
2916 unsigned char *s = get_to_st (eh); 3599 unsigned char *s = get_to_st (eh);
2917 3600
2918 if (s) 3601 if (s)
2919 { 3602 {
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); 3603 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3604 free (s);
2934 } 3605 }
2935 } 3606 }
2936} 3607}
3608
3609void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3611{
3612 if (str[0] == '?' && !str[1])
3613 {
3614 unsigned short r, g, b;
3615 pix_colors_focused[color].get (display, r, g, b);
3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3617 }
3618 else
3619 set_window_color (color, str);
3620}
3621
2937/* 3622/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3624 * 0 = change iconName/title
2940 * 1 = change iconName 3625 * 1 = change iconName
2941 * 2 = change title 3626 * 2 = change title
2942 * 4 = change color 3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
2943 * 12 = change text color 3630 * 12 = change text color
2944 * 13 = change mouse foreground color 3631 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3632 * 17 = change highlight character colour
2946 * 18 = change bold character color 3633 * 18 = change bold character color
2947 * 19 = change underlined character color 3634 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3635 * 46 = change logfile (not implemented)
2949 * 50 = change font 3636 * 50 = change font
2950 * 3637 *
2951 * rxvt extensions: 3638 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3639 * 20 = bg pixmap
2954 * 39 = change default fg color 3640 * 39 = change default fg color
2955 * 49 = change default bg color 3641 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3642 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3643 * 701 = change locale
2958 * 702 = find font 3644 * 702 = find font
3645 * 703 = menu
2959 */ 3646 */
2960void 3647void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3649{
2963 int changed = 0; 3650 int changed = 0;
2964 int color; 3651 int color;
2965 char *buf, *name; 3652 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1];
3654 int saveop = op;
2966 3655
2967 assert (str != NULL); 3656 assert (str != NULL);
2968 switch (op) 3657 switch (op)
2969 { 3658 {
2970 case XTerm_name: 3659 case XTerm_name:
… …
2974 set_icon_name (str); 3663 set_icon_name (str);
2975 break; 3664 break;
2976 case XTerm_title: 3665 case XTerm_title:
2977 set_title (str); 3666 set_title (str);
2978 break; 3667 break;
3668 case XTerm_property:
3669 if (str[0] == '?')
3670 {
3671 Atom prop = display->atom (str + 1);
3672 Atom actual_type;
3673 int actual_format;
3674 unsigned long nitems;
3675 unsigned long bytes_after;
3676 unsigned char *value = 0;
3677 const char *str = "";
3678
3679 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None
3685 && actual_format == 8)
3686 str = (const char *)(value);
3687
3688 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3689
3690 XFree (value);
3691 }
3692 else
3693 {
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695
3696 if (eq)
3697 {
3698 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1);
3700 }
3701 else
3702 XDeleteProperty (display->display, TermWin.parent[0],
3703 display->atom (str));
3704 }
3705 break;
3706
2979 case XTerm_Color: 3707 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3708 for (buf = (char *)str; buf && *buf;)
2981 { 3709 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3710 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3711 break;
2984 3712
2985 *name++ = '\0'; 3713 *name++ = '\0';
2986 color = atoi (buf); 3714 color = atoi (buf);
2987 3715
2988 if (color < 0 || color >= TOTAL_COLORS) 3716 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3717 break;
2990 3718
2991 if ((buf = STRCHR (name, ';')) != NULL) 3719 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3720 *buf++ = '\0';
2993 3721
3722 if (name[0] == '?' && !name[1])
3723 {
3724 unsigned short r, g, b;
3725 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3726 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3727 }
3728 else
2994 set_window_color (color + minCOLOR, name); 3729 set_window_color (color + minCOLOR, name);
2995 } 3730 }
3731 break;
3732 case XTerm_Color00:
3733 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3734 break;
3735 case XTerm_Color01:
3736 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3737 break;
2997#ifndef NO_CURSORCOLOR 3738#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3739 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3740 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3741 break;
3001#endif 3742#endif
3002 case XTerm_Color_pointer: 3743 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3744 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3745 break;
3746 case XTerm_Color_pointer_bg:
3747 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3748 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3749#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3750 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3008 break; 3755 break;
3009 case XTerm_Color_UL: 3756 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3758 break;
3012 case XTerm_Color_RV: 3759 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3761 break;
3015#endif 3762#endif
3016 3763#if TRANSPARENT && TINTING
3017 case XTerm_Menu: 3764 case XTerm_Color_tint:
3018 /* 3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3766 check_our_parents ();
3020 * so DON'T do it here 3767 if (am_transparent)
3021 */ 3768 want_full_refresh = want_refresh = 1;
3022 break; 3769 break;
3770#endif
3771
3023 case XTerm_Pixmap: 3772 case XTerm_Pixmap:
3024 if (*str != ';') 3773 if (*str != ';')
3025 { 3774 {
3026#if XPM_BACKGROUND 3775#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3776 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3777 set_bgPixmap (str); /* change pixmap */
3029#endif 3778#endif
3030 scr_touch (true); 3779 scr_touch (true);
3031 } 3780 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3781 while ((str = strchr (str, ';')) != NULL)
3033 { 3782 {
3034 str++; 3783 str++;
3035#if XPM_BACKGROUND 3784#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3785 changed += scale_pixmap (str);
3037#endif 3786#endif
… …
3050 set_window_color (Color_fg, str); 3799 set_window_color (Color_fg, str);
3051 break; 3800 break;
3052 case XTerm_restoreBG: 3801 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3802 set_window_color (Color_bg, str);
3054 break; 3803 break;
3804
3055 case XTerm_logfile: 3805 case XTerm_logfile:
3056 // TODO, when secure mode? 3806 // TODO, when secure mode?
3057 break; 3807 break;
3808
3058 case XTerm_font: 3809 case XTerm_font:
3059 change_font (str); 3810 op = URxvt_font;
3811 case URxvt_font:
3812#if ENABLE_STYLES
3813 case URxvt_boldFont:
3814 case URxvt_italicFont:
3815 case URxvt_boldItalicFont:
3816#endif
3817 if (query)
3818 tt_printf ("\33]%d;%-.250s%c", saveop,
3819 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3820 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3821 resp);
3822 else
3823 {
3824 const char *&res = rs[Rs_font + (op - URxvt_font)];
3825
3826 res = strdup (str);
3827 allocated.push_back ((void *)res);
3828 set_fonts ();
3829 }
3060 break; 3830 break;
3061#ifndef NO_FRILLS 3831
3832#if ENABLE_FRILLS
3062 case XTerm_locale: 3833 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3834 if (query)
3064 tt_printf ("%-.250s\n", locale); 3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3065 else 3836 else
3066 { 3837 {
3067 set_locale (str); 3838 set_locale (str);
3068# ifdef USE_XIM 3839# ifdef USE_XIM
3069 im_cb (); 3840 im_cb ();
3070# endif 3841# endif
3071 } 3842 }
3072 break; 3843 break;
3844#endif
3845
3846#ifdef MENUBAR
3073 case XTerm_findfont: 3847 case XTerm_Menu:
3074 { 3848 if (options & Opt_insecure)
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3849 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; 3850 break;
3079#endif 3851#endif
3080#if 0 3852#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3853 case XTerm_dumpscreen: /* no error notices */
3082 { 3854 {
3083 int fd; 3855 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3856 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3857 {
3086 scr_dump (fd); 3858 scr_dump (fd);
3087 close (fd); 3859 close (fd);
3088 } 3860 }
… …
3108{ 3880{
3109 int state; 3881 int state;
3110 3882
3111 if (mode == 's') 3883 if (mode == 's')
3112 { 3884 {
3113 SavedModes |= (PrivateModes & bit); 3885 SavedModes |= (priv_modes & bit);
3114 return -1; 3886 return -1;
3115 } 3887 }
3116 else 3888 else
3117 { 3889 {
3118 if (mode == 'r') 3890 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3891 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3892 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3893 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3894 PrivMode (state, bit);
3123 } 3895 }
3124 3896
3125 return state; 3897 return state;
3126} 3898}
… …
3144 { 3, PrivMode_132 }, 3916 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3917 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3918 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3919 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3920 { 7, PrivMode_Autowrap },
3921 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3922 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3923#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3924 { menuBar_esc, PrivMode_menuBar },
3152#endif 3925#endif
3926 // 18, 19 printing-related
3927 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3928#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3929 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3930#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3931 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3932 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3933 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3934 // 45 margin bell NYI
3163 // 46 start logging 3935 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3947 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3948 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3949 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3950 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3951 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3952 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3953 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3954 };
3183 3955
3184 if (nargs == 0) 3956 if (nargs == 0)
3185 return; 3957 return;
… …
3205 /* extra handling for values with state unkept */ 3977 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3978 switch (arg[i])
3207 { 3979 {
3208 case 1048: /* alternative cursor save */ 3980 case 1048: /* alternative cursor save */
3209 case 1049: 3981 case 1049:
3982 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 3983 if (mode == 0)
3211 scr_cursor (RESTORE); 3984 scr_cursor (RESTORE);
3212 else if (mode == 1) 3985 else if (mode == 1)
3213 scr_cursor (SAVE); 3986 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3987 break;
3215 } 3988 }
3216 3989
3217 if (state >= 0) 3990 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3991 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3992 switch (arg[i])
… …
3225 * within VT52 mode 3998 * within VT52 mode
3226 */ 3999 */
3227 PrivMode (1, PrivMode_vt52); 4000 PrivMode (1, PrivMode_vt52);
3228 break; 4001 break;
3229 case 3: /* 80/132 */ 4002 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4003 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4004 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4005 break;
3233 case 4: /* smooth scrolling */ 4006 case 4: /* smooth scrolling */
3234 if (state) 4007 if (state)
3235 Options &= ~Opt_jumpScroll; 4008 options &= ~Opt_jumpScroll;
3236 else 4009 else
3237 Options |= Opt_jumpScroll; 4010 options |= Opt_jumpScroll;
3238 break; 4011 break;
3239 case 5: /* reverse video */ 4012 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4013 scr_rvideo_mode (state);
3241 break; 4014 break;
3242 case 6: /* relative/absolute origins */ 4015 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4016 scr_relative_origin (state);
3244 break; 4017 break;
3245 case 7: /* autowrap */ 4018 case 7: /* autowrap */
3246 scr_autowrap (state); 4019 scr_autowrap (state);
3247 break; 4020 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4021 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4022 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4023 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4024 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4025 break;
3253#ifdef menuBar_esc 4026#ifdef menuBar_esc
3254 case menuBar_esc: 4027 case menuBar_esc:
3255#ifdef MENUBAR 4028#ifdef MENUBAR
3256 map_menuBar (state); 4029 map_menuBar (state);
… …
3267 break; 4040 break;
3268#endif 4041#endif
3269 case 25: /* visible/invisible cursor */ 4042 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4043 scr_cursor_visible (state);
3271 break; 4044 break;
3272 /* case 35: - shift keys */ 4045 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4046 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4047 case 47: /* secondary screen */
3275 scr_change_screen (state); 4048 scr_change_screen (state);
3276 break; 4049 break;
3277 /* case 66: - application key pad */ 4050 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4051 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4052 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4053 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4054 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4055 break;
3283#if 0 4056#if 0
3284 case 1001: 4057 case 1001:
3285 break; /* X11 mouse highlighting */ 4058 break; /* X11 mouse highlighting */
3286#endif 4059#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4060 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4061 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4062 options &= ~Opt_scrollTtyOutput;
3290 else 4063 else
3291 Options |= Opt_scrollTtyOutput; 4064 options |= Opt_scrollTtyOutput;
3292 break; 4065 break;
3293 case 1011: /* scroll to bottom on key press */ 4066 case 1011: /* scroll to bottom on key press */
3294 if (state) 4067 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4068 options |= Opt_scrollTtyKeypress;
3296 else 4069 else
3297 Options &= ~Opt_scrollTtyKeypress; 4070 options &= ~Opt_scrollTtyKeypress;
3298 break; 4071 break;
3299 case 1047: /* secondary screen w/ clearing */ 4072 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4073 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4074 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4075 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4076 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4077 break;
4078 case 1049: /* secondary screen w/ clearing first */
4079 scr_change_screen (state);
4080 if (options & Opt_secondaryScreen)
4081 if (current_screen != PRIMARY)
4082 scr_erase_screen (2);
4083 break;
3306 default: 4084 default:
3307 break; 4085 break;
3308 } 4086 }
3309 } 4087 }
3310} 4088}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4111 rendset = 0, rendstyle = ~RS_None;
3334 break; 4112 break;
3335 case 1: 4113 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4114 rendset = 1, rendstyle = RS_Bold;
3337 break; 4115 break;
4116 //case 2: // low intensity
4117 case 3:
4118 rendset = 1, rendstyle = RS_Italic;
4119 break;
3338 case 4: 4120 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4121 rendset = 1, rendstyle = RS_Uline;
3340 break; 4122 break;
3341 case 5: 4123 case 5: // slowly blinking
4124 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4125 rendset = 1, rendstyle = RS_Blink;
3343 break; 4126 break;
4127 //case 6: // scoansi light background
3344 case 7: 4128 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4129 rendset = 1, rendstyle = RS_RVid;
3346 break; 4130 break;
3347 case 8: 4131 case 8:
3348 // invisible. NYI 4132 // invisible. NYI
3349 break; 4133 break;
3350 case 22: 4134 //case 9: // crossed out
4135 //case 10: // scoansi acs off, primary font
4136 //case 11: // scoansi acs on, first alt font
4137 //case 12: // scoansi acs on, |0x80, second alt font
4138 //...
4139 //case 19: // ninth alt font
4140 //case 20: // gothic
4141 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4142 rendset = 0, rendstyle = RS_Bold;
4143 break;
4144 case 22: // normal intensity
4145 rendset = 0, rendstyle = RS_Bold;
4146 break;
4147 case 23: // disable italic
4148 rendset = 0, rendstyle = RS_Italic;
3352 break; 4149 break;
3353 case 24: 4150 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4151 rendset = 0, rendstyle = RS_Uline;
3355 break; 4152 break;
3356 case 25: 4153 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4154 rendset = 0, rendstyle = RS_Blink;
3358 break; 4155 break;
4156 case 26: // variable spacing (iso 8613)
4157 rendset = 0, rendstyle = RS_Blink;
4158 break;
3359 case 27: 4159 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4160 rendset = 0, rendstyle = RS_RVid;
3361 break; 4161 break;
3362 case 28:
3363 // visible. NYI 4162 //case 28: // visible. NYI
3364 break; 4163 //case 29: // not crossed-out
3365 } 4164 }
3366 4165
3367 if (rendset != -1) 4166 if (rendset != -1)
3368 { 4167 {
3369 scr_rendition (rendset, rendstyle); 4168 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4179 case 35:
3381 case 36: 4180 case 36:
3382 case 37: 4181 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4183 break;
3385#ifdef TTY_256COLOR 4184 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4185 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4186 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4187 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4188 i += 2;
3391 } 4189 }
3392 break; 4190 break;
3393#endif
3394 case 39: /* default fg */ 4191 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4192 scr_color (Color_fg, Color_fg);
3396 break; 4193 break;
3397 4194
3398 case 40: 4195 case 40:
… …
3403 case 45: 4200 case 45:
3404 case 46: 4201 case 46:
3405 case 47: 4202 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4204 break;
3408#ifdef TTY_256COLOR 4205 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4206 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4207 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4208 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4209 i += 2;
3414 } 4210 }
3415 break; 4211 break;
3416#endif
3417 case 49: /* default bg */ 4212 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4213 scr_color (Color_bg, Color_bg);
3419 break; 4214 break;
4215
4216 //case 50: // not variable spacing
3420 4217
3421#ifndef NO_BRIGHTCOLOR 4218#ifndef NO_BRIGHTCOLOR
3422 case 90: 4219 case 90:
3423 case 91: /* set bright fg color */ 4220 case 91: /* set bright fg color */
3424 case 92: 4221 case 92:
3425 case 93: 4222 case 93:
3426 case 94: 4223 case 94:
3427 case 95: 4224 case 95:
3428 case 96: 4225 case 96:
3429 case 97: 4226 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4227 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4228 break;
3433 case 100: 4229 case 100:
3434 case 101: /* set bright bg color */ 4230 case 101: /* set bright bg color */
3435 case 102: 4231 case 102:
3436 case 103: 4232 case 103:
3437 case 104: 4233 case 104:
3438 case 105: 4234 case 105:
3439 case 106: 4235 case 106:
3440 case 107: 4236 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4237 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4238 break;
3444#endif 4239#endif
3445 4240
3446 } 4241 }
3447 } 4242 }
3448} 4243}
3449/*}}} */ 4244/*}}} */
3450 4245
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4246/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4247void
3453rxvt_term::process_graphics () 4248rxvt_term::process_graphics ()
3454{ 4249{
3455 unicode_t ch, cmd = cmd_getc (); 4250 unicode_t ch, cmd = cmd_getc ();
3456 4251
3457 if (cmd == 'Q') 4252 if (cmd == 'Q')
3458 { /* query graphics */ 4253 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4254 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4255 return;
3461 } 4256 }
3462 /* swallow other graphics sequences until terminating ':' */ 4257 /* swallow other graphics sequences until terminating ':' */
3463 do 4258 do
3464 ch = cmd_getc (); 4259 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4274 unsigned char buf[256];
3480 4275
3481 va_start (arg_ptr, fmt); 4276 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4277 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4278 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4279 tt_write (buf, strlen (buf));
3485} 4280}
3486 4281
3487/* ---------------------------------------------------------------------- */ 4282/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4283/* 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. 4284 * or generated by us in response to a query ESC sequence.
3490 */ 4285 */
4286const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4287
3491void 4288void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4289rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4290{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4291 if (v_buflen == 0)
4292 {
4293 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3495 4294
3496 if (len) 4295 if ((unsigned int)written == len)
4296 return;
4297
4298 data += written;
4299 len -= written;
3497 { 4300 }
4301
4302 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4303
4304 memcpy (v_buffer + v_buflen, data, len);
4305 v_buflen += len;
4306
4307 pty_ev.set (EVENT_READ | EVENT_WRITE);
4308}
4309
4310void rxvt_term::pty_write ()
4311{
4312 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4313
4314 if (written > 0)
4315 {
4316 v_buflen -= written;
4317
3498 if (v_buflen == 0) 4318 if (v_buflen == 0)
3499 { 4319 {
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); 4320 free (v_buffer);
3527 v_buffer = 0; 4321 v_buffer = 0;
3528 v_buflen = 0; 4322 v_buflen = 0;
3529 4323
3530 pty_ev.set (EVENT_READ); 4324 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; 4325 return;
3543 } 4326 }
4327
4328 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4329 }
4330 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331 // original code just ignores this...
4332 destroy ();
3545} 4333}
3546 4334
3547/*----------------------- end-of-file (C source) -----------------------*/ 4335/*----------------------- end-of-file (C source) -----------------------*/
3548 4336

Diff Legend

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