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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

… …
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 iso14755buf = ISO_14755_54;
140 break;
141 }
142
143 x--;
144 }
145
146}
147#endif
148
149#if ENABLE_OVERLAY
150void
151rxvt_term::iso14755_51 (wchar_t ch)
152{
153 wchar_t *chr, *alloc;
154 int len;
155
156#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch))
158 {
159 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr);
162 }
163 else
164#endif
165 {
166 alloc = 0;
167 chr = &ch;
168 len = 1;
169 }
170
171 scr_overlay_new (0, -1, 8 + 5, len);
172
173 for (int y = 0; y < len; y++)
174 {
175 char buf[9];
176
177 ch = *chr++;
178
179 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '=');
182#if !UNICODE3
183 if (ch >= 0x10000)
184 ch = 0xfffd;
185#endif
186 scr_overlay_set (11, y, ch);
187 scr_overlay_set (12, y, NOCHAR);
188 }
189
190#if ENABLE_COMBINING
191 if (alloc)
192 delete [] alloc;
193#endif
194}
195#endif
196
197void
198rxvt_term::commit_iso14755 ()
199{
200 wchar_t ch[2];
201
202 ch[0] = iso14755buf & ISO_14755_MASK;
203 ch[1] = 0;
204
205 if (iso14755buf & ISO_14755_51)
206 {
207 char mb[16];
208 int len;
209
210 // allow verbatim 0-bytes and control-bytes to be entered
211 if (ch[0] >= 0x20)
212 len = wcstombs (mb, ch, 16);
213 else
214 {
215 mb[0] = ch[0];
216 len = 1;
217 }
218
219 if (len > 0)
220 tt_write ((unsigned char *)mb, len);
221 else
222 scr_bell ();
223 }
224
225 iso14755buf = 0;
226}
227
228int
229rxvt_term::hex_keyval (XKeyEvent &ev)
230{
231 // check wether this event corresponds to a hex digit
232 // if the modifiers had not been pressed.
233 for (int index = 0; index < 8; index++)
234 {
235 KeySym k = XLookupKeysym (&ev, index);
236
237 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
238 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
239 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
240 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
241 }
242
243 return -1;
244}
245#endif
246
62/*{{{ Convert the keypress event into a string */ 247/*{{{ Convert the keypress event into a string */
63void 248void
64rxvt_term::lookup_key (XKeyEvent &ev) 249rxvt_term::lookup_key (XKeyEvent &ev)
65{ 250{
66 int ctrl, meta, shft, len; 251 int ctrl, meta, shft, len;
… …
151 { 336 {
152 if (TermWin.saveLines) 337 if (TermWin.saveLines)
153 { 338 {
154#ifdef UNSHIFTED_SCROLLKEYS 339#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 340 if (!ctrl && !meta)
156 {
157#else 341#else
158 if (IS_SCROLL_MOD) 342 if (IS_SCROLL_MOD)
343#endif
159 { 344 {
160#endif
161 int lnsppg; 345 int lnsppg;
162 346
163#ifdef PAGING_CONTEXT_LINES 347#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 349#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 398 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 399 {
216 keysym += (XK_F11 - XK_F1); 400 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 401 shft = 0; /* turn off Shift */
218 } 402 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 403 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 404 {
221 switch (keysym) 405 switch (keysym)
222 { 406 {
223 /* normal XTerm key bindings */ 407 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 408 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 409 selection_request (ev.time, 0, 0);
226 return; 410 return;
411#if TODO // TODO
227 /* rxvt extras */ 412 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 413 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 414 change_font (FONT_UP);
230 return; 415 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 417 change_font (FONT_DN);
233 return; 418 return;
419#endif
234 } 420 }
235 } 421 }
236 } 422 }
423
424#if ENABLE_FRILLS || ISO_14755
425 // ISO 14755 support
426 if (shft && ctrl)
427 {
428 int hv;
429
430 if (iso14755buf & ISO_14755_51
431 && (keysym == XK_space || keysym == XK_KP_Space
432 || keysym == XK_Return || keysym == XK_KP_Enter))
433 {
434 commit_iso14755 ();
435 iso14755buf = ISO_14755_51;
436# if ISO_14755
437 iso14755_51 (0);
438# endif
439 return;
440 }
441 else if ((hv = hex_keyval (ev)) >= 0)
442 {
443 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
444 | hv | ISO_14755_51;
445# if ISO_14755
446 iso14755_51 (iso14755buf & ISO_14755_MASK);
447# endif
448 return;
449 }
450 else
451 {
452# if ENABLE_OVERLAY
453 scr_overlay_off ();
454# endif
455 iso14755buf = 0;
456 }
457 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED))
461 {
462 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif
467 }
468#endif
469
237#ifdef PRINTPIPE 470#ifdef PRINTPIPE
238 if (keysym == XK_Print) 471 if (keysym == XK_Print)
239 { 472 {
240 scr_printscreen (ctrl | shft); 473 scr_printscreen (ctrl | shft);
241 return; 474 return;
… …
273 newlen = 1; 506 newlen = 1;
274 switch (keysym) 507 switch (keysym)
275 { 508 {
276#ifndef NO_BACKSPACE_KEY 509#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 510 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 511 if (priv_modes & PrivMode_HaveBackSpace)
279 { 512 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 514 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 515 kbuf[1] = '\0';
283 } 516 }
284 else 517 else
285 STRCPY (kbuf, key_backspace); 518 strcpy (kbuf, key_backspace);
286 break; 519 break;
287#endif 520#endif
288#ifndef NO_DELETE_KEY 521#ifndef NO_DELETE_KEY
289 case XK_Delete: 522 case XK_Delete:
290 STRCPY (kbuf, key_delete); 523 strcpy (kbuf, key_delete);
291 break; 524 break;
292#endif 525#endif
293 case XK_Tab: 526 case XK_Tab:
294 if (shft) 527 if (shft)
295 STRCPY (kbuf, "\033[Z"); 528 strcpy (kbuf, "\033[Z");
296 else 529 else
297 { 530 {
298#ifdef CTRL_TAB_MAKES_META 531#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 532 if (ctrl)
300 meta = 1; 533 meta = 1;
… …
306 newlen = 0; 539 newlen = 0;
307 } 540 }
308 break; 541 break;
309 542
310#ifdef XK_KP_Left 543#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 544 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 545 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 546 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 547 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 549 {
317 STRCPY (kbuf, "\033OZ"); 550 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 552 break;
320 } 553 }
321 else 554 else
322 /* translate to std. cursor key */ 555 /* translate to std. cursor key */
… …
325#endif 558#endif
326 case XK_Up: /* "\033[A" */ 559 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 560 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 561 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 562 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 564 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 565 /* do Shift first */
333 if (shft) 566 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 568 else if (ctrl)
336 { 569 {
337 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 571 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 572 }
340 else if (PrivateModes & PrivMode_aplCUR) 573 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 574 kbuf[1] = 'O';
342 break; 575 break;
343 576
344#ifndef UNSHIFTED_SCROLLKEYS 577#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 578# ifdef XK_KP_Prior
346 case XK_KP_Prior: 579 case XK_KP_Prior:
347 /* allow shift to override */ 580 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 582 {
350 STRCPY (kbuf, "\033Oy"); 583 strcpy (kbuf, "\033Oy");
351 break; 584 break;
352 } 585 }
353 /* FALLTHROUGH */ 586 /* FALLTHROUGH */
354# endif 587# endif
355 case XK_Prior: 588 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 589 strcpy (kbuf, "\033[5~");
357 break; 590 break;
358# ifdef XK_KP_Next 591# ifdef XK_KP_Next
359 case XK_KP_Next: 592 case XK_KP_Next:
360 /* allow shift to override */ 593 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 595 {
363 STRCPY (kbuf, "\033Os"); 596 strcpy (kbuf, "\033Os");
364 break; 597 break;
365 } 598 }
366 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
367# endif 600# endif
368 case XK_Next: 601 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 602 strcpy (kbuf, "\033[6~");
370 break; 603 break;
371#endif 604#endif
372 case XK_KP_Enter: 605 case XK_KP_Enter:
373 /* allow shift to override */ 606 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 608 {
376 STRCPY (kbuf, "\033OM"); 609 strcpy (kbuf, "\033OM");
610 break;
611 }
612
613 /* FALLTHROUGH */
614
615 case XK_Return:
616 if (priv_modes & PrivMode_LFNL)
617 {
618 kbuf[0] = '\015';
619 kbuf[1] = '\012';
620 kbuf[2] = '\0';
377 } 621 }
378 else 622 else
379 { 623 {
380 kbuf[0] = '\r'; 624 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 625 kbuf[1] = '\0';
382 } 626 }
383 break; 627 break;
384 628
385#ifdef XK_KP_Begin 629#ifdef XK_KP_Begin
386 case XK_KP_Begin: 630 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 631 strcpy (kbuf, "\033Ou");
388 break; 632 break;
389 633
390 case XK_KP_Insert: 634 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 635 strcpy (kbuf, "\033Op");
392 break; 636 break;
393 637
394 case XK_KP_Delete: 638 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 639 strcpy (kbuf, "\033On");
396 break; 640 break;
397#endif 641#endif
398 case XK_KP_F1: /* "\033OP" */ 642 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 643 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 644 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 645 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 646 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 647 kbuf[2] += (keysym - XK_KP_F1);
404 break; 648 break;
405 649
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 650 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 651 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 662 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 663 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 664 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 665 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 666 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 668 {
425 STRCPY (kbuf, "\033Oj"); 669 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 670 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 671 }
428 else 672 else
429 { 673 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 675 kbuf[1] = '\0';
432 } 676 }
433 break; 677 break;
434 678
435 case XK_Find: 679 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 680 strcpy (kbuf, "\033[1~");
437 break; 681 break;
438 case XK_Insert: 682 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 683 strcpy (kbuf, "\033[2~");
440 break; 684 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 685#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 686 case DXK_Remove:
443 /* FALLTHROUGH */ 687 /* FALLTHROUGH */
444#endif 688#endif
445 case XK_Execute: 689 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 690 strcpy (kbuf, "\033[3~");
447 break; 691 break;
448 case XK_Select: 692 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 693 strcpy (kbuf, "\033[4~");
450 break; 694 break;
451#ifdef XK_KP_End 695#ifdef XK_KP_End
452 case XK_KP_End: 696 case XK_KP_End:
453 /* allow shift to override */ 697 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 699 {
456 STRCPY (kbuf, "\033Oq"); 700 strcpy (kbuf, "\033Oq");
457 break; 701 break;
458 } 702 }
459 /* FALLTHROUGH */ 703 /* FALLTHROUGH */
460#endif 704#endif
461 case XK_End: 705 case XK_End:
462 STRCPY (kbuf, KS_END); 706 strcpy (kbuf, KS_END);
463 break; 707 break;
464#ifdef XK_KP_Home 708#ifdef XK_KP_Home
465 case XK_KP_Home: 709 case XK_KP_Home:
466 /* allow shift to override */ 710 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 712 {
469 STRCPY (kbuf, "\033Ow"); 713 strcpy (kbuf, "\033Ow");
470 break; 714 break;
471 } 715 }
472 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
473#endif 717#endif
474 case XK_Home: 718 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 719 strcpy (kbuf, KS_HOME);
476 break; 720 break;
477 721
478#define FKEY(n, fkey) \ 722#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 724
… …
533 default: 777 default:
534 newlen = 0; 778 newlen = 0;
535 break; 779 break;
536 } 780 }
537 if (newlen) 781 if (newlen)
538 len = STRLEN (kbuf); 782 len = strlen (kbuf);
539 } 783 }
540 784
541 /* 785 /*
542 * Pass meta for all function keys, if 'meta' option set 786 * Pass meta for all function keys, if 'meta' option set
543 */ 787 */
… …
571 } 815 }
572 816
573 if (len <= 0) 817 if (len <= 0)
574 return; /* not mapped */ 818 return; /* not mapped */
575 819
576 if (Options & Opt_scrollTtyKeypress) 820 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 821 if (TermWin.view_start)
578 { 822 {
579 TermWin.view_start = 0; 823 TermWin.view_start = 0;
580 want_refresh = 1; 824 want_refresh = 1;
581 } 825 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 874 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 876
633 if (n > 0 && s < count) 877 if (n > 0 && s < count)
634 { 878 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 879 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 880 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 881 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 882 cmdbuf_endp -= n;
639 s += n; 883 s += n;
640 } 884 }
… …
661 if (want_full_refresh) 905 if (want_full_refresh)
662 { 906 {
663 want_full_refresh = 0; 907 want_full_refresh = 0;
664 scr_clear (); 908 scr_clear ();
665 scr_touch (false); 909 scr_touch (false);
666 want_refresh = 1;
667 } 910 }
668#endif 911#endif
669 912
670 if (want_refresh) 913 if (want_refresh)
671 { 914 {
… …
675 IMSendSpot (); 918 IMSendSpot ();
676#endif 919#endif
677 } 920 }
678 921
679 display->flush (); 922 display->flush ();
923
924 flush_ev.stop ();
680} 925}
681 926
682void 927void
683rxvt_term::check_cb (check_watcher &w) 928rxvt_term::check_cb (check_watcher &w)
684{ 929{
685 SET_R (this); 930 SET_R (this);
686 SET_LOCALE (locale); 931 SET_LOCALE (locale);
687 932
933 display->flush ();
934
935 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01);
937}
938
939void
940rxvt_term::flush_cb (time_watcher &w)
941{
942 SET_R (this);
943 SET_LOCALE (locale);
944
945 refresh_limit = 1;
946 refresh_count = 0;
688 flush (); 947 flush ();
689} 948}
690 949
691#ifdef CURSOR_BLINK 950#ifdef CURSOR_BLINK
692void 951void
… …
768 1027
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1028 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1029 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1030 cmdbuf_endp = cmdbuf_ptr + n;
772 1031
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1033
775 if (n > 0) 1034 if (n > 0)
776 { 1035 {
777 cmdbuf_endp += n; 1036 cmdbuf_endp += n;
778 return true; 1037 return true;
… …
796 while (pty_fill ()) 1055 while (pty_fill ())
797 if (cmd_parse ()) 1056 if (cmd_parse ())
798 break; 1057 break;
799} 1058}
800 1059
1060void
1061rxvt_term::pointer_unblank ()
1062{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1064 recolour_cursor ();
1065
1066#ifdef POINTER_BLANK
1067 hidden_pointer = 0;
1068
1069 if (options & Opt_pointerBlank)
1070 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif
1072}
1073
801#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
802void 1075void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1076rxvt_term::pointer_blank ()
816{ 1077{
817 if (! (Options & Opt_pointerBlank)) 1078 if (! (options & Opt_pointerBlank))
818 return; 1079 return;
819 1080
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1081 XDefineCursor (display->display, TermWin.vt, blank_cursor);
821 XFlush (display->display); 1082 XFlush (display->display);
822 1083
… …
842 x = ev.x; 1103 x = ev.x;
843 y = ev.y; 1104 y = ev.y;
844 pixel_position (&x, &y); 1105 pixel_position (&x, &y);
845 1106
846 if (MEvent.button == AnyButton) 1107 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1108 button_number = 3;
849 }
850 else 1109 else
851 { 1110 {
852 button_number = MEvent.button - Button1; 1111 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1112 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1113 if (button_number >= 3)
855 button_number += (64 - 3); 1114 button_number += (64 - 3);
856 } 1115 }
857 1116
858 if (PrivateModes & PrivMode_MouseX10) 1117 if (priv_modes & PrivMode_MouseX10)
859 { 1118 {
860 /* 1119 /*
861 * do not report ButtonRelease 1120 * do not report ButtonRelease
862 * no state info allowed 1121 * no state info allowed
863 */ 1122 */
… …
921{ 1180{
922 SET_R (this); 1181 SET_R (this);
923 SET_LOCALE (locale); 1182 SET_LOCALE (locale);
924 1183
925#if defined(CURSOR_BLINK) 1184#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
927 { 1186 {
928 if (hidden_cursor) 1187 if (hidden_cursor)
929 { 1188 {
930 hidden_cursor = 0; 1189 hidden_cursor = 0;
931 want_refresh = 1; 1190 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1194 }
936#endif 1195#endif
937 1196
938#if defined(POINTER_BLANK) 1197#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1199 {
941 if (ev.type == MotionNotify 1200 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1201 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1202 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1203 if (hidden_pointer)
… …
956 1215
957 Window unused_root, unused_child; 1216 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1217 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1218 unsigned int unused_mask;
960 1219
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009
1010 switch (ev.type) 1220 switch (ev.type)
1011 { 1221 {
1012 case KeyPress: 1222 case KeyPress:
1223#if ISO_14755
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
1013 lookup_key (ev.xkey); 1226 lookup_key (ev.xkey);
1227
1228 break;
1229
1230 case KeyRelease:
1231 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
1014 break; 1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
1015 1291
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1293 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1294 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1295 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1296 mouse_slip_wheel_speed = 0;
1028 } 1297#endif
1029 break; 1298 break;
1030 } 1299 }
1031#endif
1032 1300
1033 case ButtonPress: 1301 case ButtonPress:
1034 button_press (ev.xbutton); 1302 button_press (ev.xbutton);
1035 break; 1303 break;
1036 1304
… …
1063 &Size, &RemainingBytes, 1331 &Size, &RemainingBytes,
1064 &data); 1332 &data);
1065 XChangeProperty (display->display, display->root, 1333 XChangeProperty (display->display, display->root,
1066 XA_CUT_BUFFER0, XA_STRING, 1334 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace, 1335 8, PropModeReplace,
1068 data, STRLEN (data)); 1336 data, strlen (data));
1069 XFree (data); 1337 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, True);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1072 } 1340 }
1073#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1074 break; 1342 break;
1075 1343
1076 case MappingNotify: 1344 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1346 break;
1079 1347
1080 /* 1348 /*
1081 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1107 { 1375 {
1108 TermWin.focus = 1; 1376 TermWin.focus = 1;
1109 want_refresh = 1; 1377 want_refresh = 1;
1110#ifdef USE_XIM 1378#ifdef USE_XIM
1111 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1112 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1113#endif 1384#endif
1114#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1117#endif 1397#endif
1118 1398
1119 } 1399 }
1120 break; 1400 break;
1121 1401
… …
1127#ifdef USE_XIM 1407#ifdef USE_XIM
1128 if (Input_Context != NULL) 1408 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context); 1409 XUnsetICFocus (Input_Context);
1130#endif 1410#endif
1131#ifdef CURSOR_BLINK 1411#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink) 1412 if (options & Opt_cursorBlink)
1133 cursor_blink_ev.stop (); 1413 cursor_blink_ev.stop ();
1134 hidden_cursor = 0; 1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1135#endif 1424#endif
1136 1425
1137 } 1426 }
1138 break; 1427 break;
1139 1428
… …
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 } 1439 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152 1441
1153 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1154 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1156 resize_all_windows (width, height, 1); 1443 resize_all_windows (width, height, 1);
1157 } 1444
1158#ifdef DEBUG_SIZE
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1166 { 1447 {
1167 check_our_parents (); 1448 check_our_parents ();
1168 if (am_transparent) 1449 if (am_transparent)
1169 want_full_refresh = 1; 1450 want_refresh = want_full_refresh = 1;
1170 } 1451 }
1171#endif 1452#endif
1172 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1173 break; 1461 break;
1174 1462
1175 case SelectionClear: 1463 case SelectionClear:
1176 selection_clear (); 1464 selection_clear ();
1177 break; 1465 break;
… …
1208 1496
1209 case GraphicsExpose: 1497 case GraphicsExpose:
1210 case Expose: 1498 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1212 { 1500 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1505
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1511
1221 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1513 }
1225 else 1514 else
1226 { 1515 {
1227 XEvent unused_event; 1516 XEvent unused_event;
1228 1517
… …
1238 } 1527 }
1239#ifdef MENUBAR 1528#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1530 menubar_expose ();
1242#endif 1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1243 } 1537 }
1244 break; 1538 break;
1245 1539
1246 case MotionNotify: 1540 case MotionNotify:
1247#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1253 { 1547 {
1254 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1255 break; 1549 break;
1256 } 1550 }
1257#endif 1551#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1259 break; 1553 break;
1260 1554
1261 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1262 { 1556 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1558 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1266 ; 1560 ;
1267 1561
1268 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (display->display, TermWin.vt,
1269 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1565 & (ev.xbutton.x), & (ev.xbutton.y),
1272 &unused_mask); 1566 &unused_mask);
1273#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1570 {
1277#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1280#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1283 { 1585 {
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1593
1292 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1294 */ 1596 */
1295 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1600
1300 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y<TermWin.int_bwidth)
1302 { 1603 {
1303 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1305 } 1606 }
1306 else 1607 else
1307 { 1608 {
1308 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y -
1310 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1311 } 1611 }
1612
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1314 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1316 } 1618 }
1317 else 1619 else
1318 { 1620 {
1319 /* we are within the text window, so we 1621 /* we are within the text window, so we
1320 * shouldn't be scrolling 1622 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1624 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1324 } 1626 }
1325#endif 1627#endif
1326#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1327
1328 } 1629 }
1329#endif 1630#endif
1330
1331 } 1631 }
1332 } 1632 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1634 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1336 MotionNotify, &ev)) ; 1636 MotionNotify, &ev)) ;
1337 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (display->display, scrollBar.win,
1338 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1640 & (ev.xbutton.x), & (ev.xbutton.y),
1341 &unused_mask); 1641 &unused_mask);
… …
1347 } 1647 }
1348 break; 1648 break;
1349 } 1649 }
1350} 1650}
1351 1651
1652#if TRANSPARENT
1352void 1653void
1353rxvt_term::rootwin_cb (XEvent &ev) 1654rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1655{
1355 SET_R (this); 1656 SET_R (this);
1356 SET_LOCALE (locale); 1657 SET_LOCALE (locale);
1357 1658
1358 switch (ev.type) 1659 switch (ev.type)
1359 { 1660 {
1360 case PropertyNotify: 1661 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1662 /*
1371 * if user used some Esetroot compatible prog to set the root bg, 1663 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on. 1664 * use the property to determine the pixmap. We use it later on.
1373 */ 1665 */
1374 if (xa[XA_XROOTPMAPID] == 0) 1666 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376 1668
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1378 return; 1670 return;
1379 }
1380 1671
1381 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1382 case ReparentNotify: 1673 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1385 break; 1676 break;
1386#endif
1387 } 1677 }
1388} 1678}
1679#endif
1389 1680
1390void 1681void
1391rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1392{ 1683{
1393 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1394 1685
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1396 if (!bypass_keystate) 1687 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1398 /* 1690 /*
1399 * VT window processing of button press 1691 * VT window processing of button press
1400 */ 1692 */
1401 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1402 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1404 if (reportmode) 1705 if (reportmode)
1405 { 1706 {
1406 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
… …
1441 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1442 switch (ev.button) 1743 switch (ev.button)
1443 { 1744 {
1444 case Button1: 1745 case Button1:
1445 /* allow shift+left click to extend selection */ 1746 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1748 {
1448 if (MEvent.button == Button1 && clickintime) 1749 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1750 selection_rotate (ev.x, ev.y);
1450 else 1751 else
1451 selection_extend (ev.x, ev.y, 1); 1752 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1767 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1768 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1769 selection_rotate (ev.x, ev.y);
1469 else 1770 else
1470 selection_extend (ev.x, ev.y, 1); 1771 selection_extend (ev.x, ev.y, 1);
1772
1471 MEvent.button = Button3; 1773 MEvent.button = Button3;
1472 break; 1774 break;
1473 } 1775 }
1474 } 1776 }
1777
1475 MEvent.time = ev.time; 1778 MEvent.time = ev.time;
1476 return; 1779 return;
1477 } 1780 }
1478 1781
1479 /* 1782 /*
… …
1571 break; 1874 break;
1572 case R_SB_ALIGN_BOTTOM: 1875 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 1876 csrO = scrollBar.bot - scrollBar.top;
1574 break; 1877 break;
1575 } 1878 }
1879
1576 if (scrollBar.style == R_SB_XTERM 1880 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 1881 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 1882 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 1884
1581 scrollBar.setMotion (); 1885 scrollBar.setMotion ();
1582 break; 1886 break;
1583 1887
1584 case Button1: 1888 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1889 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 scr_page ((ev.button == Button1 ? DN : UP), 1913 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 1914 (TermWin.nrow
1611 * scrollbar_position (ev.y) 1915 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 1916 / scrollbar_size ()));
1613 } 1917 }
1918
1614 break; 1919 break;
1615 } 1920 }
1616 } 1921 }
1617 return; 1922 return;
1618 } 1923 }
… …
1630{ 1935{
1631 int reportmode = 0; 1936 int reportmode = 0;
1632 1937
1633 csrO = 0; /* reset csr Offset */ 1938 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 1939 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1940 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 1941
1637 if (scrollbar_isUpDn ()) 1942 if (scrollbar_isUpDn ())
1638 { 1943 {
1639 scrollBar.setIdle (); 1944 scrollBar.setIdle ();
1640 scrollbar_show (0); 1945 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 1947 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 1948#endif
1644
1645 } 1949 }
1950
1646#ifdef SELECTION_SCROLLING 1951#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 1952 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1953 sel_scroll_ev.stop();
1649#endif 1954#endif
1955
1650 if (ev.window == TermWin.vt) 1956 if (ev.window == TermWin.vt)
1651 { 1957 {
1958#if ISO_14755
1959 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return;
1962#endif
1652 if (reportmode) 1963 if (reportmode)
1653 { 1964 {
1654 /* mouse report from vt window */ 1965 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 1966 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 1967 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 1981 MEvent.button = AnyButton;
1671 mouse_report (ev); 1982 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 1983#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 1984 return;
1674 } 1985 }
1986
1675 /* 1987 /*
1676 * dumb hack to compensate for the failure of click-and-drag 1988 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 1989 * when overriding mouse reporting
1678 */ 1990 */
1679 if (PrivateModes & PrivMode_mouse_report 1991 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 1992 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 1993 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 1994 selection_extend (ev.x, ev.y, 0);
1683 1995
1684 switch (ev.button) 1996 switch (ev.button)
… …
1699 2011
1700 v = ev.button == Button4 ? UP : DN; 2012 v = ev.button == Button4 ? UP : DN;
1701 2013
1702 if (ev.state & ShiftMask) 2014 if (ev.state & ShiftMask)
1703 i = 1; 2015 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2016 else if (options & Opt_mouseWheelScrollPage)
1705 i = TermWin.nrow - 1; 2017 i = TermWin.nrow - 1;
1706 else 2018 else
1707 i = 5; 2019 i = 5;
1708 2020
1709# ifdef MOUSE_SLIP_WHEELING 2021# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2022 if (ev.state & ControlMask)
1711 { 2023 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2024 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2027
2028 if (slip_wheel_ev.at < NOW)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030
2031 slip_wheel_ev.start ();
1714 } 2032 }
2033 else
2034 {
1715# endif 2035# endif
1716# ifdef JUMP_MOUSE_WHEEL 2036# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2037 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2038 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2039 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING
1726 } 2049 }
1727# endif 2050#endif
1728
1729 } 2051 }
1730 break; 2052 break;
1731#endif 2053#endif
1732
1733 } 2054 }
1734 } 2055 }
1735#ifdef MENUBAR 2056#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2057 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2058 menubar_control (ev);
1738#endif 2059#endif
1739} 2060}
1740 2061
1741#ifdef TRANSPARENT 2062#ifdef TRANSPARENT
1742#if TINTING 2063#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2064/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2065
1746static void 2066typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2067
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2069{
1754 /* No saturation */ 2070 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2071 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 int r, g, b; 2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i;
1758 2076
1759 b = ((uint16_t *) ptr)[x]; 2077 Visual* visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2078
1761 g = (b & 0x3e0) * gm; 2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2080
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2081 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2082 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2083 mask_g = visual->green_mask;
1766 } 2084 mask_b = visual->blue_mask;
1767 ptr += bpl; 2085
1768 } 2086 /* boring lookup table pre-initialization */
2087 switch (srcImage->bits_per_pixel) {
2088 case 15:
2089 if ((mask_r != 0x7c00) ||
2090 (mask_g != 0x03e0) ||
2091 (mask_b != 0x001f))
2092 return;
2093 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2094 lookup_r = lookup;
2095 lookup_g = lookup+32;
2096 lookup_b = lookup+32+32;
2097 sh_r = 10;
2098 sh_g = 5;
2099 sh_b = 0;
2100 break;
2101 case 16:
2102 if ((mask_r != 0xf800) ||
2103 (mask_g != 0x07e0) ||
2104 (mask_b != 0x001f))
2105 return;
2106 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2107 lookup_r = lookup;
2108 lookup_g = lookup+32;
2109 lookup_b = lookup+32+64;
2110 sh_r = 11;
2111 sh_g = 5;
2112 sh_b = 0;
2113 break;
2114 case 24:
2115 if ((mask_r != 0xff0000) ||
2116 (mask_g != 0x00ff00) ||
2117 (mask_b != 0x0000ff))
2118 return;
2119 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2120 lookup_r = lookup;
2121 lookup_g = lookup+256;
2122 lookup_b = lookup+256+256;
2123 sh_r = 16;
2124 sh_g = 8;
2125 sh_b = 0;
2126 break;
2127 case 32:
2128 if ((mask_r != 0xff0000) ||
2129 (mask_g != 0x00ff00) ||
2130 (mask_b != 0x0000ff))
2131 return;
2132 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2133 lookup_r = lookup;
2134 lookup_g = lookup+256;
2135 lookup_b = lookup+256+256;
2136 sh_r = 16;
2137 sh_g = 8;
2138 sh_b = 0;
2139 break;
2140 default:
2141 return; /* we do not support this color depth */
2142 }
2143
2144 /* prepare limits for color transformation (each channel is handled separately) */
2145 if (shade < 0) {
2146 shade = -shade;
2147 if (shade < 0) shade = 0;
2148 if (shade > 100) shade = 100;
2149
2150 lower_lim_r = 65535-rm;
2151 lower_lim_g = 65535-gm;
2152 lower_lim_b = 65535-bm;
2153
2154 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2155 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2156 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2157
2158 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1769 } else { 2159 } else {
1770 for (y = h; --y >= 0;) { 2160 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2161 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2162
1774 b = ((uint16_t *) ptr)[x]; 2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2164
1776 g = (b & 0x3e0) * gm; 2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2168 }
1780 b |= (!(b >> 5) - 1); 2169
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1782 | ((g >> 8) & 0x3e0) 2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2172 {
1784 } 2173 unsigned int tmp;
1785 ptr += bpl; 2174
2175 tmp = lower_lim_r;
2176 lower_lim_r = lower_lim_b;
2177 lower_lim_b = tmp;
2178
2179 tmp = upper_lim_r;
2180 upper_lim_r = upper_lim_b;
2181 upper_lim_b = tmp;
2182 }
2183
2184 /* fill our lookup tables */
2185 for (i = 0; i <= mask_r>>sh_r; i++)
2186 {
2187 RUINT32T tmp;
2188 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2189 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2190 lookup_r[i] = (tmp/65535)<<sh_r;
2191 }
2192 for (i = 0; i <= mask_g>>sh_g; i++)
2193 {
2194 RUINT32T tmp;
2195 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2196 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2197 lookup_g[i] = (tmp/65535)<<sh_g;
2198 }
2199 for (i = 0; i <= mask_b>>sh_b; i++)
2200 {
2201 RUINT32T tmp;
2202 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2203 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2204 lookup_b[i] = (tmp/65535)<<sh_b;
2205 }
2206
2207 /* apply table to input image (replacing colors by newly calculated ones) */
2208 switch (srcImage->bits_per_pixel)
2209 {
2210 case 15:
2211 {
2212 unsigned short *p1, *pf, *p, *pl;
2213 p1 = (unsigned short *) srcImage->data;
2214 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2215 while (p1 < pf)
2216 {
2217 p = p1;
2218 pl = p1 + srcImage->width;
2219 for (; p < pl; p++)
1786 } 2220 {
2221 *p = lookup_r[(*p & 0x7c00)>>10] |
2222 lookup_g[(*p & 0x03e0)>> 5] |
2223 lookup_b[(*p & 0x001f)];
2224 }
2225 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2226 }
1788} 2227 break;
1789 2228 }
1790/* RGB 16 */ 2229 case 16:
1791static void 2230 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2231 unsigned short *p1, *pf, *p, *pl;
1793{ 2232 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2234 while (p1 < pf)
1796 2235 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2236 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2237 pl = p1 + srcImage->width;
1799 /* No saturation */ 2238 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2239 {
1814 } else { 2240 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2241 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2242 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2243 }
1830 ptr += bpl; 2244 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2245 }
2246 break;
2247 }
2248 case 24:
2249 {
2250 unsigned char *p1, *pf, *p, *pl;
2251 p1 = (unsigned char *) srcImage->data;
2252 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2253 while (p1 < pf)
2254 {
2255 p = p1;
2256 pl = p1 + srcImage->width * 3;
2257 for (; p < pl; p += 3)
1831 } 2258 {
2259 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2260 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2261 p[2] = lookup_r[(p[2] & 0x0000ff)];
2262 }
2263 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 2264 }
1833} 2265 break;
2266 }
2267 case 32:
2268 {
2269 RUINT32T *p1, *pf, *p, *pl;
2270 p1 = (RUINT32T *) srcImage->data;
2271 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1834 2272
1835/* RGB 24 */ 2273 while (p1 < pf)
1836static void 2274 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2275 p = p1;
1838{ 2276 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2277 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2278 {
1867 } else { 2279 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2280 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2281 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2282 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2283 }
1898 ptr += bpl; 2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2285 }
2286 break;
2287 }
1900 } 2288 }
1901}
1902 2289
1903/* RGB 32 */ 2290 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2291}
1974
1975#endif 2292#endif
1976 2293
1977/* 2294/*
1978 * Check our parents are still who we think they are. 2295 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2296 * Do transparency updates if required
… …
1989 Pixmap rootpixmap = None; 2306 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2307 XWindowAttributes wattr, wrootattr;
1991 2308
1992 pchanged = 0; 2309 pchanged = 0;
1993 2310
1994 if (!(Options & Opt_transparent)) 2311 if (!(options & Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2312 return pchanged; /* Don't try any more */
1996 2313
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2315 rootdepth = wrootattr.depth;
1999 2316
… …
2002 if (rootdepth != wattr.depth) 2319 if (rootdepth != wattr.depth)
2003 { 2320 {
2004 if (am_transparent) 2321 if (am_transparent)
2005 { 2322 {
2006 pchanged = 1; 2323 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2325 am_transparent = am_pixmap_trans = 0;
2009 } 2326 }
2010 2327
2011 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
2012 } 2329 }
… …
2028 i = (xa[XA_XSETROOTID] 2345 i = (xa[XA_XSETROOTID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2348 &nitems, &bytes_after, &prop) == Success);
2032 2349
2033 if (!i || prop == NULL) 2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
2034 have_pixmap = 0; 2355 have_pixmap = 0;
2035 else 2356 else
2036 { 2357 {
2037 have_pixmap = 1; 2358 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2359 rootpixmap = *(Pixmap *)prop;
… …
2100 XFreePixmap (display->display, TermWin.pixmap); 2421 XFreePixmap (display->display, TermWin.pixmap);
2101 2422
2102#if TINTING 2423#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2424 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2425 {
2105 unsigned short shade, rm, gm, bm; 2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2428
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2430
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2431 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2432 }
2120#endif 2433#endif
2121 2434
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2123 szHint.width, szHint.height, image->depth); 2436 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2439 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2440 XFreeGC (display->display, gc);
2128 XDestroyImage (image); 2441 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2130 TermWin.pixmap); 2443 XClearWindow (display->display, TermWin.parent[0]);
2131 2444
2132 if (!am_transparent || !am_pixmap_trans) 2445 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2446 pchanged = 1;
2134 2447
2135 am_transparent = am_pixmap_trans = 1; 2448 am_transparent = am_pixmap_trans = 1;
… …
2140 { 2453 {
2141 unsigned int n; 2454 unsigned int n;
2142 /* 2455 /*
2143 * InheritPixmap transparency 2456 * InheritPixmap transparency
2144 */ 2457 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 { 2459 {
2148 oldp = TermWin.parent[i]; 2460 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2462 &TermWin.parent[i], &list, &n);
2151 XFree (list); 2463 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2464
2154 if (TermWin.parent[i] == display->root) 2465 if (TermWin.parent[i] == display->root)
2155 { 2466 {
2156 if (oldp != None) 2467 if (oldp != None)
2157 pchanged = 1; 2468 pchanged = 1;
… …
2168 if (pchanged) 2479 if (pchanged)
2169 { 2480 {
2170 for (; n < (unsigned int)i; n++) 2481 for (; n < (unsigned int)i; n++)
2171 { 2482 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2485 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break; 2487 break;
2178 } 2488 }
2179 } 2489 }
2180 } 2490 }
2181 2491
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 { 2493 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2496 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2497 /* XXX: also turn off Opt_transparent? */
2189 } 2498 }
2190 else 2499 else
2191 { 2500 {
2192#if WAIT_FOR_WM 2501#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2502 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2503 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2504 sleep (1);
2196#endif 2505#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2200 2511
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2202 am_transparent = 1; 2513 am_transparent = 1;
2203 } 2514 }
2204 2515
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None; 2517 TermWin.parent[i] = None;
2518 }
2519
2520 // this is experimental
2521 if (scrollBar.win)
2522 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle ();
2526 scrollbar_show (0);
2207 } 2527 }
2208 2528
2209 return pchanged; 2529 return pchanged;
2210} 2530}
2211#endif 2531#endif
… …
2230 if (ch == NOCHAR) // TODO: improve 2550 if (ch == NOCHAR) // TODO: improve
2231 break; 2551 break;
2232 2552
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2554 {
2555 if (!seen_input)
2556 {
2557 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong.
2562 kill (-cmd_pid, SIGWINCH);
2563 }
2564
2235 /* Read a text string from the input buffer */ 2565 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2566 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2567 bool refreshnow = false;
2238 int nlines = 0; 2568 int nlines = 0;
2239 unicode_t *str = buf; 2569 unicode_t *str = buf;
2240 2570
2241 *str++ = ch;
2242
2243 for (;;) 2571 for (;;)
2244 { 2572 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2574 break;
2250 2575
2251 *str++ = ch; 2576 *str++ = ch;
2252 2577
2253 if (ch == C0_LF) 2578 if (ch == C0_LF)
2254 { 2579 {
2255 nlines++; 2580 nlines++;
2256 refresh_count++; 2581 refresh_count++;
2257 2582
2258 if (! (Options & Opt_jumpScroll) 2583 if (!(options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2260 { 2585 {
2261 refreshnow = true; 2586 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR; 2587 ch = NOCHAR;
2264 break; 2588 break;
2265 } 2589 }
2266 2590
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2592 if (nlines >= TermWin.nrow - 1)
2269 { 2593 {
2270 scr_add_lines (buf, nlines, str - buf); 2594 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0; 2595 nlines = 0;
2272 str = buf; 2596 str = buf;
… …
2276 if (str >= buf + UBUFSIZ) 2600 if (str >= buf + UBUFSIZ)
2277 { 2601 {
2278 ch = NOCHAR; 2602 ch = NOCHAR;
2279 break; 2603 break;
2280 } 2604 }
2605
2606 seq_begin = cmdbuf_ptr;
2607 ch = next_char ();
2281 } 2608 }
2282 2609
2283 scr_add_lines (buf, nlines, str - buf); 2610 scr_add_lines (buf, nlines, str - buf);
2284 2611
2285 /* 2612 /*
2286 * If there have been a lot of new lines, then update the screen 2613 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2614 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2615 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2616 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2617 */
2294 if (refreshnow) 2618 if (refreshnow)
2295 { 2619 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2621 refresh_limit++;
2298 else 2622 else
2623 {
2624 flag = true;
2299 scr_refresh (refresh_type); 2625 scr_refresh (refresh_type);
2626 }
2300 } 2627 }
2301 2628
2302 } 2629 }
2303 else 2630 else
2304 { 2631 {
… …
2488 process_escape_seq (); 2815 process_escape_seq ();
2489 break; 2816 break;
2490 case C0_ENQ: /* terminal Status */ 2817 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2818 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2494 else 2821 else
2495 tt_write ((unsigned char *)VT100_ANS, 2822 tt_write ((unsigned char *)VT100_ANS,
2496 (unsigned int)STRLEN (VT100_ANS)); 2823 (unsigned int)strlen (VT100_ANS));
2497 break; 2824 break;
2498 case C0_BEL: /* bell */ 2825 case C0_BEL: /* bell */
2499 scr_bell (); 2826 scr_bell ();
2500 break; 2827 break;
2501 case C0_BS: /* backspace */ 2828 case C0_BS: /* backspace */
… …
2600void 2927void
2601rxvt_term::process_escape_seq () 2928rxvt_term::process_escape_seq ()
2602{ 2929{
2603 unicode_t ch = cmd_getc (); 2930 unicode_t ch = cmd_getc ();
2604 2931
2605 if (PrivateModes & PrivMode_vt52) 2932 if (priv_modes & PrivMode_vt52)
2606 { 2933 {
2607 process_escape_vt52 (ch); 2934 process_escape_vt52 (ch);
2608 return; 2935 return;
2609 } 2936 }
2610 2937
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 2952 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 2953 break;
2627 case '+': 2954 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 2955 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 2956 break;
2630#ifndef NO_FRILLS 2957#if ENABLE_FRILLS
2631 case '6': 2958 case '6':
2632 scr_backindex (); 2959 scr_backindex ();
2633 break; 2960 break;
2634#endif 2961#endif
2635 case '7': 2962 case '7':
2636 scr_cursor (SAVE); 2963 scr_cursor (SAVE);
2637 break; 2964 break;
2638 case '8': 2965 case '8':
2639 scr_cursor (RESTORE); 2966 scr_cursor (RESTORE);
2640 break; 2967 break;
2641#ifndef NO_FRILLS 2968#if ENABLE_FRILLS
2642 case '9': 2969 case '9':
2643 scr_forwardindex (); 2970 scr_forwardindex ();
2644 break; 2971 break;
2645#endif 2972#endif
2646 case '=': 2973 case '=':
… …
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2946 break; 3273 break;
2947 3274
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3276 tt_write ((const unsigned char *)VT100_ANS,
2950 (unsigned int) (sizeof (VT100_ANS) - 1)); 3277 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3278 break;
2952 3279
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3281 process_sgr_mode (nargs, arg);
2955 break; 3282 break;
… …
2962 break; 3289 break;
2963 case 6: /* CPR requested */ 3290 case 6: /* CPR requested */
2964 scr_report_position (); 3291 scr_report_position ();
2965 break; 3292 break;
2966 case 7: /* unofficial extension */ 3293 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3294 if (options & Opt_insecure)
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3295 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3296 break;
2970 case 8: /* unofficial extension */ 3297 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3299 break;
2973 } 3300 }
… …
3009 break; 3336 break;
3010 3337
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3338 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3339 if (arg[0] == 4)
3013 scr_insert_mode (0); 3340 scr_insert_mode (0);
3341 else if (arg[0] == 20)
3342 priv_modes &= ~PrivMode_LFNL;
3014 break; 3343 break;
3015 3344
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3345 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3346 if (arg[0] == 4)
3018 scr_insert_mode (1); 3347 scr_insert_mode (1);
3348 else if (arg[0] == 20)
3349 priv_modes |= PrivMode_LFNL;
3019 break; 3350 break;
3020 3351
3021 /* 3352 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3353 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3354 */
… …
3035 break; 3366 break;
3036 case CSI_75: 3367 case CSI_75:
3037 scr_cursor (RESTORE); 3368 scr_cursor (RESTORE);
3038 break; 3369 break;
3039 3370
3040#ifndef NO_FRILLS 3371#if ENABLE_FRILLS
3041 case CSI_74: 3372 case CSI_74:
3042 process_window_ops (arg, nargs); 3373 process_window_ops (arg, nargs);
3043 break; 3374 break;
3044#endif 3375#endif
3045 3376
… …
3052 break; 3383 break;
3053 } 3384 }
3054} 3385}
3055/*}}} */ 3386/*}}} */
3056 3387
3057#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3058/* ARGSUSED */ 3389/* ARGSUSED */
3059void 3390void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3391rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3392{
3062 int x, y; 3393 int x, y;
… …
3129 break; 3460 break;
3130 case 19: /* report window size (chars) */ 3461 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3132 break; 3463 break;
3133 case 20: /* report icon label */ 3464 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3465 {
3136 char *s; 3466 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3467 XGetIconName (display->display, TermWin.parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s);
3139 } 3470 }
3140 break; 3471 break;
3141 case 21: /* report window title */ 3472 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3473 {
3144 char *s; 3474 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3475 XFetchName (display->display, TermWin.parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s);
3147 } 3478 }
3148 break; 3479 break;
3149 } 3480 }
3150} 3481}
3151#endif 3482#endif
3152 3483
… …
3194 3525
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL; 3527 return NULL;
3197 3528
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3529 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3530 strncpy (s, string, n);
3200 return s; 3531 return s;
3201} 3532}
3202 3533
3203/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
3204/* 3535/*
… …
3249void 3580void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3251{ 3582{
3252 if (str[0] == '?' && !str[1]) 3583 if (str[0] == '?' && !str[1])
3253 { 3584 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3585 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3586 pix_colors_focused[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 } 3588 }
3261 else 3589 else
3262 set_window_color (color, str); 3590 set_window_color (color, str);
3263} 3591}
3264 3592
… …
3350 break; 3678 break;
3351 3679
3352 case XTerm_Color: 3680 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3681 for (buf = (char *)str; buf && *buf;)
3354 { 3682 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3683 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3684 break;
3357 3685
3358 *name++ = '\0'; 3686 *name++ = '\0';
3359 color = atoi (buf); 3687 color = atoi (buf);
3360 3688
3361 if (color < 0 || color >= TOTAL_COLORS) 3689 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3690 break;
3363 3691
3364 if ((buf = STRCHR (name, ';')) != NULL) 3692 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3693 *buf++ = '\0';
3366 3694
3367 if (name[0] == '?' && !name[1]) 3695 if (name[0] == '?' && !name[1])
3368 { 3696 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3697 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3700 }
3376 else 3701 else
3377 set_window_color (color + minCOLOR, name); 3702 set_window_color (color + minCOLOR, name);
3378 } 3703 }
3379 break; 3704 break;
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3738 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3739 set_bgPixmap (str); /* change pixmap */
3415#endif 3740#endif
3416 scr_touch (true); 3741 scr_touch (true);
3417 } 3742 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3743 while ((str = strchr (str, ';')) != NULL)
3419 { 3744 {
3420 str++; 3745 str++;
3421#if XPM_BACKGROUND 3746#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3747 changed += scale_pixmap (str);
3423#endif 3748#endif
… …
3443 // TODO, when secure mode? 3768 // TODO, when secure mode?
3444 break; 3769 break;
3445 3770
3446 case XTerm_font: 3771 case XTerm_font:
3447 if (query) 3772 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3451 TermWin.fontset->fontdesc 3775 ? TermWin.fontset->fontdesc : "",
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp); 3776 resp);
3455 }
3456 else 3777 else
3457 change_font (str); 3778 change_font (str);
3458 break; 3779 break;
3459 3780
3460#ifndef NO_FRILLS 3781#if ENABLE_FRILLS
3461 case XTerm_locale: 3782 case XTerm_locale:
3462 if (query) 3783 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3466 }
3467 else 3785 else
3468 { 3786 {
3469 set_locale (str); 3787 set_locale (str);
3470# ifdef USE_XIM 3788# ifdef USE_XIM
3471 im_cb (); 3789 im_cb ();
3472# endif 3790# endif
3473 } 3791 }
3474 break; 3792 break;
3475 3793
3476 case XTerm_findfont: 3794 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 { 3795 {
3479 int fid = TermWin.fontset->find_font (atoi (str)); 3796 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, 3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp); 3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3482 } 3801 }
3483 break; 3802 break;
3484#endif 3803#endif
3485 3804
3486#ifdef MENUBAR 3805#ifdef MENUBAR
3487 case XTerm_Menu: 3806 case XTerm_Menu:
3488 if (Options & Opt_insecure) 3807 if (options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3809 break;
3491#endif 3810#endif
3492#if 0 3811#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3812 case XTerm_dumpscreen: /* no error notices */
… …
3520{ 3839{
3521 int state; 3840 int state;
3522 3841
3523 if (mode == 's') 3842 if (mode == 's')
3524 { 3843 {
3525 SavedModes |= (PrivateModes & bit); 3844 SavedModes |= (priv_modes & bit);
3526 return -1; 3845 return -1;
3527 } 3846 }
3528 else 3847 else
3529 { 3848 {
3530 if (mode == 'r') 3849 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3851 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3852 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3853 PrivMode (state, bit);
3535 } 3854 }
3536 3855
3537 return state; 3856 return state;
3538} 3857}
… …
3556 { 3, PrivMode_132 }, 3875 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3876 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3877 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3878 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3879 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3881 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3882#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 3883 { menuBar_esc, PrivMode_menuBar },
3564#endif 3884#endif
3885 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 3887#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3888 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3889#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3890 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3891 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3892 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3893 // 45 margin bell NYI
3575 // 46 start logging 3894 // 46 start logging
… …
3616 3935
3617 /* extra handling for values with state unkept */ 3936 /* extra handling for values with state unkept */
3618 switch (arg[i]) 3937 switch (arg[i])
3619 { 3938 {
3620 case 1048: /* alternative cursor save */ 3939 case 1048: /* alternative cursor save */
3621 if (Options & Opt_secondaryScreen) 3940 if (options & Opt_secondaryScreen)
3622 if (mode == 0) 3941 if (mode == 0)
3623 scr_cursor (RESTORE); 3942 scr_cursor (RESTORE);
3624 else if (mode == 1) 3943 else if (mode == 1)
3625 scr_cursor (SAVE); 3944 scr_cursor (SAVE);
3626 break; 3945 break;
… …
3637 * within VT52 mode 3956 * within VT52 mode
3638 */ 3957 */
3639 PrivMode (1, PrivMode_vt52); 3958 PrivMode (1, PrivMode_vt52);
3640 break; 3959 break;
3641 case 3: /* 80/132 */ 3960 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 3961 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3644 break; 3963 break;
3645 case 4: /* smooth scrolling */ 3964 case 4: /* smooth scrolling */
3646 if (state) 3965 if (state)
3647 Options &= ~Opt_jumpScroll; 3966 options &= ~Opt_jumpScroll;
3648 else 3967 else
3649 Options |= Opt_jumpScroll; 3968 options |= Opt_jumpScroll;
3650 break; 3969 break;
3651 case 5: /* reverse video */ 3970 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 3971 scr_rvideo_mode (state);
3653 break; 3972 break;
3654 case 6: /* relative/absolute origins */ 3973 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 3977 scr_autowrap (state);
3659 break; 3978 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 3979 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 3980 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 3981 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 3982 priv_modes &= ~PrivMode_MouseX11;
3664 break; 3983 break;
3665#ifdef menuBar_esc 3984#ifdef menuBar_esc
3666 case menuBar_esc: 3985 case menuBar_esc:
3667#ifdef MENUBAR 3986#ifdef MENUBAR
3668 map_menuBar (state); 3987 map_menuBar (state);
… …
3688 break; 4007 break;
3689 /* case 66: - application key pad */ 4008 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4009 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4010 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4011 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4012 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4013 break;
3695#if 0 4014#if 0
3696 case 1001: 4015 case 1001:
3697 break; /* X11 mouse highlighting */ 4016 break; /* X11 mouse highlighting */
3698#endif 4017#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4018 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4019 if (state)
3701 Options &= ~Opt_scrollTtyOutput; 4020 options &= ~Opt_scrollTtyOutput;
3702 else 4021 else
3703 Options |= Opt_scrollTtyOutput; 4022 options |= Opt_scrollTtyOutput;
3704 break; 4023 break;
3705 case 1011: /* scroll to bottom on key press */ 4024 case 1011: /* scroll to bottom on key press */
3706 if (state) 4025 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4026 options |= Opt_scrollTtyKeypress;
3708 else 4027 else
3709 Options &= ~Opt_scrollTtyKeypress; 4028 options &= ~Opt_scrollTtyKeypress;
3710 break; 4029 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4030 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4031 if (options & Opt_secondaryScreen)
3713 if (current_screen != PRIMARY) 4032 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4033 scr_erase_screen (2);
3715 scr_change_screen (state); 4034 scr_change_screen (state);
3716 break; 4035 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4036 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4037 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4038 if (options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY) 4039 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4040 scr_erase_screen (2);
3722 break; 4041 break;
3723 default: 4042 default:
3724 break; 4043 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4069 rendset = 0, rendstyle = ~RS_None;
3751 break; 4070 break;
3752 case 1: 4071 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4072 rendset = 1, rendstyle = RS_Bold;
3754 break; 4073 break;
4074 //case 2: // faint or second colour
4075 //case 3: // italic
3755 case 4: 4076 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4077 rendset = 1, rendstyle = RS_Uline;
3757 break; 4078 break;
3758 case 5: 4079 case 5: // slowly blinking
4080 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4081 rendset = 1, rendstyle = RS_Blink;
3760 break; 4082 break;
3761 //case 6: // scoansi light background 4083 //case 6: // scoansi light background
3762 case 7: 4084 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4085 rendset = 1, rendstyle = RS_RVid;
3764 break; 4086 break;
3765 case 8: 4087 case 8:
3766 // invisible. NYI 4088 // invisible. NYI
3767 break; 4089 break;
4090 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4091 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4092 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4093 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4094 //...
4095 //case 19: // ninth alt font
4096 //case 20: // gothic
4097 case 21: // disable bold, faint
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4098 rendset = 0, rendstyle = RS_Bold;
3773 break; 4099 break;
3774 case 22: 4100 case 22:
3775 rendset = 0, rendstyle = RS_Bold; 4101 rendset = 0, rendstyle = RS_Bold;
3776 break; 4102 break;
4103 //case 23: disable italic
3777 case 24: 4104 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4105 rendset = 0, rendstyle = RS_Uline;
3779 break; 4106 break;
3780 case 25: 4107 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4108 rendset = 0, rendstyle = RS_Blink;
3782 break; 4109 break;
4110 case 26:
4111 rendset = 0, rendstyle = RS_Blink;
4112 break;
3783 case 27: 4113 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4114 rendset = 0, rendstyle = RS_RVid;
3785 break; 4115 break;
3786 case 28:
3787 // visible. NYI 4116 //case 28: // visible. NYI
3788 break; 4117 //case 29: // not crossed-out
3789 } 4118 }
3790 4119
3791 if (rendset != -1) 4120 if (rendset != -1)
3792 { 4121 {
3793 scr_rendition (rendset, rendstyle); 4122 scr_rendition (rendset, rendstyle);
… …
3878{ 4207{
3879 unicode_t ch, cmd = cmd_getc (); 4208 unicode_t ch, cmd = cmd_getc ();
3880 4209
3881 if (cmd == 'Q') 4210 if (cmd == 'Q')
3882 { /* query graphics */ 4211 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4212 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4213 return;
3885 } 4214 }
3886 /* swallow other graphics sequences until terminating ':' */ 4215 /* swallow other graphics sequences until terminating ':' */
3887 do 4216 do
3888 ch = cmd_getc (); 4217 ch = cmd_getc ();
… …
3903 unsigned char buf[256]; 4232 unsigned char buf[256];
3904 4233
3905 va_start (arg_ptr, fmt); 4234 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4236 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4237 tt_write (buf, strlen (buf));
3909} 4238}
3910 4239
3911/* ---------------------------------------------------------------------- */ 4240/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 4241/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 4242 * or generated by us in response to a query ESC sequence.
… …
3919 4248
3920 if (len) 4249 if (len)
3921 { 4250 {
3922 if (v_buflen == 0) 4251 if (v_buflen == 0)
3923 { 4252 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3925 4254
3926 if ((unsigned int)written == len) 4255 if ((unsigned int)written == len)
3927 return; 4256 return;
3928 4257
3929 data += written; 4258 data += written;
… …
3937 v_buflen += len; 4266 v_buflen += len;
3938 } 4267 }
3939 4268
3940 for (;;) 4269 for (;;)
3941 { 4270 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943 4272
3944 if (written > 0) 4273 if (written > 0)
3945 { 4274 {
3946 v_buflen -= written; 4275 v_buflen -= written;
3947 4276

Diff Legend

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