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.163 by root, Wed Aug 25 03:47:20 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
… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 61
62#if ENABLE_FRILLS || ISO_14755
63
64#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1)
66#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
67#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
68#define ISO_14755_MASK 0x0fffffffUL
69
70#if ISO_14755
71static unsigned short iso14755_symtab[] = {
72 // keysym, unicode
73 XK_Left, 0x2190,
74 XK_KP_Left, 0x2190,
75 XK_Up, 0x2191,
76 XK_KP_Up, 0x2191,
77 XK_Right, 0x2192,
78 XK_KP_Right, 0x2192,
79 XK_Down, 0x2193,
80 XK_KP_Down, 0x2193,
81 XK_Linefeed, 0x21b4,
82 XK_Return, 0x21b5,
83 XK_KP_Enter, 0x21b5,
84
85 XK_Prior, 0x21de,
86 XK_Next, 0x21df,
87 XK_Tab, 0x21e5,
88 XK_ISO_Left_Tab, 0x21e6,
89 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7,
91
92 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0,
100 XK_Home, 0x21f1,
101 XK_End, 0x21f2,
102
103 XK_Execute, 0x2318,
104 XK_Begin, 0x2320,
105 XK_Delete, 0x2326,
106 XK_Clear, 0x2327,
107 XK_BackSpace, 0x232b,
108 XK_Insert, 0x2380,
109 XK_Control_L, 0x2388,
110 XK_Control_R, 0x2388,
111 XK_Pause, 0x2389,
112 XK_Break, 0x238a,
113 XK_Escape, 0x238b,
114 XK_Undo, 0x238c,
115 XK_Print, 0x2399,
116
117 XK_space, 0x2423,
118 XK_KP_Space, 0x2422,
119 0,
120};
121
122void
123rxvt_term::iso14755_54 (int x, int y)
124{
125 x = Pixel2Col (x);
126 y = Pixel2Row (y);
127
128 if (x < 0 || x >= TermWin.ncol
129 || y < 0 || y >= TermWin.nrow)
130 return;
131
132 for (;;)
133 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
135
136 if (t != NOCHAR || !x)
137 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
139 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54;
141 break;
142 }
143
144 x--;
145 }
146
147}
148#endif
149
150#if ENABLE_OVERLAY
151void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
153{
154 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2;
157 int len;
158
159#if ENABLE_COMBINING
160 if (IS_COMPOSE (ch))
161 {
162 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr);
165 }
166 else
167#endif
168 {
169 ch2 = ch;
170
171 alloc = 0;
172 chr = &ch2;
173 len = 1;
174 }
175
176 int width = strlen (f->name);
177
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
179
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181
182 for (int y = 0; y < len; y++)
183 {
184 char buf[9];
185
186 ch = *chr++;
187
188 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '=');
191#if !UNICODE3
192 if (ch >= 0x10000)
193 ch = 0xfffd;
194#endif
195 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r);
197 }
198
199 scr_overlay_set (0, len, f->name);
200
201#if ENABLE_COMBINING
202 if (alloc)
203 delete [] alloc;
204#endif
205}
206#endif
207
208void
209rxvt_term::commit_iso14755 ()
210{
211 wchar_t ch[2];
212
213 ch[0] = iso14755buf & ISO_14755_MASK;
214 ch[1] = 0;
215
216 if (iso14755buf & ISO_14755_51)
217 {
218 char mb[16];
219 int len;
220
221 // allow verbatim 0-bytes and control-bytes to be entered
222 if (ch[0] >= 0x20)
223 len = wcstombs (mb, ch, 16);
224 else
225 {
226 mb[0] = ch[0];
227 len = 1;
228 }
229
230 if (len > 0)
231 tt_write ((unsigned char *)mb, len);
232 else
233 scr_bell ();
234 }
235
236 iso14755buf = 0;
237}
238
239int
240rxvt_term::hex_keyval (XKeyEvent &ev)
241{
242 // check wether this event corresponds to a hex digit
243 // if the modifiers had not been pressed.
244 for (int index = 0; index < 8; index++)
245 {
246 KeySym k = XLookupKeysym (&ev, index);
247
248 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
249 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
250 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
251 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
252 }
253
254 return -1;
255}
256#endif
257
62/*{{{ Convert the keypress event into a string */ 258/*{{{ Convert the keypress event into a string */
63void 259void
64rxvt_term::lookup_key (XKeyEvent &ev) 260rxvt_term::lookup_key (XKeyEvent &ev)
65{ 261{
66 int ctrl, meta, shft, len; 262 int ctrl, meta, shft, len;
… …
151 { 347 {
152 if (TermWin.saveLines) 348 if (TermWin.saveLines)
153 { 349 {
154#ifdef UNSHIFTED_SCROLLKEYS 350#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 351 if (!ctrl && !meta)
156 {
157#else 352#else
158 if (IS_SCROLL_MOD) 353 if (IS_SCROLL_MOD)
354#endif
159 { 355 {
160#endif
161 int lnsppg; 356 int lnsppg;
162 357
163#ifdef PAGING_CONTEXT_LINES 358#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 360#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 409 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 410 {
216 keysym += (XK_F11 - XK_F1); 411 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 412 shft = 0; /* turn off Shift */
218 } 413 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 414 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 415 {
221 switch (keysym) 416 switch (keysym)
222 { 417 {
223 /* normal XTerm key bindings */ 418 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 419 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 420 selection_request (ev.time, 0, 0);
226 return; 421 return;
422#if TODO // TODO
227 /* rxvt extras */ 423 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 424 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 425 change_font (FONT_UP);
230 return; 426 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 428 change_font (FONT_DN);
233 return; 429 return;
430#endif
234 } 431 }
235 } 432 }
236 } 433 }
434
435#if ENABLE_FRILLS || ISO_14755
436 // ISO 14755 support
437 if (shft && ctrl)
438 {
439 int hv;
440
441 if (iso14755buf & ISO_14755_51
442 && (keysym == XK_space || keysym == XK_KP_Space
443 || keysym == XK_Return || keysym == XK_KP_Enter))
444 {
445 commit_iso14755 ();
446 iso14755buf = ISO_14755_51;
447# if ISO_14755
448 iso14755_51 (0);
449# endif
450 return;
451 }
452 else if ((hv = hex_keyval (ev)) >= 0)
453 {
454 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
455 | hv | ISO_14755_51;
456# if ISO_14755
457 iso14755_51 (iso14755buf & ISO_14755_MASK);
458# endif
459 return;
460 }
461 else
462 {
463# if ENABLE_OVERLAY
464 scr_overlay_off ();
465# endif
466 iso14755buf = 0;
467 }
468 }
469 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
470 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
471 if (!(iso14755buf & ISO_14755_STARTED))
472 {
473 iso14755buf |= ISO_14755_STARTED;
474# if ENABLE_OVERLAY
475 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
476 scr_overlay_set (0, 0, "ISO 14755 mode");
477# endif
478 }
479#endif
480
237#ifdef PRINTPIPE 481#ifdef PRINTPIPE
238 if (keysym == XK_Print) 482 if (keysym == XK_Print)
239 { 483 {
240 scr_printscreen (ctrl | shft); 484 scr_printscreen (ctrl | shft);
241 return; 485 return;
… …
273 newlen = 1; 517 newlen = 1;
274 switch (keysym) 518 switch (keysym)
275 { 519 {
276#ifndef NO_BACKSPACE_KEY 520#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 521 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 522 if (priv_modes & PrivMode_HaveBackSpace)
279 { 523 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 524 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 525 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 526 kbuf[1] = '\0';
283 } 527 }
284 else 528 else
285 STRCPY (kbuf, key_backspace); 529 strcpy (kbuf, key_backspace);
286 break; 530 break;
287#endif 531#endif
288#ifndef NO_DELETE_KEY 532#ifndef NO_DELETE_KEY
289 case XK_Delete: 533 case XK_Delete:
290 STRCPY (kbuf, key_delete); 534 strcpy (kbuf, key_delete);
291 break; 535 break;
292#endif 536#endif
293 case XK_Tab: 537 case XK_Tab:
294 if (shft) 538 if (shft)
295 STRCPY (kbuf, "\033[Z"); 539 strcpy (kbuf, "\033[Z");
296 else 540 else
297 { 541 {
298#ifdef CTRL_TAB_MAKES_META 542#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 543 if (ctrl)
300 meta = 1; 544 meta = 1;
… …
306 newlen = 0; 550 newlen = 0;
307 } 551 }
308 break; 552 break;
309 553
310#ifdef XK_KP_Left 554#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 555 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 556 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 557 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 558 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 560 {
317 STRCPY (kbuf, "\033OZ"); 561 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 562 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 563 break;
320 } 564 }
321 else 565 else
322 /* translate to std. cursor key */ 566 /* translate to std. cursor key */
… …
325#endif 569#endif
326 case XK_Up: /* "\033[A" */ 570 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 571 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 572 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 573 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 574 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 575 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 576 /* do Shift first */
333 if (shft) 577 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 578 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 579 else if (ctrl)
336 { 580 {
337 kbuf[1] = 'O'; 581 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 582 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 583 }
340 else if (PrivateModes & PrivMode_aplCUR) 584 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 585 kbuf[1] = 'O';
342 break; 586 break;
343 587
344#ifndef UNSHIFTED_SCROLLKEYS 588#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 589# ifdef XK_KP_Prior
346 case XK_KP_Prior: 590 case XK_KP_Prior:
347 /* allow shift to override */ 591 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 593 {
350 STRCPY (kbuf, "\033Oy"); 594 strcpy (kbuf, "\033Oy");
351 break; 595 break;
352 } 596 }
353 /* FALLTHROUGH */ 597 /* FALLTHROUGH */
354# endif 598# endif
355 case XK_Prior: 599 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 600 strcpy (kbuf, "\033[5~");
357 break; 601 break;
358# ifdef XK_KP_Next 602# ifdef XK_KP_Next
359 case XK_KP_Next: 603 case XK_KP_Next:
360 /* allow shift to override */ 604 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 606 {
363 STRCPY (kbuf, "\033Os"); 607 strcpy (kbuf, "\033Os");
364 break; 608 break;
365 } 609 }
366 /* FALLTHROUGH */ 610 /* FALLTHROUGH */
367# endif 611# endif
368 case XK_Next: 612 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 613 strcpy (kbuf, "\033[6~");
370 break; 614 break;
371#endif 615#endif
372 case XK_KP_Enter: 616 case XK_KP_Enter:
373 /* allow shift to override */ 617 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 618 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 619 {
376 STRCPY (kbuf, "\033OM"); 620 strcpy (kbuf, "\033OM");
621 break;
622 }
623
624 /* FALLTHROUGH */
625
626 case XK_Return:
627 if (priv_modes & PrivMode_LFNL)
628 {
629 kbuf[0] = '\015';
630 kbuf[1] = '\012';
631 kbuf[2] = '\0';
377 } 632 }
378 else 633 else
379 { 634 {
380 kbuf[0] = '\r'; 635 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 636 kbuf[1] = '\0';
382 } 637 }
383 break; 638 break;
384 639
385#ifdef XK_KP_Begin 640#ifdef XK_KP_Begin
386 case XK_KP_Begin: 641 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 642 strcpy (kbuf, "\033Ou");
388 break; 643 break;
389 644
390 case XK_KP_Insert: 645 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 646 strcpy (kbuf, "\033Op");
392 break; 647 break;
393 648
394 case XK_KP_Delete: 649 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 650 strcpy (kbuf, "\033On");
396 break; 651 break;
397#endif 652#endif
398 case XK_KP_F1: /* "\033OP" */ 653 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 654 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 655 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 656 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 657 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 658 kbuf[2] += (keysym - XK_KP_F1);
404 break; 659 break;
405 660
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 661 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 662 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 673 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 674 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 675 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 676 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 677 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 678 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 679 {
425 STRCPY (kbuf, "\033Oj"); 680 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 681 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 682 }
428 else 683 else
429 { 684 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 685 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 686 kbuf[1] = '\0';
432 } 687 }
433 break; 688 break;
434 689
435 case XK_Find: 690 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 691 strcpy (kbuf, "\033[1~");
437 break; 692 break;
438 case XK_Insert: 693 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 694 strcpy (kbuf, "\033[2~");
440 break; 695 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 696#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 697 case DXK_Remove:
443 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
444#endif 699#endif
445 case XK_Execute: 700 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 701 strcpy (kbuf, "\033[3~");
447 break; 702 break;
448 case XK_Select: 703 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 704 strcpy (kbuf, "\033[4~");
450 break; 705 break;
451#ifdef XK_KP_End 706#ifdef XK_KP_End
452 case XK_KP_End: 707 case XK_KP_End:
453 /* allow shift to override */ 708 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 710 {
456 STRCPY (kbuf, "\033Oq"); 711 strcpy (kbuf, "\033Oq");
457 break; 712 break;
458 } 713 }
459 /* FALLTHROUGH */ 714 /* FALLTHROUGH */
460#endif 715#endif
461 case XK_End: 716 case XK_End:
462 STRCPY (kbuf, KS_END); 717 strcpy (kbuf, KS_END);
463 break; 718 break;
464#ifdef XK_KP_Home 719#ifdef XK_KP_Home
465 case XK_KP_Home: 720 case XK_KP_Home:
466 /* allow shift to override */ 721 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 723 {
469 STRCPY (kbuf, "\033Ow"); 724 strcpy (kbuf, "\033Ow");
470 break; 725 break;
471 } 726 }
472 /* FALLTHROUGH */ 727 /* FALLTHROUGH */
473#endif 728#endif
474 case XK_Home: 729 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 730 strcpy (kbuf, KS_HOME);
476 break; 731 break;
477 732
478#define FKEY(n, fkey) \ 733#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 734 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 735
… …
533 default: 788 default:
534 newlen = 0; 789 newlen = 0;
535 break; 790 break;
536 } 791 }
537 if (newlen) 792 if (newlen)
538 len = STRLEN (kbuf); 793 len = strlen (kbuf);
539 } 794 }
540 795
541 /* 796 /*
542 * Pass meta for all function keys, if 'meta' option set 797 * Pass meta for all function keys, if 'meta' option set
543 */ 798 */
… …
571 } 826 }
572 827
573 if (len <= 0) 828 if (len <= 0)
574 return; /* not mapped */ 829 return; /* not mapped */
575 830
576 if (Options & Opt_scrollTtyKeypress) 831 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 832 if (TermWin.view_start)
578 { 833 {
579 TermWin.view_start = 0; 834 TermWin.view_start = 0;
580 want_refresh = 1; 835 want_refresh = 1;
581 } 836 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 885 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 887
633 if (n > 0 && s < count) 888 if (n > 0 && s < count)
634 { 889 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 890 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 891 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 892 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 893 cmdbuf_endp -= n;
639 s += n; 894 s += n;
640 } 895 }
… …
661 if (want_full_refresh) 916 if (want_full_refresh)
662 { 917 {
663 want_full_refresh = 0; 918 want_full_refresh = 0;
664 scr_clear (); 919 scr_clear ();
665 scr_touch (false); 920 scr_touch (false);
666 want_refresh = 1;
667 } 921 }
668#endif 922#endif
669 923
670 if (want_refresh) 924 if (want_refresh)
671 { 925 {
672 scr_refresh (refresh_type); 926 scr_refresh (refresh_type);
673 scrollbar_show (1); 927 scrollbar_show (1);
674#ifdef USE_XIM 928#ifdef USE_XIM
675 IMSendSpot (); 929 IMSendSpot ();
676#endif 930#endif
677
678 } 931 }
679 932
680 display->flush (); 933 display->flush ();
934
935 flush_ev.stop ();
681} 936}
682 937
683void 938void
684rxvt_term::check_cb (check_watcher &w) 939rxvt_term::check_cb (check_watcher &w)
685{ 940{
686 SET_R (this); 941 SET_R (this);
687 SET_LOCALE (locale); 942 SET_LOCALE (locale);
688 943
944 display->flush ();
945
946 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01);
948}
949
950void
951rxvt_term::flush_cb (time_watcher &w)
952{
953 SET_R (this);
954 SET_LOCALE (locale);
955
956 refresh_limit = 1;
957 refresh_count = 0;
689 flush (); 958 flush ();
690} 959}
691 960
692#ifdef CURSOR_BLINK 961#ifdef CURSOR_BLINK
693void 962void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 980 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 981 }
713} 982}
714#endif 983#endif
715 984
985#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
986void
987rxvt_term::cont_scroll_cb (time_watcher &w)
988{
989 if ((scrollbar_isUp() || scrollbar_isDn()) &&
990 scr_page (scrollbar_isUp() ? UP : DN, 1))
991 {
992 refresh_type |= SMOOTH_REFRESH;
993 want_refresh = 1;
994 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
995 }
996}
997#endif
998
999#ifdef SELECTION_SCROLLING
1000void
1001rxvt_term::sel_scroll_cb (time_watcher &w)
1002{
1003 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1004 {
1005 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 }
1010}
1011#endif
1012
1013#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1014void
1015rxvt_term::slip_wheel_cb (time_watcher &w)
1016{
1017 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed))
1020 {
1021 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 }
1025}
1026#endif
1027
716bool 1028bool
717rxvt_term::pty_fill () 1029rxvt_term::pty_fill ()
718{ 1030{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032
1033 if (CBUFSIZ == n)
1034 {
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1036 n = 0;
1037 }
720 1038
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1039 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1040 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1041 cmdbuf_endp = cmdbuf_ptr + n;
724 1042
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1044
727 if (n > 0) 1045 if (n > 0)
728 { 1046 {
729 cmdbuf_endp += n; 1047 cmdbuf_endp += n;
730 return true; 1048 return true;
… …
742 SET_LOCALE (locale); 1060 SET_LOCALE (locale);
743 1061
744 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1063 tt_write (0, 0);
746 else if (revents & EVENT_READ) 1064 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 1065 // 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 ()) 1066 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
760 if (cmd_parse ()) 1067 if (cmd_parse ())
761 break; 1068 break;
762 } 1069}
763 } 1070
1071void
1072rxvt_term::pointer_unblank ()
1073{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1075 recolour_cursor ();
1076
1077#ifdef POINTER_BLANK
1078 hidden_pointer = 0;
1079
1080 if (options & Opt_pointerBlank)
1081 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif
764} 1083}
765 1084
766#ifdef POINTER_BLANK 1085#ifdef POINTER_BLANK
767void 1086void
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 () 1087rxvt_term::pointer_blank ()
781{ 1088{
782 if (! (Options & Opt_pointerBlank)) 1089 if (! (options & Opt_pointerBlank))
783 return; 1090 return;
784 1091
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1092 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1093 XFlush (display->display);
787 1094
… …
807 x = ev.x; 1114 x = ev.x;
808 y = ev.y; 1115 y = ev.y;
809 pixel_position (&x, &y); 1116 pixel_position (&x, &y);
810 1117
811 if (MEvent.button == AnyButton) 1118 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1119 button_number = 3;
814 }
815 else 1120 else
816 { 1121 {
817 button_number = MEvent.button - Button1; 1122 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1123 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1124 if (button_number >= 3)
820 button_number += (64 - 3); 1125 button_number += (64 - 3);
821 } 1126 }
822 1127
823 if (PrivateModes & PrivMode_MouseX10) 1128 if (priv_modes & PrivMode_MouseX10)
824 { 1129 {
825 /* 1130 /*
826 * do not report ButtonRelease 1131 * do not report ButtonRelease
827 * no state info allowed 1132 * no state info allowed
828 */ 1133 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1148 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1149 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1150#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1151 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1152#endif
848
849 } 1153 }
850 1154
851#ifdef DEBUG_MOUSEREPORT 1155#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1156 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1157 if (key_state & 16)
854 fputc ('C', stderr); 1158 fputc ('C', stderr);
855 if (key_state & 4) 1159 if (key_state & 4)
856 fputc ('S', stderr); 1160 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1164 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1165 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1166 button_number,
863 x + 1, 1167 x + 1,
864 y + 1); 1168 y + 1);
865#else 1169#endif
1170
866 tt_printf ("\033[M%c%c%c", 1171 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1172 (32 + button_number + key_state),
868 (32 + x + 1), 1173 (32 + x + 1),
869 (32 + y + 1)); 1174 (32 + y + 1));
870#endif
871} 1175}
872 1176
873#ifdef USING_W11LIB 1177#ifdef USING_W11LIB
874void 1178void
875rxvt_W11_process_x_event (XEvent *ev) 1179rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1190{
887 SET_R (this); 1191 SET_R (this);
888 SET_LOCALE (locale); 1192 SET_LOCALE (locale);
889 1193
890#if defined(CURSOR_BLINK) 1194#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1196 {
893 if (hidden_cursor) 1197 if (hidden_cursor)
894 { 1198 {
895 hidden_cursor = 0; 1199 hidden_cursor = 0;
896 want_refresh = 1; 1200 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1204 }
901#endif 1205#endif
902 1206
903#if defined(POINTER_BLANK) 1207#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1209 {
906 if (ev.type == MotionNotify 1210 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1211 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1212 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1213 if (hidden_pointer)
… …
921 1225
922 Window unused_root, unused_child; 1226 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1227 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1228 unsigned int unused_mask;
925 1229
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
975 switch (ev.type) 1230 switch (ev.type)
976 { 1231 {
977 case KeyPress: 1232 case KeyPress:
1233#if ISO_14755
1234 if (!(iso14755buf & ISO_14755_52))
1235#endif
978 lookup_key (ev.xkey); 1236 lookup_key (ev.xkey);
1237
1238 break;
1239
1240 case KeyRelease:
1241 {
1242#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1243 KeySym ks;
1244
1245 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1246#endif
1247
1248#if ENABLE_FRILLS || ISO_14755
1249 // ISO 14755 support
1250 if (iso14755buf)
1251 if (iso14755buf & ISO_14755_52)
1252 {
1253# if ENABLE_OVERLAY
1254 scr_overlay_off ();
1255# endif
1256# if ISO_14755
1257 // iso14755 part 5.2 handling: release time
1258 // first: controls
1259 if ((ev.xkey.state & ControlMask)
1260 && ((ks >= 0x40 && ks <= 0x5f)
1261 || (ks >= 0x61 && ks <= 0x7f)))
1262 {
1263 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1269 if (i[0] == ks)
1270 {
1271 iso14755buf = ISO_14755_51 | i[1];
1272 commit_iso14755 ();
1273 return; // case-break;
1274 }
1275
1276 scr_bell ();
1277# endif
1278 iso14755buf = 0;
979 break; 1279 break;
1280 }
1281 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1282 {
1283# if ENABLE_OVERLAY
1284 scr_overlay_off ();
1285# endif
1286 if (iso14755buf & ISO_14755_51)
1287 commit_iso14755 ();
1288#if ISO_14755
1289 else if (iso14755buf & ISO_14755_STARTED)
1290 {
1291 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1292
1293 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1294 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1295 }
1296# endif
1297 else
1298 iso14755buf = 0;
1299 }
1300#endif
980 1301
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1303 if (!(ev.xkey.state & ControlMask))
1304 slip_wheel_ev.stop ();
1305 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1306 mouse_slip_wheel_speed = 0;
986 else 1307#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; 1308 break;
995 } 1309 }
996#endif
997 1310
998 case ButtonPress: 1311 case ButtonPress:
999 button_press (ev.xbutton); 1312 button_press (ev.xbutton);
1000 break; 1313 break;
1001 1314
… …
1013 && (ev.xclient.data.l[0] == DndFile 1326 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1327 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1328 || ev.xclient.data.l[0] == DndLink))
1016 { 1329 {
1017 /* Get Dnd data */ 1330 /* Get Dnd data */
1018 Atom ActualType; 1331 Atom ActualType;
1019 int ActualFormat; 1332 int ActualFormat;
1020 unsigned char *data; 1333 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1334 unsigned long Size, RemainingBytes;
1022 1335
1023 XGetWindowProperty (display->display, display->root, 1336 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1337 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1338 0L, 1000000L,
1026 False, AnyPropertyType, 1339 False, AnyPropertyType,
… …
1028 &Size, &RemainingBytes, 1341 &Size, &RemainingBytes,
1029 &data); 1342 &data);
1030 XChangeProperty (display->display, display->root, 1343 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1344 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1345 8, PropModeReplace,
1033 data, STRLEN (data)); 1346 data, strlen (data));
1347 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1348 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1350 }
1037#endif /* OFFIX_DND */ 1351#endif /* OFFIX_DND */
1038 break; 1352 break;
1039 1353
1040 case MappingNotify: 1354 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1355 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1356 break;
1043 1357
1044 /* 1358 /*
1045 * XXX: this is not the _current_ arrangement 1359 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1360 * Here's my conclusion:
… …
1071 { 1385 {
1072 TermWin.focus = 1; 1386 TermWin.focus = 1;
1073 want_refresh = 1; 1387 want_refresh = 1;
1074#ifdef USE_XIM 1388#ifdef USE_XIM
1075 if (Input_Context != NULL) 1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1392 XSetICFocus (Input_Context);
1393 }
1077#endif 1394#endif
1078#ifdef CURSOR_BLINK 1395#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1396 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398#endif
1399#ifdef OFF_FOCUS_FADING
1400 if (rs[Rs_fade])
1401 {
1402 pix_colors = pix_colors_focused;
1403 scr_recolour ();
1404 }
1081#endif 1405#endif
1082 1406
1083 } 1407 }
1084 break; 1408 break;
1085 1409
1086 case FocusOut: 1410 case FocusOut:
1087 if (TermWin.focus) 1411 if (TermWin.focus)
1088 { 1412 {
1089 TermWin.focus = 0; 1413 TermWin.focus = 0;
1090 want_refresh = 1; 1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1091#ifdef USE_XIM 1422#ifdef USE_XIM
1092 if (Input_Context != NULL) 1423 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1424 XUnsetICFocus (Input_Context);
1094#endif 1425#endif
1095#ifdef CURSOR_BLINK 1426#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1427 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1428 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1429 hidden_cursor = 0;
1099#endif 1430#endif
1100 1431#ifdef OFF_FOCUS_FADING
1432 if (rs[Rs_fade])
1433 {
1434 pix_colors = pix_colors_unfocused;
1435 scr_recolour ();
1436 }
1437#endif
1101 } 1438 }
1102 break; 1439 break;
1103 1440
1104 case ConfigureNotify: 1441 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1442 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1451 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1453
1117 if (szHint.width != width || szHint.height != height) 1454 if (szHint.width != width || szHint.height != height)
1118 { 1455 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1456 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1457 resize_all_windows (width, height, 1);
1121 } 1458 }
1122#ifdef DEBUG_SIZE 1459
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1461 if (options & Opt_transparent)
1130 { 1462 {
1131 check_our_parents (); 1463 check_our_parents ();
1132 if (am_transparent) 1464 if (am_transparent)
1133 want_full_refresh = 1; 1465 want_refresh = want_full_refresh = 1;
1134 } 1466 }
1135#endif 1467#endif
1136
1137 } 1468 }
1469 break;
1470
1471 case PropertyNotify:
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1138 break; 1476 break;
1139 1477
1140 case SelectionClear: 1478 case SelectionClear:
1141 selection_clear (); 1479 selection_clear ();
1142 break; 1480 break;
… …
1173 1511
1174 case GraphicsExpose: 1512 case GraphicsExpose:
1175 case Expose: 1513 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == TermWin.vt)
1177 { 1515 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1516 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1520
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1526
1186 // ev.xexpose.width, TermWin.height, False); 1527 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1528 }
1190 else 1529 else
1191 { 1530 {
1192 XEvent unused_event; 1531 XEvent unused_event;
1193 1532
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1534 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1536 ;
1199 &unused_event)) ; 1537
1200 if (isScrollbarWindow (ev.xany.window)) 1538 if (isScrollbarWindow (ev.xany.window))
1201 { 1539 {
1202 scrollBar.setIdle (); 1540 scrollBar.setIdle ();
1203 scrollbar_show (0); 1541 scrollbar_show (0);
1204 } 1542 }
1205#ifdef MENUBAR 1543#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1545 menubar_expose ();
1208#endif 1546#endif
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0])
1550 XClearWindow (display->display, ev.xany.window);
1551#endif
1209 } 1552 }
1210 break; 1553 break;
1211 1554
1212 case MotionNotify: 1555 case MotionNotify:
1213#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
… …
1219 { 1562 {
1220 menubar_control (ev.xbutton); 1563 menubar_control (ev.xbutton);
1221 break; 1564 break;
1222 } 1565 }
1223#endif 1566#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break; 1568 break;
1226 1569
1227 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == TermWin.vt)
1228 { 1571 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1573 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1232 ; 1575 ;
1233 1576
1234 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (display->display, TermWin.vt,
1235 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1580 & (ev.xbutton.x), & (ev.xbutton.y),
1238 &unused_mask); 1581 &unused_mask);
1239#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1585 {
1243#endif 1586#endif
1587#if ISO_14755
1588 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break;
1593 }
1594#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1246#ifdef SELECTION_SCROLLING 1597#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1598 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1600 {
1250 int dist; 1601 int dist;
1251 1602
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1603 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1604 * already in the middle of scrolling.
1256 */ 1605 */
1257 if (scroll_selection_delay<=0) 1606 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1607 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1608
1260 /* save the event params so we can highlight 1609 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1610 * the selection in the pending-scroll loop
1262 */ 1611 */
1263 selection_save_x=ev.xbutton.x; 1612 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1613 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1615
1268 /* calc number of lines to scroll */ 1616 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1617 if (ev.xbutton.y<TermWin.int_bwidth)
1270 { 1618 {
1271 scroll_selection_dir = UP; 1619 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1620 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1621 }
1274 else 1622 else
1275 { 1623 {
1276 scroll_selection_dir = DN; 1624 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1626 }
1627
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1628 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1629 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1;
1282 MIN_IT (scroll_selection_lines, 1631 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1632 SELECTION_SCROLL_MAX_LINES);
1284 } 1633 }
1285 else 1634 else
1286 { 1635 {
1287 /* we are within the text window, so we 1636 /* we are within the text window, so we
1288 * shouldn't be scrolling 1637 * shouldn't be scrolling
1289 */ 1638 */
1290 pending_scroll_selection = 0; 1639 if (sel_scroll_ev.active)
1640 sel_scroll_ev.stop();
1291 } 1641 }
1292#endif 1642#endif
1293#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1294
1295 } 1644 }
1296#endif 1645#endif
1297
1298 } 1646 }
1299 } 1647 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1649 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1303 MotionNotify, &ev)) ; 1651 MotionNotify, &ev)) ;
1304 XQueryPointer (display->display, scrollBar.win, 1652 XQueryPointer (display->display, scrollBar.win,
1305 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1655 & (ev.xbutton.x), & (ev.xbutton.y),
1308 &unused_mask); 1656 &unused_mask);
… …
1314 } 1662 }
1315 break; 1663 break;
1316 } 1664 }
1317} 1665}
1318 1666
1667#if TRANSPARENT
1319void 1668void
1320rxvt_term::rootwin_cb (XEvent &ev) 1669rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1670{
1322 SET_R (this); 1671 SET_R (this);
1323 SET_LOCALE (locale); 1672 SET_LOCALE (locale);
1324 1673
1325 switch (ev.type) 1674 switch (ev.type)
1326 { 1675 {
1327 case PropertyNotify: 1676 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 /* 1677 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1678 * 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. 1679 * use the property to determine the pixmap. We use it later on.
1340 */ 1680 */
1341 if (xa[XA_XROOTPMAPID] == 0) 1681 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343 1683
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return; 1685 return;
1346 }
1347 1686
1348 /* FALLTHROUGH */ 1687 /* FALLTHROUGH */
1349 case ReparentNotify: 1688 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1690 want_refresh = want_full_refresh = 1;
1353 break; 1691 break;
1354#endif
1355 } 1692 }
1356} 1693}
1694#endif
1357 1695
1358void 1696void
1359rxvt_term::button_press (XButtonEvent &ev) 1697rxvt_term::button_press (XButtonEvent &ev)
1360{ 1698{
1361 int reportmode = 0, clickintime; 1699 int reportmode = 0, clickintime;
1362 1700
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1702 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1703 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704
1366 /* 1705 /*
1367 * VT window processing of button press 1706 * VT window processing of button press
1368 */ 1707 */
1369 if (ev.window == TermWin.vt) 1708 if (ev.window == TermWin.vt)
1370 { 1709 {
1710#if ISO_14755
1711 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 {
1714 iso14755_54 (ev.x, ev.y);
1715 return;
1716 }
1717#endif
1718
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1372 if (reportmode) 1720 if (reportmode)
1373 { 1721 {
1374 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
… …
1409 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1410 switch (ev.button) 1758 switch (ev.button)
1411 { 1759 {
1412 case Button1: 1760 case Button1:
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_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
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_XSETROOTID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
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)
… …
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));
1798 allowedxerror = -1; 2412 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2413 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2414
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2415 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2416 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2417 allowedxerror = 0;
2418
1804 if (image == NULL) 2419 if (image == NULL)
1805 { 2420 {
1806 if (am_transparent && am_pixmap_trans) 2421 if (am_transparent && am_pixmap_trans)
1807 { 2422 {
1808 pchanged = 1; 2423 pchanged = 1;
… …
1810 { 2425 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2426 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2427 TermWin.pixmap = None;
1813 } 2428 }
1814 } 2429 }
2430
1815 am_pixmap_trans = 0; 2431 am_pixmap_trans = 0;
1816 } 2432 }
1817 else 2433 else
1818 { 2434 {
1819 if (TermWin.pixmap != None) 2435 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2436 XFreePixmap (display->display, TermWin.pixmap);
2437
2438#if TINTING
2439 if (ISSET_PIXCOLOR (Color_tint))
2440 {
2441 unsigned short rm, gm, bm;
2442 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2443
2444 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2445
2446 ShadeXImage (display, image, shade, rm, gm, bm);
2447 }
2448#endif
2449
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2451 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2454 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2455 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2456 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2458 XClearWindow (display->display, TermWin.parent[0]);
2459
1833 if (!am_transparent || !am_pixmap_trans) 2460 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2461 pchanged = 1;
2462
1835 am_transparent = am_pixmap_trans = 1; 2463 am_transparent = am_pixmap_trans = 1;
1836 } 2464 }
1837 } 2465 }
1838 2466
1839 if (!am_pixmap_trans) 2467 if (!am_pixmap_trans)
1840 { 2468 {
1841 unsigned int n; 2469 unsigned int n;
1842 /* 2470 /*
1843 * InheritPixmap transparency 2471 * InheritPixmap transparency
1844 */ 2472 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2474 {
1849 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2478 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2479
1854 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
1855 { 2481 {
1856 if (oldp != None) 2482 if (oldp != None)
1857 pchanged = 1; 2483 pchanged = 1;
2484
1858 break; 2485 break;
1859 } 2486 }
2487
1860 if (oldp != TermWin.parent[i]) 2488 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2489 pchanged = 1;
1862 } 2490 }
1863 2491
1864 n = 0; 2492 n = 0;
… …
1866 if (pchanged) 2494 if (pchanged)
1867 { 2495 {
1868 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
1869 { 2497 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 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) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2500 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2502 break;
1876 } 2503 }
1877 } 2504 }
1878 } 2505 }
1879 2506
1880 if (n > (int) (sizeof (TermWin.parent) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2508 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2511 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
1890 } 2513 }
1891 else 2514 else
1892 { 2515 {
2516#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2518 * 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); 2519 sleep (1);
1903# endif 2520#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2524 XClearWindow (display->display, TermWin.parent[n]);
2525 }
2526
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2528 am_transparent = 1;
1911 } 2529 }
1912 2530
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
1915 } 2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
1916 return pchanged; 2542 return pchanged;
1917} 2543}
1918#endif 2544#endif
1919 2545
1920/*}}} */ 2546/*}}} */
… …
1935 } 2561 }
1936 2562
1937 if (ch == NOCHAR) // TODO: improve 2563 if (ch == NOCHAR) // TODO: improve
1938 break; 2564 break;
1939 2565
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2567 {
2568 if (!seen_input)
1941 { 2569 {
2570 seen_input = 1;
2571 // many badly-written programs (e.g. jed) contain a race condition:
2572 // they first read the screensize and then install a SIGWINCH handler.
2573 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized.
2578 if (seen_resize)
2579 kill (-cmd_pid, SIGWINCH);
2580 }
2581
1942 /* Read a text string from the input buffer */ 2582 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2583 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2584 bool refreshnow = false;
1945 int nlines = 0; 2585 int nlines = 0;
1946 unicode_t *str = buf; 2586 unicode_t *str = buf;
1947 2587
1948 *str++ = ch;
1949
1950 for (;;) 2588 for (;;)
1951 { 2589 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2590 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2591 break;
1957 2592
1958 *str++ = ch; 2593 *str++ = ch;
1959 2594
1960 if (ch == '\n') 2595 if (ch == C0_LF)
1961 { 2596 {
1962 nlines++; 2597 nlines++;
1963 refresh_count++; 2598 refresh_count++;
1964 2599
1965 if (! (Options & Opt_jumpScroll) 2600 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2602 {
1968 refreshnow = true; 2603 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2604 ch = NOCHAR;
1971 break; 2605 break;
1972 } 2606 }
1973 2607
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2609 if (nlines >= TermWin.nrow - 1)
1976 { 2610 {
1977 scr_add_lines (buf, nlines, str - buf); 2611 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2612 nlines = 0;
1979 str = buf; 2613 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2617 if (str >= buf + UBUFSIZ)
1984 { 2618 {
1985 ch = NOCHAR; 2619 ch = NOCHAR;
1986 break; 2620 break;
1987 } 2621 }
2622
2623 seq_begin = cmdbuf_ptr;
2624 ch = next_char ();
1988 } 2625 }
1989 2626
1990 scr_add_lines (buf, nlines, str - buf); 2627 scr_add_lines (buf, nlines, str - buf);
1991 2628
1992 /* 2629 /*
1993 * If there have been a lot of new lines, then update the screen 2630 * 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. 2631 * 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 2632 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2633 * 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 */ 2634 */
2001 if (refreshnow) 2635 if (refreshnow)
2002 { 2636 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2638 refresh_limit++;
2005 2639 else
2640 {
2641 flag = true;
2006 scr_refresh (refresh_type); 2642 scr_refresh (refresh_type);
2643 }
2007 } 2644 }
2008 2645
2009 } 2646 }
2010 else 2647 else
2011 { 2648 {
… …
2025 } 2662 }
2026 2663
2027 return flag; 2664 return flag;
2028} 2665}
2029 2666
2667// read the next octet
2668unicode_t
2669rxvt_term::next_octet ()
2670{
2671 return cmdbuf_ptr < cmdbuf_endp
2672 ? *cmdbuf_ptr++
2673 : NOCHAR;
2674}
2675
2030// read the next character 2676// read the next character
2031unicode_t 2677unicode_t
2032rxvt_term::next_char () 2678rxvt_term::next_char ()
2033{ 2679{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2680 while (cmdbuf_ptr < cmdbuf_endp)
… …
2065 */ 2711 */
2066unicode_t 2712unicode_t
2067rxvt_term::cmd_getc () 2713rxvt_term::cmd_getc ()
2068{ 2714{
2069 unicode_t c = next_char (); 2715 unicode_t c = next_char ();
2716
2717 if (c == NOCHAR)
2718 throw out_of_input;
2719
2720 return c;
2721}
2722
2723unicode_t
2724rxvt_term::cmd_get8 ()
2725{
2726 unicode_t c = next_octet ();
2070 2727
2071 if (c == NOCHAR) 2728 if (c == NOCHAR)
2072 throw out_of_input; 2729 throw out_of_input;
2073 2730
2074 return c; 2731 return c;
… …
2156/*}}} */ 2813/*}}} */
2157 2814
2158/* *INDENT-OFF* */ 2815/* *INDENT-OFF* */
2159enum { 2816enum {
2160 C1_40 = 0x40, 2817 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2818 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, 2819 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, 2820 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 2821 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2822};
2166/* *INDENT-ON* */ 2823/* *INDENT-ON* */
2167 2824
2168/*{{{ process non-printing single characters */ 2825/*{{{ process non-printing single characters */
2169void 2826void
… …
2174 case C0_ESC: 2831 case C0_ESC:
2175 process_escape_seq (); 2832 process_escape_seq ();
2176 break; 2833 break;
2177 case C0_ENQ: /* terminal Status */ 2834 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2835 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2838 else
2183 tt_write ((unsigned char *)VT100_ANS, 2839 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2840 (unsigned int)strlen (VT100_ANS));
2185 break; 2841 break;
2186 case C0_BEL: /* bell */ 2842 case C0_BEL: /* bell */
2187 scr_bell (); 2843 scr_bell ();
2188 break; 2844 break;
2189 case C0_BS: /* backspace */ 2845 case C0_BS: /* backspace */
… …
2205 break; 2861 break;
2206 case C0_SI: /* shift in - acs */ 2862 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2863 scr_charset_choose (0);
2208 break; 2864 break;
2209 2865
2866#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2867 // 8-bit controls
2211 case 0x90: /* DCS */ 2868 case 0x90: /* DCS */
2212 process_dcs_seq (); 2869 process_dcs_seq ();
2213 break; 2870 break;
2214 case 0x9b: /* CSI */ 2871 case 0x9b: /* CSI */
2215 process_csi_seq (); 2872 process_csi_seq ();
2216 break; 2873 break;
2217 case 0x9d: /* CSI */ 2874 case 0x9d: /* CSI */
2218 process_osc_seq (); 2875 process_osc_seq ();
2219 break; 2876 break;
2877#endif
2220 } 2878 }
2221} 2879}
2222/*}}} */ 2880/*}}} */
2223 2881
2224 2882
… …
2286void 2944void
2287rxvt_term::process_escape_seq () 2945rxvt_term::process_escape_seq ()
2288{ 2946{
2289 unicode_t ch = cmd_getc (); 2947 unicode_t ch = cmd_getc ();
2290 2948
2291 if (PrivateModes & PrivMode_vt52) 2949 if (priv_modes & PrivMode_vt52)
2292 { 2950 {
2293 process_escape_vt52 (ch); 2951 process_escape_vt52 (ch);
2294 return; 2952 return;
2295 } 2953 }
2296 2954
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2969 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2970 break;
2313 case '+': 2971 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2972 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2973 break;
2316#ifndef NO_FRILLS 2974#if ENABLE_FRILLS
2317 case '6': 2975 case '6':
2318 scr_backindex (); 2976 scr_backindex ();
2319 break; 2977 break;
2320#endif 2978#endif
2321 case '7': 2979 case '7':
2322 scr_cursor (SAVE); 2980 scr_cursor (SAVE);
2323 break; 2981 break;
2324 case '8': 2982 case '8':
2325 scr_cursor (RESTORE); 2983 scr_cursor (RESTORE);
2326 break; 2984 break;
2327#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2328 case '9': 2986 case '9':
2329 scr_forwardindex (); 2987 scr_forwardindex ();
2330 break; 2988 break;
2331#endif 2989#endif
2332 case '=': 2990 case '=':
… …
2342 break; 3000 break;
2343 3001
2344 /* 8.3.87: NEXT LINE */ 3002 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3003 case C1_NEL: /* ESC E */
2346 { 3004 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3005 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3006 scr_add_lines (nlcr, 1, 2);
2349 } 3007 }
2350 break; 3008 break;
2351 3009
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3010 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3021 case C1_RI: /* ESC M */
2364 scr_index (DN); 3022 scr_index (DN);
2365 break; 3023 break;
2366 3024
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3025 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3026 /*case C1_SS2: scr_single_shift (2); break; */
2369 3027
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3028 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3029 /*case C1_SS3: scr_single_shift (3); break; */
2372 3030
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3031 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3032 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3033 process_dcs_seq ();
2376 break; 3034 break;
… …
2391 process_osc_seq (); 3049 process_osc_seq ();
2392 break; 3050 break;
2393 3051
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3052 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3053 case 'c':
3054 mbstate.reset ();
2396 scr_poweron (); 3055 scr_poweron ();
2397 scrollbar_show (1); 3056 scrollbar_show (1);
2398 break; 3057 break;
2399 3058
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3059 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3071
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3072/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3073/* *INDENT-OFF* */
2415enum { 3074enum {
2416 CSI_ICH = 0x40, 3075 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3076 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 , 3077 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, 3078 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, 3079 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, 3080 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, 3081 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, */ 3096 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, [, \, ], ^, _, */ 3097 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, */ 3098 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, */ 3099 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, */ 3100 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, {, |, }, ~, */ 3101 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3102 };
2444/* *INDENT-ON* */ 3103/* *INDENT-ON* */
2445 3104
2446void 3105void
2447rxvt_term::process_csi_seq () 3106rxvt_term::process_csi_seq ()
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3290 break;
2632 3291
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3293 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3294 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3295 break;
2637 3296
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3298 process_sgr_mode (nargs, arg);
2640 break; 3299 break;
… …
2646 tt_printf ("\033[0n"); 3305 tt_printf ("\033[0n");
2647 break; 3306 break;
2648 case 6: /* CPR requested */ 3307 case 6: /* CPR requested */
2649 scr_report_position (); 3308 scr_report_position ();
2650 break; 3309 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3310 case 7: /* unofficial extension */
3311 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3312 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3313 break;
2655#endif
2656 case 8: /* unofficial extension */ 3314 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3316 break;
2659 } 3317 }
2660 break; 3318 break;
2661 3319
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3320 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3353 break;
2696 3354
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3355 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3356 if (arg[0] == 4)
2699 scr_insert_mode (0); 3357 scr_insert_mode (0);
3358 else if (arg[0] == 20)
3359 priv_modes &= ~PrivMode_LFNL;
2700 break; 3360 break;
2701 3361
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3362 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3363 if (arg[0] == 4)
2704 scr_insert_mode (1); 3364 scr_insert_mode (1);
3365 else if (arg[0] == 20)
3366 priv_modes |= PrivMode_LFNL;
2705 break; 3367 break;
2706 3368
2707 /* 3369 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3370 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3371 */
… …
2721 break; 3383 break;
2722 case CSI_75: 3384 case CSI_75:
2723 scr_cursor (RESTORE); 3385 scr_cursor (RESTORE);
2724 break; 3386 break;
2725 3387
2726#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2727 case CSI_74: 3389 case CSI_74:
2728 process_window_ops (arg, nargs); 3390 process_window_ops (arg, nargs);
2729 break; 3391 break;
2730#endif 3392#endif
2731 3393
… …
2738 break; 3400 break;
2739 } 3401 }
2740} 3402}
2741/*}}} */ 3403/*}}} */
2742 3404
2743#ifndef NO_FRILLS 3405#if ENABLE_FRILLS
2744/* ARGSUSED */ 3406/* ARGSUSED */
2745void 3407void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3408rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3409{
2748 int x, y; 3410 int x, y;
… …
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3462 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3463 break;
2802 case 13: /* report window position */ 3464 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3465 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3466 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3467 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3468 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3469 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3470 break;
2809 case 14: /* report window size (pixels) */ 3471 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3473 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
… …
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3476 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3477 break;
2816 case 19: /* report window size (chars) */ 3478 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3480 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3481 case 20: /* report icon label */
3482 {
3483 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3484 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3485 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486 XFree (s);
3487 }
2823 break; 3488 break;
2824 case 21: /* report window title */ 3489 case 21: /* report window title */
3490 {
3491 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3492 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s);
3495 }
2827 break; 3496 break;
2828#endif
2829 } 3497 }
2830} 3498}
2831#endif 3499#endif
2832 3500
2833/*----------------------------------------------------------------------*/ 3501/*----------------------------------------------------------------------*/
2834/* 3502/*
2835 * get input up until STRING TERMINATOR (or BEL) 3503 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3504 * ends_how is terminator used. returned input must be free()'d
2837 */ 3505 */
2838unsigned char * 3506unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3507rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3508{
2841 int seen_esc = 0; /* seen escape? */ 3509 unicode_t seen_esc = 0, ch;
2842 unsigned int n = 0; 3510 unsigned int n = 0;
2843 unsigned char *s; 3511 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3512 unsigned char string[STRING_MAX];
2846 3513
2847 while ((ch = cmd_getc ())) 3514 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3515 {
2849 if (ch == C0_BEL 3516 if (seen_esc)
2850 || ch == CHAR_ST 3517 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3518 if (ch == 0x5c) /* 7bit ST */
2852 break; 3519 break;
2853 3520 else
3521 return NULL;
3522 }
2854 if (ch == C0_ESC) 3523 else if (ch == C0_ESC)
2855 { 3524 {
2856 seen_esc = 1; 3525 seen_esc = 1;
2857 continue; 3526 continue;
2858 } 3527 }
2859 else if (ch == '\t') 3528 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3529 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3530 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3531 return NULL; /* other control character - exit */
2863 3532
3533 seen_esc = 0;
3534
2864 if (n < sizeof (string) - 1) 3535 if (n >= sizeof (string) - 1)
3536 // stop at some sane length
3537 return NULL;
3538
3539 if (ch == C0_SYN)
3540 string[n++] = cmd_get8 ();
3541 else
2865 string[n++] = ch; 3542 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3543 }
2869 3544
2870 string[n++] = '\0'; 3545 string[n++] = '\0';
2871 3546
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL; 3548 return NULL;
2874 3549
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3550 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3551 strncpy (s, string, n);
2877 return s; 3552 return s;
2878} 3553}
2879 3554
2880/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
2881/* 3556/*
… …
2915 { 3590 {
2916 unsigned char *s = get_to_st (eh); 3591 unsigned char *s = get_to_st (eh);
2917 3592
2918 if (s) 3593 if (s)
2919 { 3594 {
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); 3595 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3596 free (s);
2934 } 3597 }
2935 } 3598 }
2936} 3599}
3600
3601void
3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3603{
3604 if (str[0] == '?' && !str[1])
3605 {
3606 unsigned short r, g, b;
3607 pix_colors_focused[color].get (display, r, g, b);
3608 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3609 }
3610 else
3611 set_window_color (color, str);
3612}
3613
2937/* 3614/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3615 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3616 * 0 = change iconName/title
2940 * 1 = change iconName 3617 * 1 = change iconName
2941 * 2 = change title 3618 * 2 = change title
2942 * 4 = change color 3619 * 4 = change color
3620 * 10 = change fg color
3621 * 11 = change bg color
2943 * 12 = change text color 3622 * 12 = change text color
2944 * 13 = change mouse foreground color 3623 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3624 * 17 = change highlight character colour
2946 * 18 = change bold character color 3625 * 18 = change bold character color
2947 * 19 = change underlined character color 3626 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3627 * 46 = change logfile (not implemented)
2949 * 50 = change font 3628 * 50 = change font
2950 * 3629 *
2951 * rxvt extensions: 3630 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3631 * 20 = bg pixmap
2954 * 39 = change default fg color 3632 * 39 = change default fg color
2955 * 49 = change default bg color 3633 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3634 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3635 * 701 = change locale
2958 * 702 = find font 3636 * 702 = find font
3637 * 703 = menu
2959 */ 3638 */
2960void 3639void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3640rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3641{
2963 int changed = 0; 3642 int changed = 0;
2964 int color; 3643 int color;
2965 char *buf, *name; 3644 char *buf, *name;
3645 bool query = str[0] == '?' && !str[1];
3646 int saveop = op;
2966 3647
2967 assert (str != NULL); 3648 assert (str != NULL);
2968 switch (op) 3649 switch (op)
2969 { 3650 {
2970 case XTerm_name: 3651 case XTerm_name:
… …
2974 set_icon_name (str); 3655 set_icon_name (str);
2975 break; 3656 break;
2976 case XTerm_title: 3657 case XTerm_title:
2977 set_title (str); 3658 set_title (str);
2978 break; 3659 break;
3660 case XTerm_property:
3661 if (str[0] == '?')
3662 {
3663 Atom prop = XInternAtom (display->display, str + 1, True);
3664 Atom actual_type;
3665 int actual_format;
3666 unsigned long nitems;
3667 unsigned long bytes_after;
3668 unsigned char *value = 0;
3669 const char *str = "";
3670
3671 if (prop
3672 && XGetWindowProperty (display->display, TermWin.parent[0],
3673 prop, 0, 1<<16, 0, AnyPropertyType,
3674 &actual_type, &actual_format,
3675 &nitems, &bytes_after, &value) == Success
3676 && actual_type != None
3677 && actual_format == 8)
3678 str = (const char *)(value);
3679
3680 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3681
3682 XFree (value);
3683 }
3684 else
3685 {
3686 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687
3688 if (eq)
3689 {
3690 *eq = 0;
3691 XChangeProperty (display->display, TermWin.parent[0],
3692 display->atom (str), XA_STRING, 8,
3693 PropModeReplace, (unsigned char *)eq + 1,
3694 strlen (eq + 1));
3695 }
3696 else
3697 XDeleteProperty (display->display, TermWin.parent[0],
3698 display->atom (str));
3699 }
3700 break;
3701
2979 case XTerm_Color: 3702 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3703 for (buf = (char *)str; buf && *buf;)
2981 { 3704 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3705 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3706 break;
2984 3707
2985 *name++ = '\0'; 3708 *name++ = '\0';
2986 color = atoi (buf); 3709 color = atoi (buf);
2987 3710
2988 if (color < 0 || color >= TOTAL_COLORS) 3711 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3712 break;
2990 3713
2991 if ((buf = STRCHR (name, ';')) != NULL) 3714 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3715 *buf++ = '\0';
2993 3716
3717 if (name[0] == '?' && !name[1])
3718 {
3719 unsigned short r, g, b;
3720 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3721 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3722 }
3723 else
2994 set_window_color (color + minCOLOR, name); 3724 set_window_color (color + minCOLOR, name);
2995 } 3725 }
3726 break;
3727 case XTerm_Color00:
3728 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3729 break;
3730 case XTerm_Color01:
3731 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3732 break;
2997#ifndef NO_CURSORCOLOR 3733#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3734 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3735 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3736 break;
3001#endif 3737#endif
3002 case XTerm_Color_pointer: 3738 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3739 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3740 break;
3741 case XTerm_Color_pointer_bg:
3742 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3743 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3744#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3745 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3008 break; 3750 break;
3009 case XTerm_Color_UL: 3751 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3753 break;
3012 case XTerm_Color_RV: 3754 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3756 break;
3015#endif 3757#endif
3016 3758#if TRANSPARENT || TINTING
3017 case XTerm_Menu: 3759 case XTerm_Color_tint:
3018 /* 3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3761 check_our_parents ();
3020 * so DON'T do it here 3762 if (am_transparent)
3021 */ 3763 want_full_refresh = want_refresh = 1;
3022 break; 3764 break;
3765#endif
3766
3023 case XTerm_Pixmap: 3767 case XTerm_Pixmap:
3024 if (*str != ';') 3768 if (*str != ';')
3025 { 3769 {
3026#if XPM_BACKGROUND 3770#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3771 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3772 set_bgPixmap (str); /* change pixmap */
3029#endif 3773#endif
3030 scr_touch (true); 3774 scr_touch (true);
3031 } 3775 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3776 while ((str = strchr (str, ';')) != NULL)
3033 { 3777 {
3034 str++; 3778 str++;
3035#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3780 changed += scale_pixmap (str);
3037#endif 3781#endif
… …
3050 set_window_color (Color_fg, str); 3794 set_window_color (Color_fg, str);
3051 break; 3795 break;
3052 case XTerm_restoreBG: 3796 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3797 set_window_color (Color_bg, str);
3054 break; 3798 break;
3799
3055 case XTerm_logfile: 3800 case XTerm_logfile:
3056 // TODO, when secure mode? 3801 // TODO, when secure mode?
3057 break; 3802 break;
3803
3058 case XTerm_font: 3804 case XTerm_font:
3059 change_font (str); 3805 op = URxvt_font;
3806 case URxvt_font:
3807#if ENABLE_STYLES
3808 case URxvt_boldFont:
3809 case URxvt_italicFont:
3810 case URxvt_boldItalicFont:
3811#endif
3812 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3816 resp);
3817 else
3818 {
3819 const char *&res = rs[Rs_font + (op - URxvt_font)];
3820
3821 res = strdup (str);
3822 allocated.push_back ((void *)res);
3823 set_fonts ();
3824 }
3060 break; 3825 break;
3061#ifndef NO_FRILLS 3826
3827#if ENABLE_FRILLS
3062 case XTerm_locale: 3828 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3829 if (query)
3064 tt_printf ("%-.250s\n", locale); 3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3065 else 3831 else
3066 { 3832 {
3067 set_locale (str); 3833 set_locale (str);
3068# ifdef USE_XIM 3834# ifdef USE_XIM
3069 im_cb (); 3835 im_cb ();
3070# endif 3836# endif
3071 } 3837 }
3072 break; 3838 break;
3839#endif
3840
3841#ifdef MENUBAR
3073 case XTerm_findfont: 3842 case XTerm_Menu:
3074 { 3843 if (options & Opt_insecure)
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3844 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; 3845 break;
3079#endif 3846#endif
3080#if 0 3847#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
3082 { 3849 {
3083 int fd; 3850 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3852 {
3086 scr_dump (fd); 3853 scr_dump (fd);
3087 close (fd); 3854 close (fd);
3088 } 3855 }
… …
3108{ 3875{
3109 int state; 3876 int state;
3110 3877
3111 if (mode == 's') 3878 if (mode == 's')
3112 { 3879 {
3113 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3114 return -1; 3881 return -1;
3115 } 3882 }
3116 else 3883 else
3117 { 3884 {
3118 if (mode == 'r') 3885 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3887 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3889 PrivMode (state, bit);
3123 } 3890 }
3124 3891
3125 return state; 3892 return state;
3126} 3893}
… …
3144 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3918#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3152#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3925#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3928 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3929 // 45 margin bell NYI
3163 // 46 start logging 3930 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3942 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3943 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3944 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3945 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3946 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3947 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3948 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3949 };
3183 3950
3184 if (nargs == 0) 3951 if (nargs == 0)
3185 return; 3952 return;
… …
3205 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3973 switch (arg[i])
3207 { 3974 {
3208 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3209 case 1049: 3976 case 1049:
3977 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 3978 if (mode == 0)
3211 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3212 else if (mode == 1) 3980 else if (mode == 1)
3213 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3982 break;
3215 } 3983 }
3216 3984
3217 if (state >= 0) 3985 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3986 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3987 switch (arg[i])
… …
3225 * within VT52 mode 3993 * within VT52 mode
3226 */ 3994 */
3227 PrivMode (1, PrivMode_vt52); 3995 PrivMode (1, PrivMode_vt52);
3228 break; 3996 break;
3229 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4000 break;
3233 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3234 if (state) 4002 if (state)
3235 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3236 else 4004 else
3237 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3238 break; 4006 break;
3239 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3241 break; 4009 break;
3242 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4011 scr_relative_origin (state);
3244 break; 4012 break;
3245 case 7: /* autowrap */ 4013 case 7: /* autowrap */
3246 scr_autowrap (state); 4014 scr_autowrap (state);
3247 break; 4015 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4016 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4019 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4020 break;
3253#ifdef menuBar_esc 4021#ifdef menuBar_esc
3254 case menuBar_esc: 4022 case menuBar_esc:
3255#ifdef MENUBAR 4023#ifdef MENUBAR
3256 map_menuBar (state); 4024 map_menuBar (state);
… …
3267 break; 4035 break;
3268#endif 4036#endif
3269 case 25: /* visible/invisible cursor */ 4037 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4038 scr_cursor_visible (state);
3271 break; 4039 break;
3272 /* case 35: - shift keys */ 4040 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4041 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4042 case 47: /* secondary screen */
3275 scr_change_screen (state); 4043 scr_change_screen (state);
3276 break; 4044 break;
3277 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4049 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4050 break;
3283#if 0 4051#if 0
3284 case 1001: 4052 case 1001:
3285 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3286#endif 4054#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4056 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3290 else 4058 else
3291 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3292 break; 4060 break;
3293 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3294 if (state) 4062 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3296 else 4064 else
3297 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3298 break; 4066 break;
3299 case 1047: /* secondary screen w/ clearing */ 4067 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4068 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4070 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4071 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4072 break;
4073 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen)
4076 if (current_screen != PRIMARY)
4077 scr_erase_screen (2);
4078 break;
3306 default: 4079 default:
3307 break; 4080 break;
3308 } 4081 }
3309 } 4082 }
3310} 4083}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3334 break; 4107 break;
3335 case 1: 4108 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3337 break; 4110 break;
4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3338 case 4: 4115 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3340 break; 4117 break;
3341 case 5: 4118 case 5: // slowly blinking
4119 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4120 rendset = 1, rendstyle = RS_Blink;
3343 break; 4121 break;
4122 //case 6: // scoansi light background
3344 case 7: 4123 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4124 rendset = 1, rendstyle = RS_RVid;
3346 break; 4125 break;
3347 case 8: 4126 case 8:
3348 // invisible. NYI 4127 // invisible. NYI
3349 break; 4128 break;
3350 case 22: 4129 //case 9: // crossed out
4130 //case 10: // scoansi acs off, primary font
4131 //case 11: // scoansi acs on, first alt font
4132 //case 12: // scoansi acs on, |0x80, second alt font
4133 //...
4134 //case 19: // ninth alt font
4135 //case 20: // gothic
4136 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4137 rendset = 0, rendstyle = RS_Bold;
4138 break;
4139 case 22: // normal intensity
4140 rendset = 0, rendstyle = RS_Bold;
4141 break;
4142 case 23: // disable italic
4143 rendset = 0, rendstyle = RS_Italic;
3352 break; 4144 break;
3353 case 24: 4145 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3355 break; 4147 break;
3356 case 25: 4148 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4149 rendset = 0, rendstyle = RS_Blink;
3358 break; 4150 break;
4151 case 26: // variable spacing (iso 8613)
4152 rendset = 0, rendstyle = RS_Blink;
4153 break;
3359 case 27: 4154 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3361 break; 4156 break;
3362 case 28:
3363 // visible. NYI 4157 //case 28: // visible. NYI
3364 break; 4158 //case 29: // not crossed-out
3365 } 4159 }
3366 4160
3367 if (rendset != -1) 4161 if (rendset != -1)
3368 { 4162 {
3369 scr_rendition (rendset, rendstyle); 4163 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4174 case 35:
3381 case 36: 4175 case 36:
3382 case 37: 4176 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4178 break;
3385#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4181 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4183 i += 2;
3391 } 4184 }
3392 break; 4185 break;
3393#endif
3394 case 39: /* default fg */ 4186 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3396 break; 4188 break;
3397 4189
3398 case 40: 4190 case 40:
… …
3403 case 45: 4195 case 45:
3404 case 46: 4196 case 46:
3405 case 47: 4197 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4199 break;
3408#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4202 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4204 i += 2;
3414 } 4205 }
3415 break; 4206 break;
3416#endif
3417 case 49: /* default bg */ 4207 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3419 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3420 4212
3421#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3422 case 90: 4214 case 90:
3423 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3424 case 92: 4216 case 92:
3425 case 93: 4217 case 93:
3426 case 94: 4218 case 94:
3427 case 95: 4219 case 95:
3428 case 96: 4220 case 96:
3429 case 97: 4221 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4223 break;
3433 case 100: 4224 case 100:
3434 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3435 case 102: 4226 case 102:
3436 case 103: 4227 case 103:
3437 case 104: 4228 case 104:
3438 case 105: 4229 case 105:
3439 case 106: 4230 case 106:
3440 case 107: 4231 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4233 break;
3444#endif 4234#endif
3445 4235
3446 } 4236 }
3447 } 4237 }
3448} 4238}
3449/*}}} */ 4239/*}}} */
3450 4240
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4241/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4242void
3453rxvt_term::process_graphics () 4243rxvt_term::process_graphics ()
3454{ 4244{
3455 unicode_t ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3456 4246
3457 if (cmd == 'Q') 4247 if (cmd == 'Q')
3458 { /* query graphics */ 4248 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4250 return;
3461 } 4251 }
3462 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3463 do 4253 do
3464 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4269 unsigned char buf[256];
3480 4270
3481 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4273 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3485} 4275}
3486 4276
3487/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4278/* 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. 4279 * or generated by us in response to a query ESC sequence.
3490 */ 4280 */
3491void 4281void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4282rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4283{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3495 4285
3496 if (len) 4286 if (len)
3497 { 4287 {
3498 if (v_buflen == 0) 4288 if (v_buflen == 0)
3499 { 4289 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3501 4291
3502 if ((unsigned int)written == len) 4292 if ((unsigned int)written == len)
3503 return; 4293 return;
3504 4294
3505 data += written; 4295 data += written;
… …
3513 v_buflen += len; 4303 v_buflen += len;
3514 } 4304 }
3515 4305
3516 for (;;) 4306 for (;;)
3517 { 4307 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3519 4309
3520 if (written > 0) 4310 if (written > 0)
3521 { 4311 {
3522 v_buflen -= written; 4312 v_buflen -= written;
3523 4313

Diff Legend

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