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.41 by pcg, Tue Feb 10 00:40:39 2004 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent &ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
… …
77 meta = (ev.state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev.state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev.state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
127 }
119 } 128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129
130 { 138 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
136 { 144 {
137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL
140 if (ctrl)
141# else
142 if (meta)
143# endif
144 {
145 if (keysym == ks_bigfont)
146 {
147 change_font (0, FONT_UP);
148 return;
149 }
150 else if (keysym == ks_smallfont)
151 {
152 change_font (0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (TermWin.saveLines) 145 if (TermWin.saveLines)
159 { 146 {
160#ifdef UNSHIFTED_SCROLLKEYS 147#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 148 if (!ctrl && !meta)
162 { 149 {
163#else 150#else
164 if (IS_SCROLL_MOD) 151 if (IS_SCROLL_MOD)
165 { 152 {
166#endif 153#endif
167 int lnsppg; 154 int lnsppg;
168 155
169#ifdef PAGING_CONTEXT_LINES 156#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 158#else
172 lnsppg = TermWin.nrow * 4 / 5; 159 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 197 scr_move_to (1, 0);
211 return; 198 return;
212 } 199 }
213 } 200 }
214#endif 201#endif
215
216 } 202 }
217 203
218 if (shft) 204 if (shft)
219 { 205 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 206 /* Shift + F1 - F10 generates F11 - F20 */
… …
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 217 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 218 selection_request (ev.time, 0, 0);
233 return; 219 return;
234 /* rxvt extras */ 220 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 221 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 222 change_font (FONT_UP);
237 return; 223 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 225 change_font (FONT_DN);
240 return; 226 return;
241 } 227 }
242 } 228 }
243 } 229 }
244#ifdef PRINTPIPE 230#ifdef PRINTPIPE
… …
246 { 232 {
247 scr_printscreen (ctrl | shft); 233 scr_printscreen (ctrl | shft);
248 return; 234 return;
249 } 235 }
250#endif 236#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 237
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 238 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 239 {
270#ifdef KEYSYM_RESOURCE 240#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 242 {
273 unsigned int l; 243 unsigned int l;
274 const unsigned char *kbuf0; 244 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC;
276 245
277 kbuf0 = (Keysym_map[keysym & 0xFF]); 246 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++; 247 l = (unsigned int)*kbuf0++;
279 248
280 /* escape prefix */ 249 /* escape prefix */
281 if (meta) 250 if (meta
282# ifdef META8_OPTION 251# ifdef META8_OPTION
283 if (meta_char == C0_ESC) 252 && meta_char == C0_ESC
284# endif 253# endif
254 )
255 {
256 const unsigned char ch = C0_ESC;
285 tt_write (&ch, 1); 257 tt_write (&ch, 1);
258 }
259
286 tt_write (kbuf0, l); 260 tt_write (kbuf0, l);
287 return; 261 return;
288 } 262 }
289 else 263 else
290#endif 264#endif
291
292 { 265 {
293 newlen = 1; 266 newlen = 1;
294 switch (keysym) 267 switch (keysym)
295 { 268 {
296#ifndef NO_BACKSPACE_KEY 269#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 270 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 271 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 272 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 274 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 275 kbuf[1] = '\0';
303 } 276 }
304 else 277 else
305 STRCPY(kbuf, key_backspace); 278 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
311 newlen = STRLEN(kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
316 }
317# endif
318 break; 279 break;
319#endif 280#endif
320#ifndef NO_DELETE_KEY 281#ifndef NO_DELETE_KEY
321 case XK_Delete: 282 case XK_Delete:
322 STRCPY(kbuf, key_delete); 283 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN(kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 284 break;
336#endif 285#endif
337 case XK_Tab: 286 case XK_Tab:
338 if (shft) 287 if (shft)
339 STRCPY(kbuf, "\033[Z"); 288 STRCPY (kbuf, "\033[Z");
340 else 289 else
341 { 290 {
342#ifdef CTRL_TAB_MAKES_META 291#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 292 if (ctrl)
344 meta = 1; 293 meta = 1;
… …
348 meta = 1; 297 meta = 1;
349#endif 298#endif
350 newlen = 0; 299 newlen = 0;
351 } 300 }
352 break; 301 break;
353
354 302
355#ifdef XK_KP_Left 303#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 304 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 305 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 306 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 307 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 309 {
362 STRCPY(kbuf, "\033OZ"); 310 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 311 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 312 break;
365 } 313 }
366 else 314 else
367 /* translate to std. cursor key */ 315 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 316 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 318#endif
371 case XK_Up: /* "\033[A" */ 319 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 320 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 321 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 322 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 323 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 324 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 325 /* do Shift first */
378 if (shft) 326 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 327 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 328 else if (ctrl)
381 { 329 {
382 kbuf[1] = 'O'; 330 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 331 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 332 }
385 else if (PrivateModes & PrivMode_aplCUR) 333 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 334 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2(screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2(screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 335 break;
423 336
424#ifndef UNSHIFTED_SCROLLKEYS 337#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 338# ifdef XK_KP_Prior
426 case XK_KP_Prior: 339 case XK_KP_Prior:
427 /* allow shift to override */ 340 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 342 {
430 STRCPY(kbuf, "\033Oy"); 343 STRCPY (kbuf, "\033Oy");
431 break; 344 break;
432 } 345 }
433 /* FALLTHROUGH */ 346 /* FALLTHROUGH */
434# endif 347# endif
435 case XK_Prior: 348 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 349 STRCPY (kbuf, "\033[5~");
437 break; 350 break;
438# ifdef XK_KP_Next 351# ifdef XK_KP_Next
439 case XK_KP_Next: 352 case XK_KP_Next:
440 /* allow shift to override */ 353 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 355 {
443 STRCPY(kbuf, "\033Os"); 356 STRCPY (kbuf, "\033Os");
444 break; 357 break;
445 } 358 }
446 /* FALLTHROUGH */ 359 /* FALLTHROUGH */
447# endif 360# endif
448 case XK_Next: 361 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 362 STRCPY (kbuf, "\033[6~");
450 break; 363 break;
451#endif 364#endif
452 case XK_KP_Enter: 365 case XK_KP_Enter:
453 /* allow shift to override */ 366 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 368 {
456 STRCPY(kbuf, "\033OM"); 369 STRCPY (kbuf, "\033OM");
457 } 370 }
458 else 371 else
459 { 372 {
460 kbuf[0] = '\r'; 373 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 374 kbuf[1] = '\0';
462 } 375 }
463 break; 376 break;
464 377
465#ifdef XK_KP_Begin 378#ifdef XK_KP_Begin
466 case XK_KP_Begin: 379 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 380 STRCPY (kbuf, "\033Ou");
468 break; 381 break;
469 382
470 case XK_KP_Insert: 383 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 384 STRCPY (kbuf, "\033Op");
472 break; 385 break;
473 386
474 case XK_KP_Delete: 387 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 388 STRCPY (kbuf, "\033On");
476 break; 389 break;
477#endif 390#endif
478 case XK_KP_F1: /* "\033OP" */ 391 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 392 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 393 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 394 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 395 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 396 kbuf[2] += (keysym - XK_KP_F1);
484 break; 397 break;
485 398
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 399 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 400 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 401 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 402 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 403 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 404 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 405 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 413 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 414 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 415 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 417 {
505 STRCPY(kbuf, "\033Oj"); 418 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 419 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 420 }
508 else 421 else
509 { 422 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 424 kbuf[1] = '\0';
512 } 425 }
513 break; 426 break;
514 427
515 case XK_Find: 428 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 429 STRCPY (kbuf, "\033[1~");
517 break; 430 break;
518 case XK_Insert: 431 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 432 STRCPY (kbuf, "\033[2~");
520 break; 433 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 434#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 435 case DXK_Remove:
523 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
524#endif 437#endif
525 case XK_Execute: 438 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 439 STRCPY (kbuf, "\033[3~");
527 break; 440 break;
528 case XK_Select: 441 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 442 STRCPY (kbuf, "\033[4~");
530 break; 443 break;
531#ifdef XK_KP_End 444#ifdef XK_KP_End
532 case XK_KP_End: 445 case XK_KP_End:
533 /* allow shift to override */ 446 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 448 {
536 STRCPY(kbuf, "\033Oq"); 449 STRCPY (kbuf, "\033Oq");
537 break; 450 break;
538 } 451 }
539 /* FALLTHROUGH */ 452 /* FALLTHROUGH */
540#endif 453#endif
541 case XK_End: 454 case XK_End:
542 STRCPY(kbuf, KS_END); 455 STRCPY (kbuf, KS_END);
543 break; 456 break;
544#ifdef XK_KP_Home 457#ifdef XK_KP_Home
545 case XK_KP_Home: 458 case XK_KP_Home:
546 /* allow shift to override */ 459 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 461 {
549 STRCPY(kbuf, "\033Ow"); 462 STRCPY (kbuf, "\033Ow");
550 break; 463 break;
551 } 464 }
552 /* FALLTHROUGH */ 465 /* FALLTHROUGH */
553#endif 466#endif
554 case XK_Home: 467 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 468 STRCPY (kbuf, KS_HOME);
556 break; 469 break;
557 470
558#define FKEY(n, fkey) \ 471#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 473
561 case XK_F1: /* "\033[11~" */ 474 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 475 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 476 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 477 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 478 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 479 FKEY (11, XK_F1);
567 break; 480 break;
568 case XK_F6: /* "\033[17~" */ 481 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 482 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 483 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 484 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 485 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 486 FKEY (17, XK_F6);
574 break; 487 break;
575 case XK_F11: /* "\033[23~" */ 488 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 489 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 490 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 491 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 492 FKEY (23, XK_F11);
580 break; 493 break;
581 case XK_F15: /* "\033[28~" */ 494 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 495 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 496 FKEY (28, XK_F15);
584 break; 497 break;
585 case XK_Help: /* "\033[28~" */ 498 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 499 FKEY (28, XK_Help);
587 break; 500 break;
588 case XK_Menu: /* "\033[29~" */ 501 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 502 FKEY (29, XK_Menu);
590 break; 503 break;
591 case XK_F17: /* "\033[31~" */ 504 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 505 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 506 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 507 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 518 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 519 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 520 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 521 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 522 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 523 FKEY (31, XK_F17);
611 break; 524 break;
612#undef FKEY 525#undef FKEY
613 default: 526 default:
614 newlen = 0; 527 newlen = 0;
615 break; 528 break;
616 } 529 }
617 if (newlen) 530 if (newlen)
618 len = STRLEN(kbuf); 531 len = STRLEN (kbuf);
619 } 532 }
533
620 /* 534 /*
621 * Pass meta for all function keys, if 'meta' option set 535 * Pass meta for all function keys, if 'meta' option set
622 */ 536 */
623#ifdef META8_OPTION 537#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 538 if (meta && (meta_char == 0x80) && len > 0)
… …
639 { 553 {
640 unsigned char *ch; 554 unsigned char *ch;
641 555
642 for (ch = kbuf; ch < kbuf + len; ch++) 556 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 557 *ch |= 0x80;
558
644 meta = 0; 559 meta = 0;
645 } 560 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 561#endif
651 /* nil */ ; 562 /* nil */ ;
652 } 563 }
653 } 564 }
654 565
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 588 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 589
679 /* escape prefix */ 590 /* escape prefix */
680 if (meta 591 if (meta
681#ifdef META8_OPTION 592#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 593 && meta_char == C0_ESC
683#endif 594#endif
684 ) 595 )
685 { 596 {
686 const unsigned char ch = C0_ESC; 597 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 598 tt_write (&ch, 1);
689 } 599 }
600
690#ifdef DEBUG_CMD 601#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 602 /* Display keyboard buffer contents */
693 char *p; 603 unsigned char *p;
694 int i; 604 int i;
695 605
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 606 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 607 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 608 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 609 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 610#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 611 tt_write (kbuf, (unsigned int)len);
703} 612}
704/*}}} */ 613/*}}} */
705 614
706#if (MENUBAR_MAX) 615#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 617/* attempt to `write' count to the input buffer */
709unsigned int 618unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 619rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 620{
712 unsigned int n, s; 621 unsigned int n, s;
713 622
714 n = cmdbuf_ptr - cmdbuf_base; 623 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
625
716 if (n > 0 && s < count) 626 if (n > 0 && s < count)
717 { 627 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 628 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 630 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 631 cmdbuf_endp -= n;
722 s += n; 632 s += n;
723 } 633 }
634
724 if (count > s) 635 if (count > s)
725 { 636 {
726 rxvt_print_error("data loss: cmd_write too large"); 637 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 638 count = s;
728 } 639 }
640
729 for (; count--;) 641 for (; count--;)
730 *cmdbuf_endp++ = *str++; 642 *cmdbuf_endp++ = *str++;
643
644 cmd_parse ();
645
731 return 0; 646 return 0;
732} 647}
733#endif /* MENUBAR_MAX */ 648#endif /* MENUBAR_MAX */
734 649
735void 650void
… …
753 IMSendSpot (); 668 IMSendSpot ();
754#endif 669#endif
755 670
756 } 671 }
757 672
758 XFlush (display->display); 673 display->flush ();
759} 674}
760 675
761void 676void
762rxvt_term::check_cb (check_watcher &w) 677rxvt_term::check_cb (check_watcher &w)
763{ 678{
… …
807 cmdbuf_endp += n; 722 cmdbuf_endp += n;
808 return true; 723 return true;
809 } 724 }
810 else if (n < 0 && errno != EAGAIN) 725 else if (n < 0 && errno != EAGAIN)
811 destroy (); 726 destroy ();
812 727
813 return false; 728 return false;
814} 729}
815 730
816void 731void
817rxvt_term::pty_cb (io_watcher &w, short revents) 732rxvt_term::pty_cb (io_watcher &w, short revents)
… …
834 seen_input = 1; 749 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */ 750 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch (); 751 tt_winch ();
837 } 752 }
838 753
839 uint32_t ch = NOCHAR; 754 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
764 unicode_t ch = NOCHAR;
765
766 for (;;)
767 {
768 if (ch == NOCHAR)
769 ch = next_char ();
770
771 if (ch == NOCHAR) // TODO: improve
772 break;
773
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
840 783
841 for (;;) 784 for (;;)
842 { 785 {
843 if (ch == NOCHAR)
844 ch = next_char (); 786 ch = next_char ();
845 787
846 if (ch == NOCHAR) // TODO: improve 788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break; 789 break;
848 790 else
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 { 791 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch; 792 *str++ = ch;
858 793
859 for (;;) 794 if (ch == '\n')
860 { 795 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else 796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
866 { 801 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (!(Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true; 802 refreshnow = true;
878 flag = false; 803 flag = false;
879 ch = NOCHAR; 804 ch = NOCHAR;
880 break; 805 break;
881 } 806 }
882 807
883 // scr_add_lines only works for nlines < TermWin.nrow - 1. 808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1) 809 if (nlines >= TermWin.nrow - 1)
885 { 810 {
886 scr_add_lines (buf, nlines, str - buf); 811 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0; 812 nlines = 0;
888 str = buf; 813 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 } 814 }
898 } 815 }
899 816
900 scr_add_lines (buf, nlines, str - buf); 817 if (str >= buf + BUFSIZ)
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 { 818 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 819 ch = NOCHAR;
914 refresh_limit++; 820 break;
915
916 scr_refresh (refresh_type);
917 } 821 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 } 822 }
936 } 823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
937 } 846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
938 } 861 }
862
863 return flag;
939} 864}
940 865
941// read the next character, currently handles UTF-8 866// read the next character, currently handles UTF-8
942// will probably handle all sorts of other stuff in the future 867// will probably handle all sorts of other stuff in the future
943uint32_t 868unicode_t
944rxvt_term::next_char () 869rxvt_term::next_char ()
945{ 870{
946 while (cmdbuf_ptr < cmdbuf_endp) 871 while (cmdbuf_ptr < cmdbuf_endp)
947 { 872 {
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
949 return *cmdbuf_ptr++; 876 return *cmdbuf_ptr++;
950 877
951 wchar_t wc; 878 wchar_t wc;
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
953 880
954 if (len == (size_t)-2) 881 if (len == (size_t)-2)
955 return NOCHAR; 882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
956 887
957 if (len == (size_t)-1) 888 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959 890
960 // assume wchar == unicode 891 // assume wchar == unicode
… …
963 } 894 }
964 895
965 return NOCHAR; 896 return NOCHAR;
966} 897}
967 898
968/* rxvt_cmd_getc() - Return next input character */ 899/* rxvt_cmd_getc () - Return next input character */
969/* 900/*
970 * Return the next input character after first passing any keyboard input 901 * Return the next input character after first passing any keyboard input
971 * to the command. 902 * to the command.
972 */ 903 */
973uint32_t 904unicode_t
974rxvt_term::cmd_getc () 905rxvt_term::cmd_getc ()
975{ 906{
976 for (;;) 907 for (;;)
977 { 908 {
978 uint32_t c = next_char (); 909 unicode_t c = next_char ();
979 if (c != NOCHAR) 910 if (c != NOCHAR)
980 return c; 911 return c;
981 912
982 // incomplete sequences should occur rarely, still, a better solution 913 // incomplete sequences should occur rarely, still, a better solution
983 // would be preferred. either setjmp/longjmp or better design. 914 // would be preferred. either setjmp/longjmp or better design.
… …
1001} 932}
1002 933
1003void 934void
1004rxvt_term::pointer_blank () 935rxvt_term::pointer_blank ()
1005{ 936{
1006 if (!(Options & Opt_pointerBlank)) 937 if (! (Options & Opt_pointerBlank))
1007 return; 938 return;
1008 939
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 940 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1010 XFlush (display->display); 941 XFlush (display->display);
1011 942
… …
1021 pointer_blank (); 952 pointer_blank ();
1022} 953}
1023#endif 954#endif
1024 955
1025void 956void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 957rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 958{
1028 int button_number, key_state = 0; 959 int button_number, key_state = 0;
1029 int x, y; 960 int x, y;
1030 961
1031 x = ev.x; 962 x = ev.x;
1032 y = ev.y; 963 y = ev.y;
1033 pixel_position (&x, &y); 964 pixel_position (&x, &y);
1034 965
… …
1071#endif 1002#endif
1072 1003
1073 } 1004 }
1074 1005
1075#ifdef DEBUG_MOUSEREPORT 1006#ifdef DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 1007 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 1008 if (key_state & 16)
1078 fputc('C', stderr); 1009 fputc ('C', stderr);
1079 if (key_state & 4) 1010 if (key_state & 4)
1080 fputc('S', stderr); 1011 fputc ('S', stderr);
1081 if (key_state & 8) 1012 if (key_state & 8)
1082 fputc('A', stderr); 1013 fputc ('A', stderr);
1083 if (key_state & 32) 1014 if (key_state & 32)
1084 fputc('2', stderr); 1015 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 1016 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 1017 button_number,
1087 x + 1, 1018 x + 1,
1088 y + 1); 1019 y + 1);
1089#else 1020#else
1090 tt_printf("\033[M%c%c%c", 1021 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 1022 (32 + button_number + key_state),
1092 (32 + x + 1), 1023 (32 + x + 1),
1093 (32 + y + 1)); 1024 (32 + y + 1));
1094#endif 1025#endif
1095} 1026}
1096 1027
1097#ifdef USING_W11LIB 1028#ifdef USING_W11LIB
1098void 1029void
1099rxvt_W11_process_x_event(XEvent *ev) 1030rxvt_W11_process_x_event (XEvent *ev)
1100{ 1031{
1101 rxvt_t *r = rxvt_get_r(); 1032 rxvt_t *r = rxvt_get_r ();
1102 1033
1103 x_cb (*ev); 1034 x_cb (*ev);
1104} 1035}
1105#endif 1036#endif
1106 1037
… …
1189#endif 1120#endif
1190 1121
1191#ifdef DEBUG_X 1122#ifdef DEBUG_X
1192 struct timeval tp; 1123 struct timeval tp;
1193 struct tm *ltt; 1124 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1125 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1126 ltt = localtime (& (tp.tv_sec));
1196 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)); 1127 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));
1197#endif 1128#endif
1198 1129
1199 switch (ev.type) 1130 switch (ev.type)
1200 { 1131 {
1201 case KeyPress: 1132 case KeyPress:
… …
1203 break; 1134 break;
1204 1135
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1137 case KeyRelease:
1207 { 1138 {
1208 if (!(ev.xkey.state & ControlMask)) 1139 if (! (ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 1140 mouse_slip_wheel_speed = 0;
1210 else 1141 else
1211 { 1142 {
1212 KeySym ks; 1143 KeySym ks;
1213 1144
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0); 1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 1146 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 1147 mouse_slip_wheel_speed = 0;
1217 } 1148 }
1218 break; 1149 break;
1219 } 1150 }
… …
1242 Atom ActualType; 1173 Atom ActualType;
1243 int ActualFormat; 1174 int ActualFormat;
1244 unsigned char *data; 1175 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1176 unsigned long Size, RemainingBytes;
1246 1177
1247 XGetWindowProperty(display->display, display->root, 1178 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1179 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1180 0L, 1000000L,
1250 False, AnyPropertyType, 1181 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1182 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1183 &Size, &RemainingBytes,
1253 &data); 1184 &data);
1254 XChangeProperty(display->display, display->root, 1185 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1186 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1187 8, PropModeReplace,
1257 data, STRLEN(data)); 1188 data, STRLEN (data));
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1189 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1191 }
1261#endif /* OFFIX_DND */ 1192#endif /* OFFIX_DND */
1262 break; 1193 break;
1263 1194
1264 case MappingNotify: 1195 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1196 XRefreshKeyboardMapping (& (ev.xmapping));
1266 break; 1197 break;
1267 1198
1268 /* 1199 /*
1269 * XXX: this is not the _current_ arrangement 1200 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1201 * Here's my conclusion:
… …
1295 { 1226 {
1296 TermWin.focus = 1; 1227 TermWin.focus = 1;
1297 want_refresh = 1; 1228 want_refresh = 1;
1298#ifdef USE_XIM 1229#ifdef USE_XIM
1299 if (Input_Context != NULL) 1230 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context); 1231 XSetICFocus (Input_Context);
1301#endif 1232#endif
1302#ifdef CURSOR_BLINK 1233#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1234 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif 1236#endif
… …
1312 { 1243 {
1313 TermWin.focus = 0; 1244 TermWin.focus = 0;
1314 want_refresh = 1; 1245 want_refresh = 1;
1315#ifdef USE_XIM 1246#ifdef USE_XIM
1316 if (Input_Context != NULL) 1247 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context); 1248 XUnsetICFocus (Input_Context);
1318#endif 1249#endif
1319#ifdef CURSOR_BLINK 1250#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1251 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1252 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1253 hidden_cursor = 0;
… …
1332 1263
1333 do 1264 do
1334 { /* Wrap lots of configures into one */ 1265 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1266 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1267 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1269 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1271
1341 if (szHint.width != width || szHint.height != height) 1272 if (szHint.width != width || szHint.height != height)
1342 { 1273 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1275 resize_all_windows (width, height, 1);
1345 } 1276 }
1346#ifdef DEBUG_SIZE 1277#ifdef DEBUG_SIZE
1347 else 1278 else
1348 { 1279 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1280 D_SIZE ((stderr, "Size: Not resizing"));
1350 } 1281 }
1351#endif 1282#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1284 if (Options & Opt_transparent)
1354 { 1285 {
… …
1413 } 1344 }
1414 else 1345 else
1415 { 1346 {
1416 XEvent unused_event; 1347 XEvent unused_event;
1417 1348
1418 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1419 Expose, 1350 Expose,
1420 &unused_event)) ; 1351 &unused_event)) ;
1421 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1422 GraphicsExpose, 1353 GraphicsExpose,
1423 &unused_event)) ; 1354 &unused_event)) ;
1424 if (isScrollbarWindow(ev.xany.window)) 1355 if (isScrollbarWindow (ev.xany.window))
1425 { 1356 {
1426 scrollBar.setIdle(); 1357 scrollBar.setIdle ();
1427 scrollbar_show (0); 1358 scrollbar_show (0);
1428 } 1359 }
1429#ifdef MENUBAR 1360#ifdef MENUBAR
1430 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1431 menubar_expose (); 1362 menubar_expose ();
1432#endif 1363#endif
1433#ifdef RXVT_GRAPHICS
1434 Gr_expose (ev.xany.window);
1435#endif
1436
1437 } 1364 }
1438 break; 1365 break;
1439 1366
1440 case MotionNotify: 1367 case MotionNotify:
1441#ifdef POINTER_BLANK 1368#ifdef POINTER_BLANK
1442 if (hidden_pointer) 1369 if (hidden_pointer)
1443 pointer_unblank (); 1370 pointer_unblank ();
1444#endif 1371#endif
1445#if MENUBAR 1372#if MENUBAR
1446 if (isMenuBarWindow(ev.xany.window)) 1373 if (isMenuBarWindow (ev.xany.window))
1447 { 1374 {
1448 menubar_control (&(ev.xbutton)); 1375 menubar_control (ev.xbutton);
1449 break; 1376 break;
1450 } 1377 }
1451#endif 1378#endif
1452 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1453 break; 1380 break;
1454 1381
1455 if (ev.xany.window == TermWin.vt) 1382 if (ev.xany.window == TermWin.vt)
1456 { 1383 {
1457 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1458 { 1385 {
1459 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1460 ; 1387 ;
1461 1388
1462 XQueryPointer(display->display, TermWin.vt, 1389 XQueryPointer (display->display, TermWin.vt,
1463 &unused_root, &unused_child, 1390 &unused_root, &unused_child,
1464 &unused_root_x, &unused_root_y, 1391 &unused_root_x, &unused_root_y,
1465 &(ev.xbutton.x), &(ev.xbutton.y), 1392 & (ev.xbutton.x), & (ev.xbutton.y),
1466 &unused_mask); 1393 &unused_mask);
1467#ifdef MOUSE_THRESHOLD 1394#ifdef MOUSE_THRESHOLD
1468 /* deal with a `jumpy' mouse */ 1395 /* deal with a `jumpy' mouse */
1469 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1470 { 1397 {
1471#endif 1398#endif
1472 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1400 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1474#ifdef SELECTION_SCROLLING 1401#ifdef SELECTION_SCROLLING
1475 if (ev.xbutton.y < TermWin.int_bwidth 1402 if (ev.xbutton.y < TermWin.int_bwidth
1476 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1477 { 1404 {
1478 int dist; 1405 int dist;
1479 1406
1480 pending_scroll_selection=1; 1407 pending_scroll_selection=1;
1481 1408
… …
1503 { 1430 {
1504 scroll_selection_dir = DN; 1431 scroll_selection_dir = DN;
1505 dist = ev.xbutton.y - 1432 dist = ev.xbutton.y -
1506 (TermWin.int_bwidth + TermWin.height); 1433 (TermWin.int_bwidth + TermWin.height);
1507 } 1434 }
1508 scroll_selection_lines=(Pixel2Height(dist)/ 1435 scroll_selection_lines= (Pixel2Height (dist)/
1509 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1436 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1510 MIN_IT(scroll_selection_lines, 1437 MIN_IT (scroll_selection_lines,
1511 SELECTION_SCROLL_MAX_LINES); 1438 SELECTION_SCROLL_MAX_LINES);
1512 } 1439 }
1513 else 1440 else
1514 { 1441 {
1515 /* we are within the text window, so we 1442 /* we are within the text window, so we
… …
1523 } 1450 }
1524#endif 1451#endif
1525 1452
1526 } 1453 }
1527 } 1454 }
1528 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1529 { 1456 {
1530 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1531 MotionNotify, &ev)) ; 1458 MotionNotify, &ev)) ;
1532 XQueryPointer(display->display, scrollBar.win, 1459 XQueryPointer (display->display, scrollBar.win,
1533 &unused_root, &unused_child, 1460 &unused_root, &unused_child,
1534 &unused_root_x, &unused_root_y, 1461 &unused_root_x, &unused_root_y,
1535 &(ev.xbutton.x), &(ev.xbutton.y), 1462 & (ev.xbutton.x), & (ev.xbutton.y),
1536 &unused_mask); 1463 &unused_mask);
1537 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1538 scrollbar_size()); 1465 scrollbar_size ());
1539 scr_refresh (refresh_type); 1466 scr_refresh (refresh_type);
1540 refresh_limit = 0; 1467 refresh_limit = 0;
1541 scrollbar_show (1); 1468 scrollbar_show (1);
1542 } 1469 }
1543 break; 1470 break;
… …
1565 /* 1492 /*
1566 * if user used some Esetroot compatible prog to set the root bg, 1493 * if user used some Esetroot compatible prog to set the root bg,
1567 * use the property to determine the pixmap. We use it later on. 1494 * use the property to determine the pixmap. We use it later on.
1568 */ 1495 */
1569 if (xa[XA_XROOTPMAPID] == 0) 1496 if (xa[XA_XROOTPMAPID] == 0)
1570 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False); 1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1571 1498
1572 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1573 return; 1500 return;
1574 } 1501 }
1575 1502
… …
1582#endif 1509#endif
1583 } 1510 }
1584} 1511}
1585 1512
1586void 1513void
1587rxvt_term::button_press (const XButtonEvent &ev) 1514rxvt_term::button_press (XButtonEvent &ev)
1588{ 1515{
1589 int reportmode = 0, clickintime; 1516 int reportmode = 0, clickintime;
1590 1517
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1519 if (!bypass_keystate)
1593 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1520 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1594 /* 1521 /*
1595 * VT window processing of button press 1522 * VT window processing of button press
1596 */ 1523 */
1597 if (ev.window == TermWin.vt) 1524 if (ev.window == TermWin.vt)
1598 { 1525 {
1599#if RXVT_GRAPHICS
1600 if (ev.subwindow != None)
1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else
1603#endif
1604
1605 {
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1527 if (reportmode)
1528 {
1529 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime)
1608 { 1534 {
1609 /* mouse report from vt window */ 1535 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1536 MEvent.clicks++;
1611 MEvent.state = ev.state; 1537 if (MEvent.clicks > 1)
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1538 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1539 /* only report double clicks */
1620 MEvent.clicks = 2; 1540 MEvent.clicks = 2;
1621 mouse_report (ev); 1541 mouse_report (ev);
1622 1542
1623 /* don't report the release */ 1543 /* don't report the release */
1624 MEvent.clicks = 0; 1544 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1545 MEvent.button = AnyButton;
1626 }
1627 } 1546 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev.button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 } 1547 }
1641 else 1548 else
1642 { 1549 {
1550 /* different button, or time expired */
1551 MEvent.clicks = 1;
1552 MEvent.button = ev.button;
1553 mouse_report (ev);
1554 }
1555#else
1556 MEvent.button = ev.button;
1557 mouse_report (ev);
1558#endif /* MOUSE_REPORT_DOUBLECLICK */
1559
1560 }
1561 else
1562 {
1643 if (ev.button != MEvent.button) 1563 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1564 MEvent.clicks = 0;
1645 switch (ev.button) 1565 switch (ev.button)
1646 { 1566 {
1647 case Button1: 1567 case Button1:
1648 /* allow shift+left click to extend selection */ 1568 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1570 {
1651 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev.x, ev.y, 1);
1655 }
1656 else
1657 {
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev.x, ev.y);
1664 }
1665
1666 MEvent.button = Button1;
1667 break;
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1571 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1572 selection_rotate (ev.x, ev.y);
1672 else 1573 else
1673 selection_extend (ev.x, ev.y, 1); 1574 selection_extend (ev.x, ev.y, 1);
1575 }
1576 else
1577 {
1578 if (MEvent.button == Button1 && clickintime)
1579 MEvent.clicks++;
1580 else
1581 MEvent.clicks = 1;
1582
1583 selection_click (MEvent.clicks, ev.x, ev.y);
1584 }
1585
1586 MEvent.button = Button1;
1587 break;
1588
1589 case Button3:
1590 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y);
1592 else
1593 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1594 MEvent.button = Button3;
1675 break; 1595 break;
1676 }
1677 } 1596 }
1597 }
1678 MEvent.time = ev.time; 1598 MEvent.time = ev.time;
1679 return; 1599 return;
1680 }
1681 } 1600 }
1682 1601
1683 /* 1602 /*
1684 * Scrollbar window processing of button press 1603 * Scrollbar window processing of button press
1685 */ 1604 */
1686 if (isScrollbarWindow(ev.window)) 1605 if (isScrollbarWindow (ev.window))
1687 { 1606 {
1688 scrollBar.setIdle (); 1607 scrollBar.setIdle ();
1689 /* 1608 /*
1690 * Rxvt-style scrollbar: 1609 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider 1610 * move up if mouse is above slider
… …
1703 * Mouse report disabled scrollbar: 1622 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down 1623 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down 1624 * click on scrollbar - send pageup/down
1706 */ 1625 */
1707 if ((scrollBar.style == R_SB_NEXT 1626 if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_upButton(ev.y)) 1627 && scrollbarnext_upButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1628 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton(ev.y))) 1629 && scrollbarrxvt_upButton (ev.y)))
1711 tt_printf("\033[A"); 1630 tt_printf ("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT 1631 else if ((scrollBar.style == R_SB_NEXT
1713 && scrollbarnext_dnButton(ev.y)) 1632 && scrollbarnext_dnButton (ev.y))
1714 || (scrollBar.style == R_SB_RXVT 1633 || (scrollBar.style == R_SB_RXVT
1715 && scrollbarrxvt_dnButton(ev.y))) 1634 && scrollbarrxvt_dnButton (ev.y)))
1716 tt_printf("\033[B"); 1635 tt_printf ("\033[B");
1717 else 1636 else
1718 switch (ev.button) 1637 switch (ev.button)
1719 { 1638 {
1720 case Button2: 1639 case Button2:
1721 tt_printf("\014"); 1640 tt_printf ("\014");
1722 break; 1641 break;
1723 case Button1: 1642 case Button1:
1724 tt_printf("\033[6~"); 1643 tt_printf ("\033[6~");
1725 break; 1644 break;
1726 case Button3: 1645 case Button3:
1727 tt_printf("\033[5~"); 1646 tt_printf ("\033[5~");
1728 break; 1647 break;
1729 } 1648 }
1730 } 1649 }
1731 else 1650 else
1732#endif /* NO_SCROLLBAR_REPORT */ 1651#endif /* NO_SCROLLBAR_REPORT */
… …
1734 { 1653 {
1735 char upordown = 0; 1654 char upordown = 0;
1736 1655
1737 if (scrollBar.style == R_SB_NEXT) 1656 if (scrollBar.style == R_SB_NEXT)
1738 { 1657 {
1739 if (scrollbarnext_upButton(ev.y)) 1658 if (scrollbarnext_upButton (ev.y))
1740 upordown = -1; /* up */ 1659 upordown = -1; /* up */
1741 else if (scrollbarnext_dnButton(ev.y)) 1660 else if (scrollbarnext_dnButton (ev.y))
1742 upordown = 1; /* down */ 1661 upordown = 1; /* down */
1743 } 1662 }
1744 else if (scrollBar.style == R_SB_RXVT) 1663 else if (scrollBar.style == R_SB_RXVT)
1745 { 1664 {
1746 if (scrollbarrxvt_upButton(ev.y)) 1665 if (scrollbarrxvt_upButton (ev.y))
1747 upordown = -1; /* up */ 1666 upordown = -1; /* up */
1748 else if (scrollbarrxvt_dnButton(ev.y)) 1667 else if (scrollbarrxvt_dnButton (ev.y))
1749 upordown = 1; /* down */ 1668 upordown = 1; /* down */
1750 } 1669 }
1751 if (upordown) 1670 if (upordown)
1752 { 1671 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1776 case R_SB_ALIGN_BOTTOM: 1695 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 1696 csrO = scrollBar.bot - scrollBar.top;
1778 break; 1697 break;
1779 } 1698 }
1780 if (scrollBar.style == R_SB_XTERM 1699 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider(ev.y) 1700 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider(ev.y)) 1701 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position(ev.y) - csrO, 1702 scr_move_to ( scrollbar_position (ev.y) - csrO,
1784 scrollbar_size()); 1703 scrollbar_size ());
1785 scrollBar.setMotion (); 1704 scrollBar.setMotion ();
1786 break; 1705 break;
1787 1706
1788 case Button1: 1707 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1708 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1791 /* FALLTHROUGH */ 1710 /* FALLTHROUGH */
1792 1711
1793 case Button3: 1712 case Button3:
1794 if (scrollBar.style != R_SB_XTERM) 1713 if (scrollBar.style != R_SB_XTERM)
1795 { 1714 {
1796 if (scrollbar_above_slider(ev.y)) 1715 if (scrollbar_above_slider (ev.y))
1797# ifdef RXVT_SCROLL_FULL 1716# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1); 1717 scr_page (UP, TermWin.nrow - 1);
1799# else 1718# else
1800 scr_page (UP, TermWin.nrow / 4); 1719 scr_page (UP, TermWin.nrow / 4);
1801# endif 1720# endif
1802 else if (scrollbar_below_slider(ev.y)) 1721 else if (scrollbar_below_slider (ev.y))
1803# ifdef RXVT_SCROLL_FULL 1722# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1); 1723 scr_page (DN, TermWin.nrow - 1);
1805# else 1724# else
1806 scr_page (DN, TermWin.nrow / 4); 1725 scr_page (DN, TermWin.nrow / 4);
1807# endif 1726# endif
… …
1810 } 1729 }
1811 else 1730 else
1812 { 1731 {
1813 scr_page ((ev.button == Button1 ? DN : UP), 1732 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 1733 (TermWin.nrow
1815 * scrollbar_position(ev.y) 1734 * scrollbar_position (ev.y)
1816 / scrollbar_size())); 1735 / scrollbar_size ()));
1817 } 1736 }
1818 break; 1737 break;
1819 } 1738 }
1820 } 1739 }
1821 return; 1740 return;
1822 } 1741 }
1823#if MENUBAR 1742#if MENUBAR
1824 /* 1743 /*
1825 * Menubar window processing of button press 1744 * Menubar window processing of button press
1826 */ 1745 */
1827 if (isMenuBarWindow(ev.window)) 1746 if (isMenuBarWindow (ev.window))
1828 menubar_control (ev); 1747 menubar_control (ev);
1829#endif 1748#endif
1830} 1749}
1831 1750
1832void 1751void
1833rxvt_term::button_release (const XButtonEvent &ev) 1752rxvt_term::button_release (XButtonEvent &ev)
1834{ 1753{
1835 int reportmode = 0; 1754 int reportmode = 0;
1836 1755
1837 csrO = 0; /* reset csr Offset */ 1756 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1757 if (!bypass_keystate)
1839 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1758 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1840 1759
1841 if (scrollbar_isUpDn()) 1760 if (scrollbar_isUpDn ())
1842 { 1761 {
1843 scrollBar.setIdle (); 1762 scrollBar.setIdle ();
1844 scrollbar_show (0); 1763 scrollbar_show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH; 1765 refresh_type &= ~SMOOTH_REFRESH;
… …
1850#ifdef SELECTION_SCROLLING 1769#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1770 pending_scroll_selection=0;
1852#endif 1771#endif
1853 if (ev.window == TermWin.vt) 1772 if (ev.window == TermWin.vt)
1854 { 1773 {
1855#ifdef RXVT_GRAPHICS
1856 if (ev.subwindow != None)
1857 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1858 else
1859#endif
1860
1861 {
1862 if (reportmode) 1774 if (reportmode)
1775 {
1776 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4)
1779 return;
1780#ifdef MOUSE_REPORT_DOUBLECLICK
1781 /* only report the release of 'slow' single clicks */
1782 if (MEvent.button != AnyButton
1783 && (ev.button != MEvent.button
1784 || (ev.time - MEvent.time
1785 > MULTICLICK_TIME / 2)))
1863 { 1786 {
1864 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */
1866 if (ev.button >= 4)
1867 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev.button != MEvent.button
1872 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1874 {
1875 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 1788 MEvent.button = AnyButton;
1881 mouse_report (ev); 1789 mouse_report (ev);
1790 }
1791#else /* MOUSE_REPORT_DOUBLECLICK */
1792 MEvent.button = AnyButton;
1793 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 1794#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 1795 return;
1884 } 1796 }
1885 /* 1797 /*
1886 * dumb hack to compensate for the failure of click-and-drag 1798 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1799 * when overriding mouse reporting
1888 */ 1800 */
1889 if (PrivateModes & PrivMode_mouse_report 1801 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1802 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1) 1803 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0); 1804 selection_extend (ev.x, ev.y, 0);
1893 1805
1894 switch (ev.button) 1806 switch (ev.button)
1807 {
1808 case Button1:
1809 case Button3:
1810 selection_make (ev.time);
1811 break;
1812 case Button2:
1813 selection_request (ev.time, ev.x, ev.y);
1814 break;
1815#ifdef MOUSE_WHEEL
1816 case Button4:
1817 case Button5:
1895 { 1818 {
1896 case Button1: 1819 int i;
1897 case Button3: 1820 page_dirn v;
1898 selection_make (ev.time); 1821
1822 v = (ev.button == Button4) ? UP : DN;
1823 if (ev.state & ShiftMask)
1899 break; 1824 i = 1;
1900 case Button2: 1825 else if ((Options & Opt_mouseWheelScrollPage))
1901 selection_request (ev.time, ev.x, ev.y); 1826 i = TermWin.nrow - 1;
1827 else
1902 break; 1828 i = 5;
1903#ifdef MOUSE_WHEEL 1829# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 1830 if (ev.state & ControlMask)
1905 case Button5:
1906 { 1831 {
1907 int i;
1908 page_dirn v;
1909
1910 v = (ev.button == Button4) ? UP : DN;
1911 if (ev.state & ShiftMask)
1912 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1;
1915 else
1916 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING
1918 if (ev.state & ControlMask)
1919 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1); 1832 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 } 1834 }
1923# endif 1835# endif
1924# ifdef JUMP_MOUSE_WHEEL 1836# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1925 scr_page (v, i); 1843 scr_page (v, 1);
1926 scr_refresh (SMOOTH_REFRESH); 1844 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 1845 scrollbar_show (1);
1928# else
1929 while (i--)
1930 {
1931 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1);
1934 } 1846 }
1935# endif 1847# endif
1936 1848
1937 }
1938 break;
1939#endif
1940
1941 } 1849 }
1850 break;
1851#endif
1852
1942 } 1853 }
1943 } 1854 }
1944#ifdef MENUBAR 1855#ifdef MENUBAR
1945 else if (isMenuBarWindow(ev.window)) 1856 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1857 menubar_control (ev);
1947#endif 1858#endif
1948} 1859}
1949 1860
1950 1861
… …
1964 Pixmap rootpixmap = None; 1875 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 1876 XWindowAttributes wattr, wrootattr;
1966 1877
1967 pchanged = 0; 1878 pchanged = 0;
1968 1879
1969 if (!(Options & Opt_transparent)) 1880 if (! (Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 1881 return pchanged; /* Don't try any more */
1971 1882
1972 XGetWindowAttributes(display->display, display->root, &wrootattr); 1883 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 1884 rootdepth = wrootattr.depth;
1974 1885
1975 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1976 if (rootdepth != wattr.depth) 1887 if (rootdepth != wattr.depth)
1977 { 1888 {
1978 if (am_transparent) 1889 if (am_transparent)
1979 { 1890 {
1980 pchanged = 1; 1891 pchanged = 1;
1981 XSetWindowBackground(display->display, TermWin.vt, 1892 XSetWindowBackground (display->display, TermWin.vt,
1982 PixColors[Color_bg]); 1893 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 1894 am_transparent = am_pixmap_trans = 0;
1984 } 1895 }
1985 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1986 } 1897 }
1987 1898
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 1899 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync(display->display, False); 1900 XSync (display->display, False);
1990 1901
1991 /* 1902 /*
1992 * Make the frame window set by the window manager have 1903 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 1904 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 1905 * windows for each client, so we have to take care about that.
1995 */ 1906 */
1996 i = (xa[XA_XROOTPMAPID] != 0 1907 i = (xa[XA_XROOTPMAPID] != 0
1997 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 1910 &nitems, &bytes_after, &prop) == Success));
2000 if (!i || prop == NULL) 1911 if (!i || prop == NULL)
2001 have_pixmap = 0; 1912 have_pixmap = 0;
2002 else 1913 else
2003 { 1914 {
2004 have_pixmap = 1; 1915 have_pixmap = 1;
2005 rootpixmap = *((Pixmap *)prop); 1916 rootpixmap = * ((Pixmap *)prop);
2006 XFree(prop); 1917 XFree (prop);
2007 } 1918 }
2008 if (have_pixmap) 1919 if (have_pixmap)
2009 { 1920 {
2010 /* 1921 /*
2011 * Copy display->root pixmap transparency 1922 * Copy display->root pixmap transparency
2012 */ 1923 */
2013 int sx, sy, nx, ny; 1924 int sx, sy, nx, ny;
2014 unsigned int nw, nh; 1925 unsigned int nw, nh;
2015 Window cr; 1926 Window cr;
2016 XImage *image; 1927 XImage *image;
2017 GC gc; 1928 GC gc;
2018 XGCValues gcvalue; 1929 XGCValues gcvalue;
2019 1930
2020 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 1932 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 1933 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 1934 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 1935 nx = ny = 0;
1936
2025 if (sx < 0) 1937 if (sx < 0)
2026 { 1938 {
2027 nw += sx; 1939 nw += sx;
2028 nx = -sx; 1940 nx = -sx;
2029 sx = 0; 1941 sx = 0;
2030 } 1942 }
1943
2031 if (sy < 0) 1944 if (sy < 0)
2032 { 1945 {
2033 nh += sy; 1946 nh += sy;
2034 ny = -sy; 1947 ny = -sy;
2035 sy = 0; 1948 sy = 0;
2036 } 1949 }
1950
2037 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 1953 allowedxerror = -1;
2040 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2041 ZPixmap); 1955 ZPixmap);
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 1957 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 1958 allowedxerror = 0;
2045 if (image == NULL) 1959 if (image == NULL)
… …
2047 if (am_transparent && am_pixmap_trans) 1961 if (am_transparent && am_pixmap_trans)
2048 { 1962 {
2049 pchanged = 1; 1963 pchanged = 1;
2050 if (TermWin.pixmap != None) 1964 if (TermWin.pixmap != None)
2051 { 1965 {
2052 XFreePixmap(display->display, TermWin.pixmap); 1966 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 1967 TermWin.pixmap = None;
2054 } 1968 }
2055 } 1969 }
2056 am_pixmap_trans = 0; 1970 am_pixmap_trans = 0;
2057 } 1971 }
2058 else 1972 else
2059 { 1973 {
2060 if (TermWin.pixmap != None) 1974 if (TermWin.pixmap != None)
2061 XFreePixmap(display->display, TermWin.pixmap); 1975 XFreePixmap (display->display, TermWin.pixmap);
2062 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width, 1977 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 1978 (unsigned int)szHint.height,
2065 (unsigned int)image->depth); 1979 (unsigned int)image->depth);
2066 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width, 1982 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 1983 (unsigned int)image->height);
2070 XFreeGC(display->display, gc); 1984 XFreeGC (display->display, gc);
2071 XDestroyImage(image); 1985 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap); 1987 TermWin.pixmap);
2074 if (!am_transparent || !am_pixmap_trans) 1988 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 1989 pchanged = 1;
2076 am_transparent = am_pixmap_trans = 1; 1990 am_transparent = am_pixmap_trans = 1;
2077 } 1991 }
2078 } 1992 }
1993
2079 if (!am_pixmap_trans) 1994 if (!am_pixmap_trans)
2080 { 1995 {
2081 unsigned int n; 1996 unsigned int n;
2082 /* 1997 /*
2083 * InheritPixmap transparency 1998 * InheritPixmap transparency
2084 */ 1999 */
2085 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2087 i++) 2002 i++)
2088 { 2003 {
2089 oldp = TermWin.parent[i]; 2004 oldp = TermWin.parent[i];
2090 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2005 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2006 &TermWin.parent[i], &list, &n);
2092 XFree(list); 2007 XFree (list);
2093 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2094 if (TermWin.parent[i] == display->root) 2009 if (TermWin.parent[i] == display->root)
2095 { 2010 {
2096 if (oldp != None) 2011 if (oldp != None)
2097 pchanged = 1; 2012 pchanged = 1;
2098 break; 2013 break;
2099 } 2014 }
2100 if (oldp != TermWin.parent[i]) 2015 if (oldp != TermWin.parent[i])
2101 pchanged = 1; 2016 pchanged = 1;
2102 } 2017 }
2018
2103 n = 0; 2019 n = 0;
2020
2104 if (pchanged) 2021 if (pchanged)
2105 { 2022 {
2106 for (; n < (unsigned int)i; n++) 2023 for (; n < (unsigned int)i; n++)
2107 { 2024 {
2108 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2109 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2111 { 2028 {
2112 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2030 break;
2114 } 2031 }
2115 } 2032 }
2116 } 2033 }
2034
2117 if (n > (int)(sizeof(TermWin.parent) 2035 if (n > (int) (sizeof (TermWin.parent)
2118 / sizeof(TermWin.parent[0]))) 2036 / sizeof (TermWin.parent[0])))
2119 { 2037 {
2120 D_X((stderr, "InheritPixmap Turning off")); 2038 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground(display->display, TermWin.parent[0], 2039 XSetWindowBackground (display->display, TermWin.parent[0],
2122 PixColors[Color_fg]); 2040 PixColors[Color_fg]);
2123 XSetWindowBackground(display->display, TermWin.vt, 2041 XSetWindowBackground (display->display, TermWin.vt,
2124 PixColors[Color_bg]); 2042 PixColors[Color_bg]);
2125 am_transparent = 0; 2043 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2044 /* XXX: also turn off Opt_transparent? */
2127 } 2045 }
2128 else 2046 else
… …
2132# ifdef HAVE_NANOSLEEP 2050# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt; 2051 struct timespec rqt;
2134 2052
2135 rqt.tv_sec = 1; 2053 rqt.tv_sec = 1;
2136 rqt.tv_nsec = 0; 2054 rqt.tv_nsec = 0;
2137 nanosleep(&rqt, NULL); 2055 nanosleep (&rqt, NULL);
2138# else 2056# else
2139 sleep(1); 2057 sleep (1);
2140# endif 2058# endif
2141 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2060 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2144 ParentRelative); 2062 ParentRelative);
2145 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2146 ParentRelative); 2064 ParentRelative);
2147 am_transparent = 1; 2065 am_transparent = 1;
2148 } 2066 }
2067
2149 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2069 TermWin.parent[i] = None;
2151 } 2070 }
2152 return pchanged; 2071 return pchanged;
2153} 2072}
2154#endif 2073#endif
… …
2159/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2161FILE * 2080FILE *
2162rxvt_term::popen_printer () 2081rxvt_term::popen_printer ()
2163{ 2082{
2164 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2084
2166 if (stream == NULL) 2085 if (stream == NULL)
2167 rxvt_print_error("can't open printer pipe"); 2086 rxvt_print_error ("can't open printer pipe");
2168 return stream; 2087 return stream;
2169} 2088}
2170 2089
2171int 2090int
2172rxvt_term::pclose_printer (FILE *stream) 2091rxvt_term::pclose_printer (FILE *stream)
2173{ 2092{
2174 fflush (stream); 2093 fflush (stream);
2175 /* pclose() reported not to work on SunOS 4.1.3 */ 2094 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */ 2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */ 2096 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */ 2097 return pclose (stream); /* return fclose (stream); */
2179# else 2098# else
2180 return pclose (stream); 2099 return pclose (stream);
… …
2203 unsigned char ch; 2122 unsigned char ch;
2204 unsigned int i, len; 2123 unsigned int i, len;
2205 2124
2206 if ((ch = cmd_getc ()) != C0_ESC) 2125 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2126 {
2208 if (putc(ch, fd) == EOF) 2127 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2128 break; /* done = 1 */
2210 } 2129 }
2211 else 2130 else
2212 { 2131 {
2213 len = 0; 2132 len = 0;
… …
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2144 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2145 break; /* done = 1 */
2227 } 2146 }
2228 } 2147 }
2229 for (i = 0; i < len; i++) 2148 for (i = 0; i < len; i++)
2230 if (putc(buf[i], fd) == EOF) 2149 if (putc (buf[i], fd) == EOF)
2231 { 2150 {
2232 done = 1; 2151 done = 1;
2233 break; 2152 break;
2234 } 2153 }
2235 } 2154 }
… …
2255{ 2174{
2256 switch (ch) 2175 switch (ch)
2257 { 2176 {
2258 case C0_ENQ: /* terminal Status */ 2177 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2178 if (rs[Rs_answerbackstring])
2260 tt_write( 2179 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2180 (const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2182 else
2264 tt_write((unsigned char *)VT100_ANS, 2183 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN(VT100_ANS)); 2184 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2185 break;
2267 case C0_BEL: /* bell */ 2186 case C0_BEL: /* bell */
2268 scr_bell (); 2187 scr_bell ();
2269 break; 2188 break;
2270 case C0_BS: /* backspace */ 2189 case C0_BS: /* backspace */
… …
2332 row = cmd_getc () - ' '; 2251 row = cmd_getc () - ' ';
2333 col = cmd_getc () - ' '; 2252 col = cmd_getc () - ' ';
2334 scr_gotorc (row, col, 0); 2253 scr_gotorc (row, col, 0);
2335 break; 2254 break;
2336 case 'Z': /* identify the terminal type */ 2255 case 'Z': /* identify the terminal type */
2337 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2256 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2338 break; 2257 break;
2339 case '<': /* turn off VT52 mode */ 2258 case '<': /* turn off VT52 mode */
2340 PrivMode(0, PrivMode_vt52); 2259 PrivMode (0, PrivMode_vt52);
2341 break; 2260 break;
2342 case 'F': /* use special graphics character set */ 2261 case 'F': /* use special graphics character set */
2343 case 'G': /* use regular character set */ 2262 case 'G': /* use regular character set */
2344 /* unimplemented */ 2263 /* unimplemented */
2345 break; 2264 break;
… …
2381 scr_charset_set (2, (unsigned int)cmd_getc ()); 2300 scr_charset_set (2, (unsigned int)cmd_getc ());
2382 break; 2301 break;
2383 case '+': 2302 case '+':
2384 scr_charset_set (3, (unsigned int)cmd_getc ()); 2303 scr_charset_set (3, (unsigned int)cmd_getc ());
2385 break; 2304 break;
2386#ifdef MULTICHAR_SET
2387 case '$':
2388 scr_charset_set (-2, (unsigned int)cmd_getc ());
2389 break;
2390#endif
2391#ifndef NO_FRILLS 2305#ifndef NO_FRILLS
2392 case '6': 2306 case '6':
2393 scr_backindex (); 2307 scr_backindex ();
2394 break; 2308 break;
2395#endif 2309#endif
… …
2404 scr_forwardindex (); 2318 scr_forwardindex ();
2405 break; 2319 break;
2406#endif 2320#endif
2407 case '=': 2321 case '=':
2408 case '>': 2322 case '>':
2409 PrivMode((ch == '='), PrivMode_aplKP); 2323 PrivMode ((ch == '='), PrivMode_aplKP);
2410 break; 2324 break;
2411 2325
2412 case C1_40: 2326 case C1_40:
2413 cmd_getc (); 2327 cmd_getc ();
2414 break; 2328 break;
… …
2417 break; 2331 break;
2418 2332
2419 /* 8.3.87: NEXT LINE */ 2333 /* 8.3.87: NEXT LINE */
2420 case C1_NEL: /* ESC E */ 2334 case C1_NEL: /* ESC E */
2421 { 2335 {
2422 uint32_t nlcr[] = { '\n', '\r' }; 2336 unicode_t nlcr[] = { L'\n', L'\r' };
2423 scr_add_lines (nlcr, 1, 2); 2337 scr_add_lines (nlcr, 1, 2);
2424 } 2338 }
2425 break; 2339 break;
2426 2340
2427 /* kidnapped escape sequence: Should be 8.3.48 */ 2341 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2450 process_dcs_seq (); 2364 process_dcs_seq ();
2451 break; 2365 break;
2452 2366
2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2454 case C1_SCI: /* ESC Z */ 2368 case C1_SCI: /* ESC Z */
2455 tt_write((const unsigned char *)ESCZ_ANSWER, 2369 tt_write ((const unsigned char *)ESCZ_ANSWER,
2456 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2457 break; /* steal obsolete ESC [ c */ 2371 break; /* steal obsolete ESC [ c */
2458 2372
2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2460 case C1_CSI: /* ESC [ */ 2374 case C1_CSI: /* ESC [ */
2461 process_csi_seq (); 2375 process_csi_seq ();
… …
2501 2415
2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2416#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2417 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2418 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2505#define get_byte_array_bit(array, bit) \ 2419#define get_byte_array_bit(array, bit) \
2506 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2420 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2507 2421
2508const unsigned char csi_defaults[] = 2422const unsigned char csi_defaults[] =
2509 { 2423 {
2510 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2424 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2511 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2425 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2512 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2518 }; 2432 };
2519/* *INDENT-ON* */ 2433/* *INDENT-ON* */
2520 2434
2521void 2435void
2522rxvt_term::process_csi_seq () 2436rxvt_term::process_csi_seq ()
… …
2537 ch = cmd_getc (); 2451 ch = cmd_getc ();
2538 } 2452 }
2539 /* read any numerical arguments */ 2453 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2454 for (n = -1; ch < CSI_ICH; )
2541 { 2455 {
2542 if (isdigit(ch)) 2456 if (isdigit (ch))
2543 { 2457 {
2544 if (n < 0) 2458 if (n < 0)
2545 n = ch - '0'; 2459 n = ch - '0';
2546 else 2460 else
2547 n = n * 10 + ch - '0'; 2461 n = n * 10 + ch - '0';
… …
2573 2487
2574 if (nargs < ESC_ARGS) 2488 if (nargs < ESC_ARGS)
2575 arg[nargs++] = n; 2489 arg[nargs++] = n;
2576 2490
2577 i = ch - CSI_ICH; 2491 i = ch - CSI_ICH;
2578 ndef = get_byte_array_bit(csi_defaults, i); 2492 ndef = get_byte_array_bit (csi_defaults, i);
2579 for (p = 0; p < nargs; p++) 2493 for (p = 0; p < nargs; p++)
2580 if (arg[p] == -1) 2494 if (arg[p] == -1)
2581 arg[p] = ndef; 2495 arg[p] = ndef;
2582 2496
2583#ifdef DEBUG_CMD 2497#ifdef DEBUG_CMD
2584 fprintf(stderr, "CSI "); 2498 fprintf (stderr, "CSI ");
2585 for (p = 0; p < nargs; p++) 2499 for (p = 0; p < nargs; p++)
2586 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2500 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2587 fprintf(stderr, "%c\n", ch); 2501 fprintf (stderr, "%c\n", ch);
2588#endif 2502#endif
2589 2503
2590 /* 2504 /*
2591 * private mode handling 2505 * private mode handling
2592 */ 2506 */
… …
2594 { 2508 {
2595 switch (priv) 2509 switch (priv)
2596 { 2510 {
2597 case '>': 2511 case '>':
2598 if (ch == CSI_DA) /* secondary device attributes */ 2512 if (ch == CSI_DA) /* secondary device attributes */
2599 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2600 break; 2514 break;
2601 case '?': 2515 case '?':
2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2603 process_terminal_mode (ch, priv, nargs, arg); 2517 process_terminal_mode (ch, priv, nargs, arg);
2604 break; 2518 break;
… …
2607 } 2521 }
2608 2522
2609 switch (ch) 2523 switch (ch)
2610 { 2524 {
2611 /* 2525 /*
2612 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2526 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2613 */ 2527 */
2614#ifdef PRINTPIPE 2528#ifdef PRINTPIPE
2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2529 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2616 switch (arg[0]) 2530 switch (arg[0])
2617 { 2531 {
… …
2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2715 break; 2629 break;
2716 2630
2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2718 tt_write((const unsigned char *)VT100_ANS, 2632 tt_write ((const unsigned char *)VT100_ANS,
2719 (unsigned int)(sizeof(VT100_ANS) - 1)); 2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2720 break; 2634 break;
2721 2635
2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2723 process_sgr_mode (nargs, arg); 2637 process_sgr_mode (nargs, arg);
2724 break; 2638 break;
2725 2639
2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2640 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2727 switch (arg[0]) 2641 switch (arg[0])
2728 { 2642 {
2729 case 5: /* DSR requested */ 2643 case 5: /* DSR requested */
2730 tt_printf("\033[0n"); 2644 tt_printf ("\033[0n");
2731 break; 2645 break;
2732 case 6: /* CPR requested */ 2646 case 6: /* CPR requested */
2733 scr_report_position (); 2647 scr_report_position ();
2734 break; 2648 break;
2735#if defined (ENABLE_DISPLAY_ANSWER) 2649#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2650 case 7: /* unofficial extension */
2737 tt_printf("%-.250s\n", rs[Rs_display_name]); 2651 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 2652 break;
2739#endif 2653#endif
2740 case 8: /* unofficial extension */ 2654 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2742 break; 2656 break;
2743 } 2657 }
2744 break; 2658 break;
2745 2659
2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2813 break; 2727 break;
2814#endif 2728#endif
2815 2729
2816 case CSI_78: /* DECREQTPARM */ 2730 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 2731 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 2733 /* FALLTHROUGH */
2820 2734
2821 default: 2735 default:
2822 break; 2736 break;
2823 } 2737 }
… …
2842 { 2756 {
2843 /* 2757 /*
2844 * commands 2758 * commands
2845 */ 2759 */
2846 case 1: /* deiconify window */ 2760 case 1: /* deiconify window */
2847 XMapWindow(display->display, TermWin.parent[0]); 2761 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 2762 break;
2849 case 2: /* iconify window */ 2763 case 2: /* iconify window */
2850 XIconifyWindow(display->display, TermWin.parent[0], 2764 XIconifyWindow (display->display, TermWin.parent[0],
2851 DefaultScreen(display->display)); 2765 DefaultScreen (display->display));
2852 break; 2766 break;
2853 case 3: /* set position (pixels) */ 2767 case 3: /* set position (pixels) */
2854 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2855 break; 2769 break;
2856 case 4: /* set size (pixels) */ 2770 case 4: /* set size (pixels) */
2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2858 break; 2772 break;
2859 case 5: /* raise window */ 2773 case 5: /* raise window */
2860 XRaiseWindow(display->display, TermWin.parent[0]); 2774 XRaiseWindow (display->display, TermWin.parent[0]);
2861 break; 2775 break;
2862 case 6: /* lower window */ 2776 case 6: /* lower window */
2863 XLowerWindow(display->display, TermWin.parent[0]); 2777 XLowerWindow (display->display, TermWin.parent[0]);
2864 break; 2778 break;
2865 case 7: /* refresh window */ 2779 case 7: /* refresh window */
2866 scr_touch (true); 2780 scr_touch (true);
2867 break; 2781 break;
2868 case 8: /* set size (chars) */ 2782 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int)(args[1] * TermWin.fheight)); 2784 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 2785 break;
2872 default: 2786 default:
2873 if (args[0] >= 24) /* set height (chars) */ 2787 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 2788 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int)(args[1] * TermWin.fheight)); 2789 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 2790 break;
2877 /* 2791 /*
2878 * reports - some output format copied from XTerm 2792 * reports - some output format copied from XTerm
2879 */ 2793 */
2880 case 11: /* report window state */ 2794 case 11: /* report window state */
2881 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 2797 break;
2884 case 13: /* report window position */ 2798 case 13: /* report window position */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 2801 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 2802 &x, &y, &wdummy);
2889 tt_printf("\033[3;%d;%dt", x, y); 2803 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 2804 break;
2891 case 14: /* report window size (pixels) */ 2805 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 2808 break;
2895 case 18: /* report window size (chars) */ 2809 case 18: /* report window size (chars) */
2896 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 2811 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 2812#if 0 /* XXX: currently disabled due to security concerns */
2899 case 20: /* report icon label */ 2813 case 20: /* report icon label */
2900 XGetIconName(display->display, TermWin.parent[0], &s); 2814 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2902 break; 2816 break;
2903 case 21: /* report window title */ 2817 case 21: /* report window title */
2904 XFetchName(display->display, TermWin.parent[0], &s); 2818 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2906 break; 2820 break;
2907#endif 2821#endif
2908 2822
2909 } 2823 }
2910} 2824}
2911#endif 2825#endif
2912 2826
2913/*----------------------------------------------------------------------*/ 2827/*----------------------------------------------------------------------*/
2914/* 2828/*
2915 * get input up until STRING TERMINATOR (or BEL) 2829 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free()d 2830 * ends_how is terminator used. returned input must be free ()d
2917 */ 2831 */
2918unsigned char * 2832unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 2833rxvt_term::get_to_st (unsigned char *ends_how)
2920{ 2834{
2921 int seen_esc = 0; /* seen escape? */ 2835 int seen_esc = 0; /* seen escape? */
… …
2936 } 2850 }
2937 else if (ch == '\t') 2851 else if (ch == '\t')
2938 ch = ' '; /* translate '\t' to space */ 2852 ch = ' '; /* translate '\t' to space */
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2940 return NULL; /* other control character - exit */ 2854 return NULL; /* other control character - exit */
2941 if (n < sizeof(string) - 1) 2855 if (n < sizeof (string) - 1)
2942 string[n++] = ch; 2856 string[n++] = ch;
2943 seen_esc = 0; 2857 seen_esc = 0;
2944 } 2858 }
2945 string[n++] = '\0'; 2859 string[n++] = '\0';
2946 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 2861 return NULL;
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2862 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY(s, string, n); 2863 STRNCPY (s, string, n);
2950 return s; 2864 return s;
2951} 2865}
2952 2866
2953/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2954/* 2868/*
… …
2961 /* 2875 /*
2962 * Not handled yet 2876 * Not handled yet
2963 */ 2877 */
2964 s = get_to_st (&eh); 2878 s = get_to_st (&eh);
2965 if (s) 2879 if (s)
2966 free(s); 2880 free (s);
2967 return; 2881 return;
2968} 2882}
2969 2883
2970/*----------------------------------------------------------------------*/ 2884/*----------------------------------------------------------------------*/
2971/* 2885/*
… …
2976{ 2890{
2977 unsigned char ch, eh, *s; 2891 unsigned char ch, eh, *s;
2978 int arg; 2892 int arg;
2979 2893
2980 ch = cmd_getc (); 2894 ch = cmd_getc ();
2981 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2895 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 2896 arg = arg * 10 + (ch - '0');
2983 2897
2984 if (ch == ';') 2898 if (ch == ';')
2985 { 2899 {
2986 s = get_to_st (&eh); 2900 s = get_to_st (&eh);
2987 if (s) 2901 if (s)
2988 { 2902 {
2989 /* 2903 /*
2990 * rxvt_menubar_dispatch() violates the constness of the string, 2904 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here 2905 * so do it here
2992 */ 2906 */
2993 if (arg == XTerm_Menu) 2907 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */ 2908#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s); 2909 menubar_dispatch ((char *)s);
2996#else 2910#else
2997 (void)0; 2911 (void)0;
2998#endif 2912#endif
2999 else 2913 else
3000 xterm_seq (arg, (char *)s, eh); 2914 xterm_seq (arg, (char *)s, eh);
3001 free(s); 2915 free (s);
3002 } 2916 }
3003 } 2917 }
3004} 2918}
3005/* 2919/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3020 * 10 = menu (may change in future) 2934 * 10 = menu (may change in future)
3021 * 20 = bg pixmap 2935 * 20 = bg pixmap
3022 * 39 = change default fg color 2936 * 39 = change default fg color
3023 * 49 = change default bg color 2937 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
3025 */ 2941 */
3026void 2942void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3028{ 2944{
3029 int changed = 0; 2945 int changed = 0;
3030 int color; 2946 int color;
3031 char *buf, *name; 2947 char *buf, *name;
3032 2948
3033 assert(str != NULL); 2949 assert (str != NULL);
3034 switch (op) 2950 switch (op)
3035 { 2951 {
3036 case XTerm_name: 2952 case XTerm_name:
3037 set_title (str); 2953 set_title (str);
3038 /* FALLTHROUGH */ 2954 /* FALLTHROUGH */
… …
3043 set_title (str); 2959 set_title (str);
3044 break; 2960 break;
3045 case XTerm_Color: 2961 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 2962 for (buf = (char *)str; buf && *buf;)
3047 { 2963 {
3048 if ((name = STRCHR(buf, ';')) == NULL) 2964 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 2965 break;
3050 *name++ = '\0'; 2966 *name++ = '\0';
3051 color = atoi(buf); 2967 color = atoi (buf);
3052 if (color < 0 || color >= TOTAL_COLORS) 2968 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 2969 break;
3054 if ((buf = STRCHR(name, ';')) != NULL) 2970 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 2971 *buf++ = '\0';
3056 set_window_color (color + minCOLOR, name); 2972 set_window_color (color + minCOLOR, name);
3057 } 2973 }
3058 break; 2974 break;
3059#ifndef NO_CURSORCOLOR 2975#ifndef NO_CURSORCOLOR
… …
3076 break; 2992 break;
3077#endif 2993#endif
3078 2994
3079 case XTerm_Menu: 2995 case XTerm_Menu:
3080 /* 2996 /*
3081 * rxvt_menubar_dispatch() violates the constness of the string, 2997 * rxvt_menubar_dispatch () violates the constness of the string,
3082 * so DON'T do it here 2998 * so DON'T do it here
3083 */ 2999 */
3084 break; 3000 break;
3085 case XTerm_Pixmap: 3001 case XTerm_Pixmap:
3086 if (*str != ';') 3002 if (*str != ';')
… …
3089 scale_pixmap (""); /* reset to default scaling */ 3005 scale_pixmap (""); /* reset to default scaling */
3090 set_bgPixmap (str); /* change pixmap */ 3006 set_bgPixmap (str); /* change pixmap */
3091#endif 3007#endif
3092 scr_touch (true); 3008 scr_touch (true);
3093 } 3009 }
3094 while ((str = STRCHR(str, ';')) != NULL) 3010 while ((str = STRCHR (str, ';')) != NULL)
3095 { 3011 {
3096 str++; 3012 str++;
3097#if XPM_BACKGROUND 3013#if XPM_BACKGROUND
3098 changed += scale_pixmap (str); 3014 changed += scale_pixmap (str);
3099#endif 3015#endif
… …
3115 set_window_color (Color_bg, str); 3031 set_window_color (Color_bg, str);
3116 break; 3032 break;
3117 case XTerm_logfile: 3033 case XTerm_logfile:
3118 break; 3034 break;
3119 case XTerm_font: 3035 case XTerm_font:
3120 change_font (0, str); 3036 change_font (str);
3121 break; 3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif
3122#if 0 3057#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3058 case XTerm_dumpscreen: /* no error notices */
3124 { 3059 {
3125 int fd; 3060 int fd;
3126 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3062 {
3128 scr_dump (fd); 3063 scr_dump (fd);
3129 close(fd); 3064 close (fd);
3130 } 3065 }
3131 } 3066 }
3132 break; 3067 break;
3133#endif 3068#endif
3134 3069
… …
3159 else 3094 else
3160 { 3095 {
3161 if (mode == 'r') 3096 if (mode == 'r')
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3098 else
3164 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode(state, bit); 3100 PrivMode (state, bit);
3166 } 3101 }
3167 return state; 3102 return state;
3168} 3103}
3169 3104
3170/* we're not using priv _yet_ */ 3105/* we're not using priv _yet_ */
3171void 3106void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3108{
3174 unsigned int i, j; 3109 unsigned int i, j;
3175 int state; 3110 int state;
3176 static const struct 3111 static const struct
3177 { 3112 {
… …
3191 { menuBar_esc, PrivMode_menuBar }, 3126 { menuBar_esc, PrivMode_menuBar },
3192#endif 3127#endif
3193#ifdef scrollBar_esc 3128#ifdef scrollBar_esc
3194 { scrollBar_esc, PrivMode_scrollBar }, 3129 { scrollBar_esc, PrivMode_scrollBar },
3195#endif 3130#endif
3131 // 18, 19 printing-related
3196 { 25, PrivMode_VisibleCursor }, 3132 { 25, PrivMode_VisibleCursor },
3133 // 30 show scrollbar rxvt. extension
3197 { 35, PrivMode_ShiftKeys }, 3134 { 35, PrivMode_ShiftKeys }, // rxvt extension
3198 { 40, PrivMode_132OK }, 3135 { 40, PrivMode_132OK },
3136 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI
3138 // 46 start logging
3199 { 47, PrivMode_Screen }, 3139 { 47, PrivMode_Screen },
3200 { 66, PrivMode_aplKP }, 3140 { 66, PrivMode_aplKP },
3201#ifndef NO_BACKSPACE_KEY 3141#ifndef NO_BACKSPACE_KEY
3202 { 67, PrivMode_BackSpace }, 3142 { 67, PrivMode_BackSpace },
3203#endif 3143#endif
3204 { 1000, PrivMode_MouseX11 }, 3144 { 1000, PrivMode_MouseX11 },
3145 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3146 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3147 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3205 { 1010, PrivMode_TtyOutputInh }, 3148 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3206 { 1011, PrivMode_Keypress }, 3149 { 1011, PrivMode_Keypress }, // rxvt extension
3150 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI
3207 { 1047, PrivMode_Screen }, 3153 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor
3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3209 }; 3157 };
3210 3158
3211 if (nargs == 0) 3159 if (nargs == 0)
3212 return; 3160 return;
3213 3161
… …
3220 for (i = 0; i < nargs; i++) 3168 for (i = 0; i < nargs; i++)
3221 { 3169 {
3222 state = -1; 3170 state = -1;
3223 3171
3224 /* basic handling */ 3172 /* basic handling */
3225 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3173 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3226 if (argtopriv[j].argval == arg[i]) 3174 if (argtopriv[j].argval == arg[i])
3227 { 3175 {
3228 state = privcases (mode, argtopriv[j].bit); 3176 state = privcases (mode, argtopriv[j].bit);
3229 break; 3177 break;
3230 } 3178 }
3231 3179
3232 /* extra handling for values with state unkept */ 3180 /* extra handling for values with state unkept */
3181 switch (arg[i])
3182 {
3183 case 1048: /* alternative cursor save */
3184 case 1049:
3185 if (mode == 0)
3186 scr_cursor (RESTORE);
3187 else if (mode == 1)
3188 scr_cursor (SAVE);
3189 /* FALLTHROUGH */
3190 }
3191
3233 if (state == -1) 3192 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */
3234 switch (arg[i]) 3194 switch (arg[i])
3235 { 3195 {
3236 case 1048: /* alternative cursor save */ 3196 /* case 1: - application cursor keys */
3197 case 2: /* VT52 mode */
3198 /* oddball mode. should be set regardless of set/reset
3199 * parameter. Return from VT52 mode with an ESC < from
3200 * within VT52 mode
3201 */
3202 PrivMode (1, PrivMode_vt52);
3203 break;
3204 case 3: /* 80/132 */
3205 if (PrivateModes & PrivMode_132OK)
3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3207 break;
3208 case 4: /* smooth scrolling */
3237 if (mode == 0) 3209 if (state)
3238 scr_cursor (RESTORE); 3210 Options &= ~Opt_jumpScroll;
3239 else if (mode == 1) 3211 else
3240 scr_cursor (SAVE); 3212 Options |= Opt_jumpScroll;
3213 break;
3214 case 5: /* reverse video */
3215 scr_rvideo_mode (state);
3216 break;
3217 case 6: /* relative/absolute origins */
3218 scr_relative_origin (state);
3219 break;
3220 case 7: /* autowrap */
3221 scr_autowrap (state);
3222 break;
3223 /* case 8: - auto repeat, can't do on a per window basis */
3224 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11);
3227 break;
3228#ifdef menuBar_esc
3229 case menuBar_esc:
3230#ifdef MENUBAR
3231 map_menuBar (state);
3232#endif
3233 break;
3234#endif
3235#ifdef scrollBar_esc
3236 case scrollBar_esc:
3237 if (scrollbar_mapping (state))
3238 {
3239 resize_all_windows (0, 0, 0);
3240 scr_touch (true);
3241 }
3242 break;
3243#endif
3244 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state);
3246 break;
3247 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */
3250 scr_change_screen (state);
3251 break;
3252 /* case 66: - application key pad */
3253 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10);
3257 break;
3258#if 0
3259 case 1001:
3260 break; /* X11 mouse highlighting */
3261#endif
3262 case 1010: /* scroll to bottom on TTY output inhibit */
3263 if (state)
3264 Options &= ~Opt_scrollTtyOutput;
3265 else
3266 Options |= Opt_scrollTtyOutput;
3267 break;
3268 case 1011: /* scroll to bottom on key press */
3269 if (state)
3270 Options |= Opt_scrollTtyKeypress;
3271 else
3272 Options &= ~Opt_scrollTtyKeypress;
3273 break;
3274 case 1047: /* secondary screen w/ clearing */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3276 if (current_screen != PRIMARY)
3277 scr_erase_screen (2);
3278 scr_change_screen (state);
3241 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
3242 default: 3280 default:
3243 continue; /* for(;i;) */ 3281 break;
3244 } 3282 }
3245
3246 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i])
3248 {
3249 /* case 1: - application cursor keys */
3250 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode
3254 */
3255 PrivMode(1, PrivMode_vt52);
3256 break;
3257 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3260 (unsigned int)TermWin.height);
3261 break;
3262 case 4: /* smooth scrolling */
3263 if (state)
3264 Options &= ~Opt_jumpScroll;
3265 else
3266 Options |= Opt_jumpScroll;
3267 break;
3268 case 5: /* reverse video */
3269 scr_rvideo_mode (state);
3270 break;
3271 case 6: /* relative/absolute origins */
3272 scr_relative_origin (state);
3273 break;
3274 case 7: /* autowrap */
3275 scr_autowrap (state);
3276 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */
3280 PrivateModes &= ~(PrivMode_MouseX11);
3281 break;
3282#ifdef menuBar_esc
3283 case menuBar_esc:
3284#ifdef MENUBAR
3285 map_menuBar (state);
3286#endif
3287 break;
3288#endif
3289#ifdef scrollBar_esc
3290 case scrollBar_esc:
3291 if (scrollbar_mapping (state))
3292 {
3293 resize_all_windows (0, 0, 0);
3294 scr_touch (true);
3295 }
3296 break;
3297#endif
3298 case 25: /* visible/invisible cursor */
3299 scr_cursor_visible (state);
3300 break;
3301 /* case 35: - shift keys */
3302 /* case 40: - 80 <--> 132 mode */
3303 case 47: /* secondary screen */
3304 scr_change_screen (state);
3305 break;
3306 /* case 66: - application key pad */
3307 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */
3310 PrivateModes &= ~(PrivMode_MouseX10);
3311 break;
3312#if 0
3313 case 1001:
3314 break; /* X11 mouse highlighting */
3315#endif
3316 case 1010: /* scroll to bottom on TTY output inhibit */
3317 if (state)
3318 Options &= ~Opt_scrollTtyOutput;
3319 else
3320 Options |= Opt_scrollTtyOutput;
3321 break;
3322 case 1011: /* scroll to bottom on key press */
3323 if (state)
3324 Options |= Opt_scrollTtyKeypress;
3325 else
3326 Options &= ~Opt_scrollTtyKeypress;
3327 break;
3328 case 1047: /* secondary screen w/ clearing */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3330 if (current_screen != PRIMARY)
3331 scr_erase_screen (2);
3332 scr_change_screen (state);
3333 /* FALLTHROUGH */
3334 default:
3335 break;
3336 }
3337 } 3283 }
3338} 3284}
3339/*}}} */ 3285/*}}} */
3340 3286
3341/*{{{ process sgr sequences */ 3287/*{{{ process sgr sequences */
… …
3369 rendset = 1, rendstyle = RS_Blink; 3315 rendset = 1, rendstyle = RS_Blink;
3370 break; 3316 break;
3371 case 7: 3317 case 7:
3372 rendset = 1, rendstyle = RS_RVid; 3318 rendset = 1, rendstyle = RS_RVid;
3373 break; 3319 break;
3320 case 8:
3321 // invisible. NYI
3322 break;
3374 case 22: 3323 case 22:
3375 rendset = 0, rendstyle = RS_Bold; 3324 rendset = 0, rendstyle = RS_Bold;
3376 break; 3325 break;
3377 case 24: 3326 case 24:
3378 rendset = 0, rendstyle = RS_Uline; 3327 rendset = 0, rendstyle = RS_Uline;
… …
3381 rendset = 0, rendstyle = RS_Blink; 3330 rendset = 0, rendstyle = RS_Blink;
3382 break; 3331 break;
3383 case 27: 3332 case 27:
3384 rendset = 0, rendstyle = RS_RVid; 3333 rendset = 0, rendstyle = RS_RVid;
3385 break; 3334 break;
3335 case 28:
3336 // visible. NYI
3337 break;
3386 } 3338 }
3339
3387 if (rendset != -1) 3340 if (rendset != -1)
3388 { 3341 {
3389 scr_rendition (rendset, rendstyle); 3342 scr_rendition (rendset, rendstyle);
3390 continue; /* for(;i;) */ 3343 continue; /* for (;i;) */
3391 } 3344 }
3392 3345
3393 switch (arg[i]) 3346 switch (arg[i])
3394 { 3347 {
3395 case 30: 3348 case 30:
… …
3398 case 33: 3351 case 33:
3399 case 34: 3352 case 34:
3400 case 35: 3353 case 35:
3401 case 36: 3354 case 36:
3402 case 37: 3355 case 37:
3403 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3404 Color_fg);
3405 break; 3357 break;
3406#ifdef TTY_256COLOR 3358#ifdef TTY_256COLOR
3407 case 38: 3359 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3360 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3361 {
3410 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3411 Color_fg);
3412 i += 2; 3363 i += 2;
3413 } 3364 }
3414 break; 3365 break;
3415#endif 3366#endif
3416 case 39: /* default fg */ 3367 case 39: /* default fg */
… …
3423 case 43: 3374 case 43:
3424 case 44: 3375 case 44:
3425 case 45: 3376 case 45:
3426 case 46: 3377 case 46:
3427 case 47: 3378 case 47:
3428 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3429 Color_bg);
3430 break; 3380 break;
3431#ifdef TTY_256COLOR 3381#ifdef TTY_256COLOR
3432 case 48: 3382 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3383 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3384 {
3435 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3436 Color_bg);
3437 i += 2; 3386 i += 2;
3438 } 3387 }
3439 break; 3388 break;
3440#endif 3389#endif
3441 case 49: /* default bg */ 3390 case 49: /* default bg */
… …
3449 case 93: 3398 case 93:
3450 case 94: 3399 case 94:
3451 case 95: 3400 case 95:
3452 case 96: 3401 case 96:
3453 case 97: 3402 case 97:
3454 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3455 Color_fg); 3404 Color_fg);
3456 break; 3405 break;
3457 case 100: 3406 case 100:
3458 case 101: /* set bright bg color */ 3407 case 101: /* set bright bg color */
3459 case 102: 3408 case 102:
3460 case 103: 3409 case 103:
3461 case 104: 3410 case 104:
3462 case 105: 3411 case 105:
3463 case 106: 3412 case 106:
3464 case 107: 3413 case 107:
3465 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3466 Color_bg); 3415 Color_bg);
3467 break; 3416 break;
3468#endif 3417#endif
3469 3418
3470 } 3419 }
… …
3476void 3425void
3477rxvt_term::process_graphics () 3426rxvt_term::process_graphics ()
3478{ 3427{
3479 unsigned char ch, cmd = cmd_getc (); 3428 unsigned char ch, cmd = cmd_getc ();
3480 3429
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3430 if (cmd == 'Q')
3483 { /* query graphics */ 3431 { /* query graphics */
3484 tt_printf("\033G0\n"); /* no graphics */ 3432 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3433 return;
3486 } 3434 }
3487 /* swallow other graphics sequences until terminating ':' */ 3435 /* swallow other graphics sequences until terminating ':' */
3488 do 3436 do
3489 ch = cmd_getc (); 3437 ch = cmd_getc ();
3490 while (ch != ':'); 3438 while (ch != ':');
3491#else
3492 unsigned int nargs;
3493 int args[NGRX_PTS];
3494 unsigned char *text = NULL;
3495
3496 if (cmd == 'Q')
3497 { /* query graphics */
3498 tt_printf("\033G1\n"); /* yes, graphics (color) */
3499 return;
3500 }
3501 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3502 {
3503 int neg;
3504
3505 ch = cmd_getc ();
3506 neg = (ch == '-');
3507 if (neg || ch == '+')
3508 ch = cmd_getc ();
3509
3510 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg)
3513 args[nargs] = -args[nargs];
3514
3515 nargs++;
3516 args[nargs] = 0;
3517 if (ch != ';')
3518 break;
3519 }
3520
3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3523 int i, len = args[4];
3524
3525 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3526
3527 if (text != NULL)
3528 {
3529 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc ();
3531 text[len] = '\0';
3532 }
3533 }
3534 Gr_do_graphics (cmd, nargs, args, text);
3535#endif
3536} 3439}
3537/*}}} */ 3440/*}}} */
3538 3441
3539/* ------------------------------------------------------------------------- */ 3442/* ------------------------------------------------------------------------- */
3540 3443
3541/* 3444/*
3542 * Send printf() formatted output to the command. 3445 * Send printf () formatted output to the command.
3543 * Only use for small amounts of data. 3446 * Only use for small amounts of data.
3544 */ 3447 */
3545void 3448void
3546rxvt_term::tt_printf (const char *fmt,...) 3449rxvt_term::tt_printf (const char *fmt,...)
3547{ 3450{

Diff Legend

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