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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.168 by root, Sun Sep 5 09:32:59 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 }
… …
655#endif /* MENUBAR_MAX */ 910#endif /* MENUBAR_MAX */
656 911
657void 912void
658rxvt_term::flush () 913rxvt_term::flush ()
659{ 914{
915 flush_ev.stop ();
916
660#ifdef TRANSPARENT 917#ifdef TRANSPARENT
661 if (want_full_refresh) 918 if (want_full_refresh)
662 { 919 {
663 want_full_refresh = 0; 920 want_full_refresh = 0;
664 scr_clear (); 921 scr_clear ();
665 scr_touch (false); 922 scr_touch (false);
666 want_refresh = 1;
667 } 923 }
668#endif 924#endif
669 925
670 if (want_refresh) 926 if (want_refresh)
671 { 927 {
672 scr_refresh (refresh_type); 928 scr_refresh (refresh_type);
673 scrollbar_show (1); 929 scrollbar_show (1);
674#ifdef USE_XIM 930#ifdef USE_XIM
675 IMSendSpot (); 931 IMSendSpot ();
676#endif 932#endif
677
678 } 933 }
679 934
680 display->flush (); 935 display->flush ();
681} 936}
682 937
… …
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)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1216 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1217 pointer_blank ();
914 } 1218 }
915#endif 1219#endif
916 1220
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1221 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1222 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1223 unsigned int unused_mask;
925 1224
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) 1225 switch (ev.type)
976 { 1226 {
977 case KeyPress: 1227 case KeyPress:
1228#if ISO_14755
1229 if (!(iso14755buf & ISO_14755_52))
1230#endif
978 lookup_key (ev.xkey); 1231 lookup_key (ev.xkey);
1232
1233 break;
1234
1235 case KeyRelease:
1236 {
1237#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1238 KeySym ks;
1239
1240 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1241#endif
1242
1243#if ENABLE_FRILLS || ISO_14755
1244 // ISO 14755 support
1245 if (iso14755buf)
1246 if (iso14755buf & ISO_14755_52)
1247 {
1248# if ENABLE_OVERLAY
1249 scr_overlay_off ();
1250# endif
1251# if ISO_14755
1252 // iso14755 part 5.2 handling: release time
1253 // first: controls
1254 if ((ev.xkey.state & ControlMask)
1255 && ((ks >= 0x40 && ks <= 0x5f)
1256 || (ks >= 0x61 && ks <= 0x7f)))
1257 {
1258 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1259 commit_iso14755 ();
1260 return; // case-break;
1261 }
1262
1263 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1264 if (i[0] == ks)
1265 {
1266 iso14755buf = ISO_14755_51 | i[1];
1267 commit_iso14755 ();
1268 return; // case-break;
1269 }
1270
1271 scr_bell ();
1272# endif
1273 iso14755buf = 0;
979 break; 1274 break;
1275 }
1276 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281 if (iso14755buf & ISO_14755_51)
1282 commit_iso14755 ();
1283#if ISO_14755
1284 else if (iso14755buf & ISO_14755_STARTED)
1285 {
1286 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1287
1288 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1289 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1290 }
1291# endif
1292 else
1293 iso14755buf = 0;
1294 }
1295#endif
980 1296
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1297#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1298 if (!(ev.xkey.state & ControlMask))
1299 slip_wheel_ev.stop ();
1300 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1301 mouse_slip_wheel_speed = 0;
986 else 1302#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; 1303 break;
995 } 1304 }
996#endif
997 1305
998 case ButtonPress: 1306 case ButtonPress:
999 button_press (ev.xbutton); 1307 button_press (ev.xbutton);
1000 break; 1308 break;
1001 1309
… …
1013 && (ev.xclient.data.l[0] == DndFile 1321 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1322 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1323 || ev.xclient.data.l[0] == DndLink))
1016 { 1324 {
1017 /* Get Dnd data */ 1325 /* Get Dnd data */
1018 Atom ActualType; 1326 Atom ActualType;
1019 int ActualFormat; 1327 int ActualFormat;
1020 unsigned char *data; 1328 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1329 unsigned long Size, RemainingBytes;
1022 1330
1023 XGetWindowProperty (display->display, display->root, 1331 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1332 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1333 0L, 1000000L,
1026 False, AnyPropertyType, 1334 False, AnyPropertyType,
… …
1028 &Size, &RemainingBytes, 1336 &Size, &RemainingBytes,
1029 &data); 1337 &data);
1030 XChangeProperty (display->display, display->root, 1338 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1339 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1340 8, PropModeReplace,
1033 data, STRLEN (data)); 1341 data, strlen (data));
1342 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1343 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1345 }
1037#endif /* OFFIX_DND */ 1346#endif /* OFFIX_DND */
1038 break; 1347 break;
1039 1348
1040 case MappingNotify: 1349 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1350 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1351 break;
1043 1352
1044 /* 1353 /*
1045 * XXX: this is not the _current_ arrangement 1354 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1355 * Here's my conclusion:
… …
1071 { 1380 {
1072 TermWin.focus = 1; 1381 TermWin.focus = 1;
1073 want_refresh = 1; 1382 want_refresh = 1;
1074#ifdef USE_XIM 1383#ifdef USE_XIM
1075 if (Input_Context != NULL) 1384 if (Input_Context != NULL)
1385 {
1386 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1387 XSetICFocus (Input_Context);
1388 }
1077#endif 1389#endif
1078#ifdef CURSOR_BLINK 1390#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1391 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1081#endif 1400#endif
1082 1401
1083 } 1402 }
1084 break; 1403 break;
1085 1404
1086 case FocusOut: 1405 case FocusOut:
1087 if (TermWin.focus) 1406 if (TermWin.focus)
1088 { 1407 {
1089 TermWin.focus = 0; 1408 TermWin.focus = 0;
1090 want_refresh = 1; 1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1091#ifdef USE_XIM 1417#ifdef USE_XIM
1092 if (Input_Context != NULL) 1418 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1419 XUnsetICFocus (Input_Context);
1094#endif 1420#endif
1095#ifdef CURSOR_BLINK 1421#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1422 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1423 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1424 hidden_cursor = 0;
1099#endif 1425#endif
1100 1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1101 } 1433 }
1102 break; 1434 break;
1103 1435
1104 case ConfigureNotify: 1436 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1437 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1446 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1448
1117 if (szHint.width != width || szHint.height != height) 1449 if (szHint.width != width || szHint.height != height)
1118 { 1450 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1451 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1452 resize_all_windows (width, height, 1);
1121 } 1453 }
1122#ifdef DEBUG_SIZE 1454
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1456 if (options & Opt_transparent)
1130 { 1457 {
1131 check_our_parents (); 1458 check_our_parents ();
1132 if (am_transparent) 1459 if (am_transparent)
1133 want_full_refresh = 1; 1460 want_refresh = want_full_refresh = 1;
1134 } 1461 }
1135#endif 1462#endif
1136 } 1463 }
1464 break;
1465
1466 case PropertyNotify:
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1137 break; 1471 break;
1138 1472
1139 case SelectionClear: 1473 case SelectionClear:
1140 selection_clear (); 1474 selection_clear ();
1141 break; 1475 break;
… …
1172 1506
1173 case GraphicsExpose: 1507 case GraphicsExpose:
1174 case Expose: 1508 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1509 if (ev.xany.window == TermWin.vt)
1176 { 1510 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1511 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1515
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1521
1185 // ev.xexpose.width, TermWin.height, False); 1522 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1523 }
1189 else 1524 else
1190 { 1525 {
1191 XEvent unused_event; 1526 XEvent unused_event;
1192 1527
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1529 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1531 ;
1198 &unused_event)) ; 1532
1199 if (isScrollbarWindow (ev.xany.window)) 1533 if (isScrollbarWindow (ev.xany.window))
1200 { 1534 {
1201 scrollBar.setIdle (); 1535 scrollBar.setIdle ();
1202 scrollbar_show (0); 1536 scrollbar_show (0);
1203 } 1537 }
1204#ifdef MENUBAR 1538#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1540 menubar_expose ();
1207#endif 1541#endif
1542
1543#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0])
1545 XClearWindow (display->display, ev.xany.window);
1546#endif
1208 } 1547 }
1209 break; 1548 break;
1210 1549
1211 case MotionNotify: 1550 case MotionNotify:
1212#ifdef POINTER_BLANK 1551#ifdef POINTER_BLANK
… …
1218 { 1557 {
1219 menubar_control (ev.xbutton); 1558 menubar_control (ev.xbutton);
1220 break; 1559 break;
1221 } 1560 }
1222#endif 1561#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1563 break;
1225 1564
1226 if (ev.xany.window == TermWin.vt) 1565 if (ev.xany.window == TermWin.vt)
1227 { 1566 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1567 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1568 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1570 ;
1232 1571
1233 XQueryPointer (display->display, TermWin.vt, 1572 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1573 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1574 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1575 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1576 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1577#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1578 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1579 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1580 {
1242#endif 1581#endif
1582#if ISO_14755
1583 // 5.4
1584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1585 {
1586 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1587 break;
1588 }
1589#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1590 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1591 ev.xbutton.state & Button3Mask ? 2 : 0);
1592
1245#ifdef SELECTION_SCROLLING 1593#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1594 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1596 {
1249 int dist; 1597 int dist;
1250 1598
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1599 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1600 * already in the middle of scrolling.
1255 */ 1601 */
1256 if (scroll_selection_delay<=0) 1602 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1603 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1604
1259 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1261 */ 1607 */
1262 selection_save_x=ev.xbutton.x; 1608 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1609 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1611
1267 /* calc number of lines to scroll */ 1612 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1613 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1614 {
1270 scroll_selection_dir = UP; 1615 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1616 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1617 }
1273 else 1618 else
1274 { 1619 {
1275 scroll_selection_dir = DN; 1620 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1622 }
1623
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1624 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1625 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1;
1281 MIN_IT (scroll_selection_lines, 1627 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1628 SELECTION_SCROLL_MAX_LINES);
1283 } 1629 }
1284 else 1630 else
1285 { 1631 {
1286 /* we are within the text window, so we 1632 /* we are within the text window, so we
1287 * shouldn't be scrolling 1633 * shouldn't be scrolling
1288 */ 1634 */
1289 pending_scroll_selection = 0; 1635 if (sel_scroll_ev.active)
1636 sel_scroll_ev.stop();
1290 } 1637 }
1291#endif 1638#endif
1292#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1293
1294 } 1640 }
1295#endif 1641#endif
1296
1297 } 1642 }
1298 } 1643 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1645 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1647 MotionNotify, &ev))
1648 ;
1649
1303 XQueryPointer (display->display, scrollBar.win, 1650 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1651 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1652 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1653 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1654 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1656 scrollbar_size ());
1310 scr_refresh (refresh_type); 1657 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1658 refresh_limit = 0;
… …
1313 } 1660 }
1314 break; 1661 break;
1315 } 1662 }
1316} 1663}
1317 1664
1665#if TRANSPARENT
1318void 1666void
1319rxvt_term::rootwin_cb (XEvent &ev) 1667rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1668{
1321 SET_R (this); 1669 SET_R (this);
1322 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1323 1671
1324 switch (ev.type) 1672 switch (ev.type)
1325 { 1673 {
1326 case PropertyNotify: 1674 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1675 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1676 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1677 * use the property to determine the pixmap. We use it later on.
1339 */ 1678 */
1340 if (xa[XA_XROOTPMAPID] == 0) 1679 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342 1681
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1344 return; 1683 return;
1345 }
1346 1684
1347 /* FALLTHROUGH */ 1685 /* FALLTHROUGH */
1348 case ReparentNotify: 1686 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1688 want_refresh = want_full_refresh = 1;
1351 break; 1689 break;
1352#endif
1353 } 1690 }
1354} 1691}
1692#endif
1355 1693
1356void 1694void
1357rxvt_term::button_press (XButtonEvent &ev) 1695rxvt_term::button_press (XButtonEvent &ev)
1358{ 1696{
1359 int reportmode = 0, clickintime; 1697 int reportmode = 0, clickintime;
1360 1698
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1700 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1701 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702
1364 /* 1703 /*
1365 * VT window processing of button press 1704 * VT window processing of button press
1366 */ 1705 */
1367 if (ev.window == TermWin.vt) 1706 if (ev.window == TermWin.vt)
1368 { 1707 {
1708#if ISO_14755
1709 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 {
1712 iso14755_54 (ev.x, ev.y);
1713 return;
1714 }
1715#endif
1716
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1717 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1718
1370 if (reportmode) 1719 if (reportmode)
1371 { 1720 {
1372 /* mouse report from vt window */ 1721 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1722 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1723 MEvent.state = ev.state;
… …
1403 } 1752 }
1404 else 1753 else
1405 { 1754 {
1406 if (ev.button != MEvent.button) 1755 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1756 MEvent.clicks = 0;
1757
1408 switch (ev.button) 1758 switch (ev.button)
1409 { 1759 {
1410 case Button1: 1760 case Button1:
1761 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */
1763#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask);
1765#else
1766 selection.rect = false;
1767#endif
1768
1411 /* allow shift+left click to extend selection */ 1769 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1771 {
1414 if (MEvent.button == Button1 && clickintime) 1772 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1773 selection_rotate (ev.x, ev.y);
1416 else 1774 else
1417 selection_extend (ev.x, ev.y, 1); 1775 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1790 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1791 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1792 selection_rotate (ev.x, ev.y);
1435 else 1793 else
1436 selection_extend (ev.x, ev.y, 1); 1794 selection_extend (ev.x, ev.y, 1);
1795
1437 MEvent.button = Button3; 1796 MEvent.button = Button3;
1438 break; 1797 break;
1439 } 1798 }
1440 } 1799 }
1800
1441 MEvent.time = ev.time; 1801 MEvent.time = ev.time;
1442 return; 1802 return;
1443 } 1803 }
1444 1804
1445 /* 1805 /*
… …
1511 upordown = 1; /* down */ 1871 upordown = 1; /* down */
1512 } 1872 }
1513 if (upordown) 1873 if (upordown)
1514 { 1874 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1875#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1876 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1877#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1878 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1879 {
1520 if (upordown < 0) 1880 if (upordown < 0)
1521 scrollBar.setUp (); 1881 scrollBar.setUp ();
… …
1537 break; 1897 break;
1538 case R_SB_ALIGN_BOTTOM: 1898 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1899 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1900 break;
1541 } 1901 }
1902
1542 if (scrollBar.style == R_SB_XTERM 1903 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1904 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1905 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1906 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1907
1547 scrollBar.setMotion (); 1908 scrollBar.setMotion ();
1548 break; 1909 break;
1549 1910
1550 case Button1: 1911 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1912 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1936 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1937 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1938 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1939 / scrollbar_size ()));
1579 } 1940 }
1941
1580 break; 1942 break;
1581 } 1943 }
1582 } 1944 }
1583 return; 1945 return;
1584 } 1946 }
… …
1596{ 1958{
1597 int reportmode = 0; 1959 int reportmode = 0;
1598 1960
1599 csrO = 0; /* reset csr Offset */ 1961 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1962 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1963 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1964
1603 if (scrollbar_isUpDn ()) 1965 if (scrollbar_isUpDn ())
1604 { 1966 {
1605 scrollBar.setIdle (); 1967 scrollBar.setIdle ();
1606 scrollbar_show (0); 1968 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1969#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1970 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1971#endif
1610
1611 } 1972 }
1973
1612#ifdef SELECTION_SCROLLING 1974#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1975 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop();
1614#endif 1977#endif
1978
1615 if (ev.window == TermWin.vt) 1979 if (ev.window == TermWin.vt)
1616 { 1980 {
1981#if ISO_14755
1982 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return;
1985#endif
1617 if (reportmode) 1986 if (reportmode)
1618 { 1987 {
1619 /* mouse report from vt window */ 1988 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1989 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1990 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2004 MEvent.button = AnyButton;
1636 mouse_report (ev); 2005 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2006#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2007 return;
1639 } 2008 }
2009
1640 /* 2010 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2011 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2012 * when overriding mouse reporting
1643 */ 2013 */
1644 if (PrivateModes & PrivMode_mouse_report 2014 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2015 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2016 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2017 selection_extend (ev.x, ev.y, 0);
1648 2018
1649 switch (ev.button) 2019 switch (ev.button)
… …
1660 case Button5: 2030 case Button5:
1661 { 2031 {
1662 int i; 2032 int i;
1663 page_dirn v; 2033 page_dirn v;
1664 2034
1665 v = (ev.button == Button4) ? UP : DN; 2035 v = ev.button == Button4 ? UP : DN;
2036
1666 if (ev.state & ShiftMask) 2037 if (ev.state & ShiftMask)
1667 i = 1; 2038 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2039 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2040 i = TermWin.nrow - 1;
1670 else 2041 else
1671 i = 5; 2042 i = 5;
2043
1672# ifdef MOUSE_SLIP_WHEELING 2044# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2045 if (ev.state & ControlMask)
1674 { 2046 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2047 mouse_slip_wheel_speed += v ? -1 : 1;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2050
2051 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2053
2054 slip_wheel_ev.start ();
1677 } 2055 }
2056 else
2057 {
1678# endif 2058# endif
1679# ifdef JUMP_MOUSE_WHEEL 2059# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2060 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2061 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2062 scrollbar_show (1);
2063# else
2064 while (i--)
2065 {
2066 scr_page (v, 1);
2067 scr_refresh (SMOOTH_REFRESH);
2068 scrollbar_show (1);
2069 }
2070# endif
2071# ifdef MOUSE_SLIP_WHEELING
1689 } 2072 }
1690# endif 2073#endif
1691
1692 } 2074 }
1693 break; 2075 break;
1694#endif 2076#endif
1695
1696 } 2077 }
1697 } 2078 }
1698#ifdef MENUBAR 2079#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2080 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2081 menubar_control (ev);
1701#endif 2082#endif
1702} 2083}
1703 2084
1704#ifdef TRANSPARENT 2085#ifdef TRANSPARENT
1705#if TINTING 2086#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2087/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2088
1709static void 2089typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2090
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2091void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2092{
1717 /* No saturation */ 2093 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2094 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i;
1721 2099
1722 b = ((uint16_t *) ptr)[x]; 2100 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2101
1724 g = (b & 0x3e0) * gm; 2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2103
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2104 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2105 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2106 mask_g = visual->green_mask;
1729 } 2107 mask_b = visual->blue_mask;
1730 ptr += bpl; 2108
1731 } 2109 /* boring lookup table pre-initialization */
2110 switch (srcImage->bits_per_pixel) {
2111 case 15:
2112 if ((mask_r != 0x7c00) ||
2113 (mask_g != 0x03e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+32;
2120 sh_r = 10;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 16:
2125 if ((mask_r != 0xf800) ||
2126 (mask_g != 0x07e0) ||
2127 (mask_b != 0x001f))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2130 lookup_r = lookup;
2131 lookup_g = lookup+32;
2132 lookup_b = lookup+32+64;
2133 sh_r = 11;
2134 sh_g = 5;
2135 sh_b = 0;
2136 break;
2137 case 24:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 case 32:
2151 if ((mask_r != 0xff0000) ||
2152 (mask_g != 0x00ff00) ||
2153 (mask_b != 0x0000ff))
2154 return;
2155 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2156 lookup_r = lookup;
2157 lookup_g = lookup+256;
2158 lookup_b = lookup+256+256;
2159 sh_r = 16;
2160 sh_g = 8;
2161 sh_b = 0;
2162 break;
2163 default:
2164 return; /* we do not support this color depth */
2165 }
2166
2167 /* prepare limits for color transformation (each channel is handled separately) */
2168 if (shade < 0) {
2169 shade = -shade;
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = 65535-rm;
2174 lower_lim_g = 65535-gm;
2175 lower_lim_b = 65535-bm;
2176
2177 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2178 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2179 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2180
2181 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2182 } else {
1733 for (y = h; --y >= 0;) { 2183 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2184 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2185
1737 b = ((uint16_t *) ptr)[x]; 2186 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2187
1739 g = (b & 0x3e0) * gm; 2188 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2189 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2190 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2191 }
1743 b |= (!(b >> 5) - 1); 2192
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2193 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2194 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2195 {
1747 } 2196 unsigned int tmp;
1748 ptr += bpl; 2197
2198 tmp = lower_lim_r;
2199 lower_lim_r = lower_lim_b;
2200 lower_lim_b = tmp;
2201
2202 tmp = upper_lim_r;
2203 upper_lim_r = upper_lim_b;
2204 upper_lim_b = tmp;
2205 }
2206
2207 /* fill our lookup tables */
2208 for (i = 0; i <= mask_r>>sh_r; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2212 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2213 lookup_r[i] = (tmp/65535)<<sh_r;
2214 }
2215 for (i = 0; i <= mask_g>>sh_g; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2219 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2220 lookup_g[i] = (tmp/65535)<<sh_g;
2221 }
2222 for (i = 0; i <= mask_b>>sh_b; i++)
2223 {
2224 RUINT32T tmp;
2225 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2226 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2227 lookup_b[i] = (tmp/65535)<<sh_b;
2228 }
2229
2230 /* apply table to input image (replacing colors by newly calculated ones) */
2231 switch (srcImage->bits_per_pixel)
2232 {
2233 case 15:
2234 {
2235 unsigned short *p1, *pf, *p, *pl;
2236 p1 = (unsigned short *) srcImage->data;
2237 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2238 while (p1 < pf)
2239 {
2240 p = p1;
2241 pl = p1 + srcImage->width;
2242 for (; p < pl; p++)
1749 } 2243 {
2244 *p = lookup_r[(*p & 0x7c00)>>10] |
2245 lookup_g[(*p & 0x03e0)>> 5] |
2246 lookup_b[(*p & 0x001f)];
2247 }
2248 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2249 }
1751} 2250 break;
1752 2251 }
1753/* RGB 16 */ 2252 case 16:
1754static void 2253 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2254 unsigned short *p1, *pf, *p, *pl;
1756{ 2255 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2256 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2257 while (p1 < pf)
1759 2258 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2259 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2260 pl = p1 + srcImage->width;
1762 /* No saturation */ 2261 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2262 {
1777 } else { 2263 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2264 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2265 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2266 }
1793 ptr += bpl; 2267 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2268 }
2269 break;
2270 }
2271 case 24:
2272 {
2273 unsigned char *p1, *pf, *p, *pl;
2274 p1 = (unsigned char *) srcImage->data;
2275 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width * 3;
2280 for (; p < pl; p += 3)
1794 } 2281 {
2282 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2283 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2284 p[2] = lookup_r[(p[2] & 0x0000ff)];
2285 }
2286 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2287 }
1796} 2288 break;
2289 }
2290 case 32:
2291 {
2292 RUINT32T *p1, *pf, *p, *pl;
2293 p1 = (RUINT32T *) srcImage->data;
2294 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2295
1798/* RGB 24 */ 2296 while (p1 < pf)
1799static void 2297 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2298 p = p1;
1801{ 2299 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2300 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2301 {
1830 } else { 2302 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2303 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2304 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2305 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2306 }
1861 ptr += bpl; 2307 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2308 }
2309 break;
2310 }
1863 } 2311 }
1864}
1865 2312
1866/* RGB 32 */ 2313 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2314}
1937
1938#endif 2315#endif
1939 2316
1940/* 2317/*
1941 * Check our parents are still who we think they are. 2318 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2319 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2329 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2330 XWindowAttributes wattr, wrootattr;
1954 2331
1955 pchanged = 0; 2332 pchanged = 0;
1956 2333
1957 if (!(Options & Opt_transparent)) 2334 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2335 return pchanged; /* Don't try any more */
1959 2336
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2337 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2338 rootdepth = wrootattr.depth;
1962 2339
… …
1965 if (rootdepth != wattr.depth) 2342 if (rootdepth != wattr.depth)
1966 { 2343 {
1967 if (am_transparent) 2344 if (am_transparent)
1968 { 2345 {
1969 pchanged = 1; 2346 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2348 am_transparent = am_pixmap_trans = 0;
1972 } 2349 }
1973 2350
1974 return pchanged; /* Don't try any more */ 2351 return pchanged; /* Don't try any more */
1975 } 2352 }
… …
1991 i = (xa[XA_XSETROOTID] 2368 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2371 &nitems, &bytes_after, &prop) == Success);
1995 2372
1996 if (!i || prop == NULL) 2373 if (!i || prop == NULL
2374#if TINTING
2375 || !rs[Rs_color + Color_tint]
2376#endif
2377 )
1997 have_pixmap = 0; 2378 have_pixmap = 0;
1998 else 2379 else
1999 { 2380 {
2000 have_pixmap = 1; 2381 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2382 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2383 XFree (prop);
2003 } 2384 }
2004 2385
2005 if (have_pixmap) 2386 if (have_pixmap)
2006 { 2387 {
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2444 XFreePixmap (display->display, TermWin.pixmap);
2064 2445
2065#if TINTING 2446#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2447 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2448 {
2068 unsigned short shade, rm, gm, bm; 2449 unsigned short rm, gm, bm;
2450 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2451
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2452 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2453
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2454 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2455 }
2083#endif 2456#endif
2084 2457
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2459 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2462 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2463 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2464 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2466 XClearWindow (display->display, TermWin.parent[0]);
2094 2467
2095 if (!am_transparent || !am_pixmap_trans) 2468 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2469 pchanged = 1;
2097 2470
2098 am_transparent = am_pixmap_trans = 1; 2471 am_transparent = am_pixmap_trans = 1;
… …
2103 { 2476 {
2104 unsigned int n; 2477 unsigned int n;
2105 /* 2478 /*
2106 * InheritPixmap transparency 2479 * InheritPixmap transparency
2107 */ 2480 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2482 {
2111 oldp = TermWin.parent[i]; 2483 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2484 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2485 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2486 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2487
2117 if (TermWin.parent[i] == display->root) 2488 if (TermWin.parent[i] == display->root)
2118 { 2489 {
2119 if (oldp != None) 2490 if (oldp != None)
2120 pchanged = 1; 2491 pchanged = 1;
… …
2131 if (pchanged) 2502 if (pchanged)
2132 { 2503 {
2133 for (; n < (unsigned int)i; n++) 2504 for (; n < (unsigned int)i; n++)
2134 { 2505 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2508 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2510 break;
2141 } 2511 }
2142 } 2512 }
2143 } 2513 }
2144 2514
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2516 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2519 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2520 /* XXX: also turn off Opt_transparent? */
2152 } 2521 }
2153 else 2522 else
2154 { 2523 {
2155#if WAIT_FOR_WM 2524#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2525 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2526 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2527 sleep (1);
2159#endif 2528#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2529 for (n = 0; n < (unsigned int)i; n++)
2530 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]);
2533 }
2163 2534
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2536 am_transparent = 1;
2166 } 2537 }
2167 2538
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2540 TermWin.parent[i] = None;
2541 }
2542
2543 if (scrollBar.win)
2544 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle ();
2547 scrollbar_show (0);
2170 } 2548 }
2171 2549
2172 return pchanged; 2550 return pchanged;
2173} 2551}
2174#endif 2552#endif
… …
2191 } 2569 }
2192 2570
2193 if (ch == NOCHAR) // TODO: improve 2571 if (ch == NOCHAR) // TODO: improve
2194 break; 2572 break;
2195 2573
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 {
2576 if (!seen_input)
2197 { 2577 {
2578 seen_input = 1;
2579 // many badly-written programs (e.g. jed) contain a race condition:
2580 // they first read the screensize and then install a SIGWINCH handler.
2581 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized.
2586 if (seen_resize)
2587 kill (-cmd_pid, SIGWINCH);
2588 }
2589
2198 /* Read a text string from the input buffer */ 2590 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2591 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2592 bool refreshnow = false;
2201 int nlines = 0; 2593 int nlines = 0;
2202 unicode_t *str = buf; 2594 unicode_t *str = buf;
2203 2595
2204 *str++ = ch;
2205
2206 for (;;) 2596 for (;;)
2207 { 2597 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2599 break;
2213 2600
2214 *str++ = ch; 2601 *str++ = ch;
2215 2602
2216 if (ch == '\n') 2603 if (ch == C0_LF)
2217 { 2604 {
2218 nlines++; 2605 nlines++;
2219 refresh_count++; 2606 refresh_count++;
2220 2607
2221 if (! (Options & Opt_jumpScroll) 2608 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2610 {
2224 refreshnow = true; 2611 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2612 ch = NOCHAR;
2227 break; 2613 break;
2228 } 2614 }
2229 2615
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2617 if (nlines >= TermWin.nrow - 1)
2232 { 2618 {
2233 scr_add_lines (buf, nlines, str - buf); 2619 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2620 nlines = 0;
2235 str = buf; 2621 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2625 if (str >= buf + UBUFSIZ)
2240 { 2626 {
2241 ch = NOCHAR; 2627 ch = NOCHAR;
2242 break; 2628 break;
2243 } 2629 }
2630
2631 seq_begin = cmdbuf_ptr;
2632 ch = next_char ();
2244 } 2633 }
2245 2634
2246 scr_add_lines (buf, nlines, str - buf); 2635 scr_add_lines (buf, nlines, str - buf);
2247 2636
2248 /* 2637 /*
2249 * If there have been a lot of new lines, then update the screen 2638 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2639 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2640 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2641 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2642 */
2257 if (refreshnow) 2643 if (refreshnow)
2258 { 2644 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2646 refresh_limit++;
2261 2647 else
2648 {
2649 flag = true;
2262 scr_refresh (refresh_type); 2650 scr_refresh (refresh_type);
2651 }
2263 } 2652 }
2264 2653
2265 } 2654 }
2266 else 2655 else
2267 { 2656 {
… …
2281 } 2670 }
2282 2671
2283 return flag; 2672 return flag;
2284} 2673}
2285 2674
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2286// read the next character 2684// read the next character
2287unicode_t 2685unicode_t
2288rxvt_term::next_char () 2686rxvt_term::next_char ()
2289{ 2687{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2688 while (cmdbuf_ptr < cmdbuf_endp)
… …
2321 */ 2719 */
2322unicode_t 2720unicode_t
2323rxvt_term::cmd_getc () 2721rxvt_term::cmd_getc ()
2324{ 2722{
2325 unicode_t c = next_char (); 2723 unicode_t c = next_char ();
2724
2725 if (c == NOCHAR)
2726 throw out_of_input;
2727
2728 return c;
2729}
2730
2731unicode_t
2732rxvt_term::cmd_get8 ()
2733{
2734 unicode_t c = next_octet ();
2326 2735
2327 if (c == NOCHAR) 2736 if (c == NOCHAR)
2328 throw out_of_input; 2737 throw out_of_input;
2329 2738
2330 return c; 2739 return c;
… …
2431 process_escape_seq (); 2840 process_escape_seq ();
2432 break; 2841 break;
2433 case C0_ENQ: /* terminal Status */ 2842 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2843 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2846 else
2438 tt_write ((unsigned char *)VT100_ANS, 2847 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2848 (unsigned int)strlen (VT100_ANS));
2440 break; 2849 break;
2441 case C0_BEL: /* bell */ 2850 case C0_BEL: /* bell */
2442 scr_bell (); 2851 scr_bell ();
2443 break; 2852 break;
2444 case C0_BS: /* backspace */ 2853 case C0_BS: /* backspace */
… …
2460 break; 2869 break;
2461 case C0_SI: /* shift in - acs */ 2870 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2871 scr_charset_choose (0);
2463 break; 2872 break;
2464 2873
2874#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2875 // 8-bit controls
2466 case 0x90: /* DCS */ 2876 case 0x90: /* DCS */
2467 process_dcs_seq (); 2877 process_dcs_seq ();
2468 break; 2878 break;
2469 case 0x9b: /* CSI */ 2879 case 0x9b: /* CSI */
2470 process_csi_seq (); 2880 process_csi_seq ();
2471 break; 2881 break;
2472 case 0x9d: /* CSI */ 2882 case 0x9d: /* CSI */
2473 process_osc_seq (); 2883 process_osc_seq ();
2474 break; 2884 break;
2885#endif
2475 } 2886 }
2476} 2887}
2477/*}}} */ 2888/*}}} */
2478 2889
2479 2890
… …
2541void 2952void
2542rxvt_term::process_escape_seq () 2953rxvt_term::process_escape_seq ()
2543{ 2954{
2544 unicode_t ch = cmd_getc (); 2955 unicode_t ch = cmd_getc ();
2545 2956
2546 if (PrivateModes & PrivMode_vt52) 2957 if (priv_modes & PrivMode_vt52)
2547 { 2958 {
2548 process_escape_vt52 (ch); 2959 process_escape_vt52 (ch);
2549 return; 2960 return;
2550 } 2961 }
2551 2962
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2977 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2978 break;
2568 case '+': 2979 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2980 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2981 break;
2571#ifndef NO_FRILLS 2982#if ENABLE_FRILLS
2572 case '6': 2983 case '6':
2573 scr_backindex (); 2984 scr_backindex ();
2574 break; 2985 break;
2575#endif 2986#endif
2576 case '7': 2987 case '7':
2577 scr_cursor (SAVE); 2988 scr_cursor (SAVE);
2578 break; 2989 break;
2579 case '8': 2990 case '8':
2580 scr_cursor (RESTORE); 2991 scr_cursor (RESTORE);
2581 break; 2992 break;
2582#ifndef NO_FRILLS 2993#if ENABLE_FRILLS
2583 case '9': 2994 case '9':
2584 scr_forwardindex (); 2995 scr_forwardindex ();
2585 break; 2996 break;
2586#endif 2997#endif
2587 case '=': 2998 case '=':
… …
2597 break; 3008 break;
2598 3009
2599 /* 8.3.87: NEXT LINE */ 3010 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3011 case C1_NEL: /* ESC E */
2601 { 3012 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3013 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3014 scr_add_lines (nlcr, 1, 2);
2604 } 3015 }
2605 break; 3016 break;
2606 3017
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3018 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3079
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3080/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3081/* *INDENT-OFF* */
2671enum { 3082enum {
2672 CSI_ICH = 0x40, 3083 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3084 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3085 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3086 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3087 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3088 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3089 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3298 break;
2888 3299
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3301 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3302 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3303 break;
2893 3304
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3306 process_sgr_mode (nargs, arg);
2896 break; 3307 break;
… …
2903 break; 3314 break;
2904 case 6: /* CPR requested */ 3315 case 6: /* CPR requested */
2905 scr_report_position (); 3316 scr_report_position ();
2906 break; 3317 break;
2907 case 7: /* unofficial extension */ 3318 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3319 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3320 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3321 break;
2911 case 8: /* unofficial extension */ 3322 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3324 break;
2914 } 3325 }
… …
2950 break; 3361 break;
2951 3362
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3363 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3364 if (arg[0] == 4)
2954 scr_insert_mode (0); 3365 scr_insert_mode (0);
3366 else if (arg[0] == 20)
3367 priv_modes &= ~PrivMode_LFNL;
2955 break; 3368 break;
2956 3369
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3370 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3371 if (arg[0] == 4)
2959 scr_insert_mode (1); 3372 scr_insert_mode (1);
3373 else if (arg[0] == 20)
3374 priv_modes |= PrivMode_LFNL;
2960 break; 3375 break;
2961 3376
2962 /* 3377 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3378 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3379 */
… …
2976 break; 3391 break;
2977 case CSI_75: 3392 case CSI_75:
2978 scr_cursor (RESTORE); 3393 scr_cursor (RESTORE);
2979 break; 3394 break;
2980 3395
2981#ifndef NO_FRILLS 3396#if ENABLE_FRILLS
2982 case CSI_74: 3397 case CSI_74:
2983 process_window_ops (arg, nargs); 3398 process_window_ops (arg, nargs);
2984 break; 3399 break;
2985#endif 3400#endif
2986 3401
… …
2993 break; 3408 break;
2994 } 3409 }
2995} 3410}
2996/*}}} */ 3411/*}}} */
2997 3412
2998#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
2999/* ARGSUSED */ 3414/* ARGSUSED */
3000void 3415void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3417{
3003 int x, y; 3418 int x, y;
… …
3070 break; 3485 break;
3071 case 19: /* report window size (chars) */ 3486 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3488 break;
3074 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3490 {
3077 char *s; 3491 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (display->display, TermWin.parent[0], &s);
3079 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);
3080 } 3495 }
3081 break; 3496 break;
3082 case 21: /* report window title */ 3497 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3498 {
3085 char *s; 3499 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (display->display, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s);
3088 } 3503 }
3089 break; 3504 break;
3090 } 3505 }
3091} 3506}
3092#endif 3507#endif
3093 3508
3094/*----------------------------------------------------------------------*/ 3509/*----------------------------------------------------------------------*/
3095/* 3510/*
3096 * get input up until STRING TERMINATOR (or BEL) 3511 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3512 * ends_how is terminator used. returned input must be free()'d
3098 */ 3513 */
3099unsigned char * 3514unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3515rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3516{
3102 int seen_esc = 0; /* seen escape? */ 3517 unicode_t seen_esc = 0, ch;
3103 unsigned int n = 0; 3518 unsigned int n = 0;
3104 unsigned char *s; 3519 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3520 unsigned char string[STRING_MAX];
3107 3521
3108 while ((ch = cmd_getc ())) 3522 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3523 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3524 if (seen_esc)
3525 {
3114 if (ch == 0x5c) /* 7bit ST */ 3526 if (ch == 0x5c) /* 7bit ST */
3115 break; 3527 break;
3116 else 3528 else
3117 return NULL; 3529 return NULL;
3118 3530 }
3119 if (ch == C0_ESC) 3531 else if (ch == C0_ESC)
3120 { 3532 {
3121 seen_esc = 1; 3533 seen_esc = 1;
3122 continue; 3534 continue;
3123 } 3535 }
3124 else if (ch == '\t') 3536 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3537 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3538 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3539 return NULL; /* other control character - exit */
3540
3541 seen_esc = 0;
3128 3542
3129 if (n >= sizeof (string) - 1) 3543 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3544 // stop at some sane length
3131 return NULL; 3545 return NULL;
3132 3546
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
3133 string[n++] = ch; 3550 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3551 }
3136 3552
3137 string[n++] = '\0'; 3553 string[n++] = '\0';
3138 3554
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL; 3556 return NULL;
3141 3557
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3558 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3559 strncpy (s, string, n);
3144 return s; 3560 return s;
3145} 3561}
3146 3562
3147/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
3148/* 3564/*
… …
3193void 3609void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3611{
3196 if (str[0] == '?' && !str[1]) 3612 if (str[0] == '?' && !str[1])
3197 { 3613 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3614 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3615 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3617 }
3205 else 3618 else
3206 set_window_color (color, str); 3619 set_window_color (color, str);
3207} 3620}
3208 3621
… …
3236{ 3649{
3237 int changed = 0; 3650 int changed = 0;
3238 int color; 3651 int color;
3239 char *buf, *name; 3652 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3653 bool query = str[0] == '?' && !str[1];
3654 int saveop = op;
3241 3655
3242 assert (str != NULL); 3656 assert (str != NULL);
3243 switch (op) 3657 switch (op)
3244 { 3658 {
3245 case XTerm_name: 3659 case XTerm_name:
… …
3294 break; 3708 break;
3295 3709
3296 case XTerm_Color: 3710 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3711 for (buf = (char *)str; buf && *buf;)
3298 { 3712 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3713 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3714 break;
3301 3715
3302 *name++ = '\0'; 3716 *name++ = '\0';
3303 color = atoi (buf); 3717 color = atoi (buf);
3304 3718
3305 if (color < 0 || color >= TOTAL_COLORS) 3719 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3720 break;
3307 3721
3308 if ((buf = STRCHR (name, ';')) != NULL) 3722 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3723 *buf++ = '\0';
3310 3724
3311 if (name[0] == '?' && !name[1]) 3725 if (name[0] == '?' && !name[1])
3312 { 3726 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3727 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3728 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3729 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3730 }
3320 else 3731 else
3321 set_window_color (color + minCOLOR, name); 3732 set_window_color (color + minCOLOR, name);
3322 } 3733 }
3323 break; 3734 break;
… …
3340 break; 3751 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3752#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3753 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3755 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3345 case XTerm_Color_UL: 3759 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3761 break;
3348 case XTerm_Color_RV: 3762 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3764 break;
3765#endif
3766#if TRANSPARENT || TINTING
3767 case XTerm_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3769 check_our_parents ();
3770 if (am_transparent)
3771 want_full_refresh = want_refresh = 1;
3350 break; 3772 break;
3351#endif 3773#endif
3352 3774
3353 case XTerm_Pixmap: 3775 case XTerm_Pixmap:
3354 if (*str != ';') 3776 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3779 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3780 set_bgPixmap (str); /* change pixmap */
3359#endif 3781#endif
3360 scr_touch (true); 3782 scr_touch (true);
3361 } 3783 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3784 while ((str = strchr (str, ';')) != NULL)
3363 { 3785 {
3364 str++; 3786 str++;
3365#if XPM_BACKGROUND 3787#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3788 changed += scale_pixmap (str);
3367#endif 3789#endif
… …
3386 case XTerm_logfile: 3808 case XTerm_logfile:
3387 // TODO, when secure mode? 3809 // TODO, when secure mode?
3388 break; 3810 break;
3389 3811
3390 case XTerm_font: 3812 case XTerm_font:
3813 op = URxvt_font;
3814 case URxvt_font:
3815#if ENABLE_STYLES
3816 case URxvt_boldFont:
3817 case URxvt_italicFont:
3818 case URxvt_boldItalicFont:
3819#endif
3391 if (query) 3820 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3824 resp);
3825 else
3392 { 3826 {
3393 if (Options & Opt_insecure) 3827 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3828
3395 TermWin.fontset->fontdesc 3829 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3830 allocated.push_back ((void *)res);
3397 : "", 3831 set_fonts ();
3398 resp);
3399 } 3832 }
3400 else
3401 change_font (str);
3402 break; 3833 break;
3403 3834
3404#ifndef NO_FRILLS 3835#if ENABLE_FRILLS
3405 case XTerm_locale: 3836 case XTerm_locale:
3406 if (query) 3837 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3839 else
3412 { 3840 {
3413 set_locale (str); 3841 set_locale (str);
3414# ifdef USE_XIM 3842# ifdef USE_XIM
3415 im_cb (); 3843 im_cb ();
3416# endif 3844# endif
3417 } 3845 }
3418 break; 3846 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3847#endif
3429 3848
3430#ifdef MENUBAR 3849#ifdef MENUBAR
3431 case XTerm_Menu: 3850 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3851 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3853 break;
3435#endif 3854#endif
3436#if 0 3855#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3856 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3883{
3465 int state; 3884 int state;
3466 3885
3467 if (mode == 's') 3886 if (mode == 's')
3468 { 3887 {
3469 SavedModes |= (PrivateModes & bit); 3888 SavedModes |= (priv_modes & bit);
3470 return -1; 3889 return -1;
3471 } 3890 }
3472 else 3891 else
3473 { 3892 {
3474 if (mode == 'r') 3893 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3894 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3895 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3896 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3897 PrivMode (state, bit);
3479 } 3898 }
3480 3899
3481 return state; 3900 return state;
3482} 3901}
… …
3500 { 3, PrivMode_132 }, 3919 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3920 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3921 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3922 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3923 { 7, PrivMode_Autowrap },
3924 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3925 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3926#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3927 { menuBar_esc, PrivMode_menuBar },
3508#endif 3928#endif
3929 // 18, 19 printing-related
3930 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3931#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3932 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3933#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3934 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3935 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3936 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3937 // 45 margin bell NYI
3519 // 46 start logging 3938 // 46 start logging
… …
3560 3979
3561 /* extra handling for values with state unkept */ 3980 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3981 switch (arg[i])
3563 { 3982 {
3564 case 1048: /* alternative cursor save */ 3983 case 1048: /* alternative cursor save */
3984 case 1049:
3565 if (Options & Opt_secondaryScreen) 3985 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3986 if (mode == 0)
3567 scr_cursor (RESTORE); 3987 scr_cursor (RESTORE);
3568 else if (mode == 1) 3988 else if (mode == 1)
3569 scr_cursor (SAVE); 3989 scr_cursor (SAVE);
3570 break; 3990 break;
… …
3581 * within VT52 mode 4001 * within VT52 mode
3582 */ 4002 */
3583 PrivMode (1, PrivMode_vt52); 4003 PrivMode (1, PrivMode_vt52);
3584 break; 4004 break;
3585 case 3: /* 80/132 */ 4005 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4006 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4008 break;
3589 case 4: /* smooth scrolling */ 4009 case 4: /* smooth scrolling */
3590 if (state) 4010 if (state)
3591 Options &= ~Opt_jumpScroll; 4011 options &= ~Opt_jumpScroll;
3592 else 4012 else
3593 Options |= Opt_jumpScroll; 4013 options |= Opt_jumpScroll;
3594 break; 4014 break;
3595 case 5: /* reverse video */ 4015 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4016 scr_rvideo_mode (state);
3597 break; 4017 break;
3598 case 6: /* relative/absolute origins */ 4018 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4022 scr_autowrap (state);
3603 break; 4023 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4024 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4025 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4026 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4027 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4028 break;
3609#ifdef menuBar_esc 4029#ifdef menuBar_esc
3610 case menuBar_esc: 4030 case menuBar_esc:
3611#ifdef MENUBAR 4031#ifdef MENUBAR
3612 map_menuBar (state); 4032 map_menuBar (state);
… …
3632 break; 4052 break;
3633 /* case 66: - application key pad */ 4053 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4054 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4055 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4056 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4057 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4058 break;
3639#if 0 4059#if 0
3640 case 1001: 4060 case 1001:
3641 break; /* X11 mouse highlighting */ 4061 break; /* X11 mouse highlighting */
3642#endif 4062#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4063 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4064 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4065 options &= ~Opt_scrollTtyOutput;
3646 else 4066 else
3647 Options |= Opt_scrollTtyOutput; 4067 options |= Opt_scrollTtyOutput;
3648 break; 4068 break;
3649 case 1011: /* scroll to bottom on key press */ 4069 case 1011: /* scroll to bottom on key press */
3650 if (state) 4070 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4071 options |= Opt_scrollTtyKeypress;
3652 else 4072 else
3653 Options &= ~Opt_scrollTtyKeypress; 4073 options &= ~Opt_scrollTtyKeypress;
3654 break; 4074 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4075 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4076 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4077 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4078 scr_erase_screen (2);
3659 scr_change_screen (state); 4079 scr_change_screen (state);
3660 break; 4080 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4081 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4082 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4083 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4084 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4085 scr_erase_screen (2);
3666 break; 4086 break;
3667 default: 4087 default:
3668 break; 4088 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4114 rendset = 0, rendstyle = ~RS_None;
3695 break; 4115 break;
3696 case 1: 4116 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4117 rendset = 1, rendstyle = RS_Bold;
3698 break; 4118 break;
4119 //case 2: // low intensity
4120 case 3:
4121 rendset = 1, rendstyle = RS_Italic;
4122 break;
3699 case 4: 4123 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4124 rendset = 1, rendstyle = RS_Uline;
3701 break; 4125 break;
3702 case 5: 4126 case 5: // slowly blinking
4127 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4128 rendset = 1, rendstyle = RS_Blink;
3704 break; 4129 break;
4130 //case 6: // scoansi light background
3705 case 7: 4131 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4132 rendset = 1, rendstyle = RS_RVid;
3707 break; 4133 break;
3708 case 8: 4134 case 8:
3709 // invisible. NYI 4135 // invisible. NYI
3710 break; 4136 break;
3711 case 22: 4137 //case 9: // crossed out
4138 //case 10: // scoansi acs off, primary font
4139 //case 11: // scoansi acs on, first alt font
4140 //case 12: // scoansi acs on, |0x80, second alt font
4141 //...
4142 //case 19: // ninth alt font
4143 //case 20: // gothic
4144 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4145 rendset = 0, rendstyle = RS_Bold;
4146 break;
4147 case 22: // normal intensity
4148 rendset = 0, rendstyle = RS_Bold;
4149 break;
4150 case 23: // disable italic
4151 rendset = 0, rendstyle = RS_Italic;
3713 break; 4152 break;
3714 case 24: 4153 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4154 rendset = 0, rendstyle = RS_Uline;
3716 break; 4155 break;
3717 case 25: 4156 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4157 rendset = 0, rendstyle = RS_Blink;
3719 break; 4158 break;
4159 case 26: // variable spacing (iso 8613)
4160 rendset = 0, rendstyle = RS_Blink;
4161 break;
3720 case 27: 4162 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4163 rendset = 0, rendstyle = RS_RVid;
3722 break; 4164 break;
3723 case 28:
3724 // visible. NYI 4165 //case 28: // visible. NYI
3725 break; 4166 //case 29: // not crossed-out
3726 } 4167 }
3727 4168
3728 if (rendset != -1) 4169 if (rendset != -1)
3729 { 4170 {
3730 scr_rendition (rendset, rendstyle); 4171 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4182 case 35:
3742 case 36: 4183 case 36:
3743 case 37: 4184 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4185 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4186 break;
3746#ifdef TTY_256COLOR 4187 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4188 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4189 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4190 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4191 i += 2;
3752 } 4192 }
3753 break; 4193 break;
3754#endif
3755 case 39: /* default fg */ 4194 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4195 scr_color (Color_fg, Color_fg);
3757 break; 4196 break;
3758 4197
3759 case 40: 4198 case 40:
… …
3764 case 45: 4203 case 45:
3765 case 46: 4204 case 46:
3766 case 47: 4205 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4206 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4207 break;
3769#ifdef TTY_256COLOR 4208 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4209 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4210 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4211 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4212 i += 2;
3775 } 4213 }
3776 break; 4214 break;
3777#endif
3778 case 49: /* default bg */ 4215 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4216 scr_color (Color_bg, Color_bg);
3780 break; 4217 break;
4218
4219 //case 50: // not variable spacing
3781 4220
3782#ifndef NO_BRIGHTCOLOR 4221#ifndef NO_BRIGHTCOLOR
3783 case 90: 4222 case 90:
3784 case 91: /* set bright fg color */ 4223 case 91: /* set bright fg color */
3785 case 92: 4224 case 92:
3786 case 93: 4225 case 93:
3787 case 94: 4226 case 94:
3788 case 95: 4227 case 95:
3789 case 96: 4228 case 96:
3790 case 97: 4229 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4230 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4231 break;
3794 case 100: 4232 case 100:
3795 case 101: /* set bright bg color */ 4233 case 101: /* set bright bg color */
3796 case 102: 4234 case 102:
3797 case 103: 4235 case 103:
3798 case 104: 4236 case 104:
3799 case 105: 4237 case 105:
3800 case 106: 4238 case 106:
3801 case 107: 4239 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4241 break;
3805#endif 4242#endif
3806 4243
3807 } 4244 }
3808 } 4245 }
3809} 4246}
3810/*}}} */ 4247/*}}} */
3811 4248
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4249/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4250void
3814rxvt_term::process_graphics () 4251rxvt_term::process_graphics ()
3815{ 4252{
3816 unicode_t ch, cmd = cmd_getc (); 4253 unicode_t ch, cmd = cmd_getc ();
3817 4254
3818 if (cmd == 'Q') 4255 if (cmd == 'Q')
3819 { /* query graphics */ 4256 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4257 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4258 return;
3822 } 4259 }
3823 /* swallow other graphics sequences until terminating ':' */ 4260 /* swallow other graphics sequences until terminating ':' */
3824 do 4261 do
3825 ch = cmd_getc (); 4262 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4277 unsigned char buf[256];
3841 4278
3842 va_start (arg_ptr, fmt); 4279 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4281 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4282 tt_write (buf, strlen (buf));
3846} 4283}
3847 4284
3848/* ---------------------------------------------------------------------- */ 4285/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4286/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4287 * or generated by us in response to a query ESC sequence.
3851 */ 4288 */
3852void 4289void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4290rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4291{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3856 4293
3857 if (len) 4294 if (len)
3858 { 4295 {
3859 if (v_buflen == 0) 4296 if (v_buflen == 0)
3860 { 4297 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3862 4299
3863 if ((unsigned int)written == len) 4300 if ((unsigned int)written == len)
3864 return; 4301 return;
3865 4302
3866 data += written; 4303 data += written;
… …
3874 v_buflen += len; 4311 v_buflen += len;
3875 } 4312 }
3876 4313
3877 for (;;) 4314 for (;;)
3878 { 4315 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3880 4317
3881 if (written > 0) 4318 if (written > 0)
3882 { 4319 {
3883 v_buflen -= written; 4320 v_buflen -= written;
3884 4321

Diff Legend

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