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.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.179 by root, Wed Dec 15 05:39:08 2004 UTC

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

Diff Legend

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