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.19 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.19 2003/12/18 05:45:11 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * 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>
31 * 31 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */
57void 58void
58rxvt_lookup_key(pR_ 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 = R->kbuf; 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.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & R->ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!R->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 (R->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
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
93 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
95#else 97 else
98#endif
99 {
96 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
97 101
102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]);
98 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
99 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
100 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale);
101 111
102 if (status_return == XLookupChars 112 if (status_return == XLookupChars
103 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
104 { 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 {
105 wkbuf[len] = 0; 123 wkbuf[len] = 0;
106 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
125 if (len < 0)
126 len = 0;
127 }
107 } 128 }
108 else 129 else
109 len = 0; 130 len = 0;
110#endif 131 }
132
111 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
112 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
113 } 135 }
114 else 136 else
115#endif 137#endif
116 { 138 {
117 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
118 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
119 } 141 }
120 142
121 if (valid_keysym) 143 if (valid_keysym)
122 { 144 {
123/* for some backwards compatibility */ 145 /* for some backwards compatibility */
124#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
125# ifdef HOTKEY_CTRL 147# ifdef HOTKEY_CTRL
126 if (ctrl) 148 if (ctrl)
127# else 149# else
128 if (meta) 150 if (meta)
129# endif 151# endif
130 { 152 {
131 if (keysym == R->ks_bigfont) 153 if (keysym == ks_bigfont)
132 { 154 {
133 rxvt_change_font(aR_ 0, FONT_UP); 155 change_font (FONT_UP);
134 return; 156 return;
135 } 157 }
136 else if (keysym == R->ks_smallfont) 158 else if (keysym == ks_smallfont)
137 { 159 {
138 rxvt_change_font(aR_ 0, FONT_DN); 160 change_font (FONT_DN);
139 return; 161 return;
162 }
140 } 163 }
141 }
142#endif 164#endif
143 165
144 if (R->TermWin.saveLines) { 166 if (TermWin.saveLines)
167 {
145#ifdef UNSHIFTED_SCROLLKEYS 168#ifdef UNSHIFTED_SCROLLKEYS
146 if (!ctrl && !meta) { 169 if (!ctrl && !meta)
170 {
147#else 171#else
148 if (IS_SCROLL_MOD) { 172 if (IS_SCROLL_MOD)
173 {
149#endif 174#endif
150 int lnsppg; 175 int lnsppg;
151 176
152#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
153 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
154#else 179#else
155 lnsppg = R->TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
156#endif 181#endif
157 if (keysym == XK_Prior) { 182 if (keysym == XK_Prior)
158 rxvt_scr_page(aR_ UP, lnsppg); 183 {
159 return; 184 scr_page (UP, lnsppg);
185 return;
186 }
160 } else if (keysym == XK_Next) { 187 else if (keysym == XK_Next)
161 rxvt_scr_page(aR_ DN, lnsppg); 188 {
162 return; 189 scr_page (DN, lnsppg);
163 } 190 return;
164 } 191 }
192 }
165#ifdef SCROLL_ON_UPDOWN_KEYS 193#ifdef SCROLL_ON_UPDOWN_KEYS
166 if (IS_SCROLL_MOD) { 194 if (IS_SCROLL_MOD)
167 if (keysym == XK_Up) { 195 {
168 rxvt_scr_page(aR_ UP, 1); 196 if (keysym == XK_Up)
169 return; 197 {
198 scr_page (UP, 1);
199 return;
200 }
170 } else if (keysym == XK_Down) { 201 else if (keysym == XK_Down)
171 rxvt_scr_page(aR_ DN, 1); 202 {
172 return; 203 scr_page (DN, 1);
173 } 204 return;
174 } 205 }
206 }
175#endif 207#endif
176#ifdef SCROLL_ON_HOMEEND_KEYS 208#ifdef SCROLL_ON_HOMEEND_KEYS
177 if (IS_SCROLL_MOD) { 209 if (IS_SCROLL_MOD)
178 if (keysym == XK_Home) { 210 {
179 rxvt_scr_move_to(aR_ 0, 1); 211 if (keysym == XK_Home)
180 return; 212 {
213 scr_move_to (0, 1);
214 return;
215 }
181 } else if (keysym == XK_End) { 216 else if (keysym == XK_End)
182 rxvt_scr_move_to(aR_ 1, 0); 217 {
183 return; 218 scr_move_to (1, 0);
184 } 219 return;
185 } 220 }
221 }
186#endif 222#endif
187 } 223 }
188 224
189 if (shft) { 225 if (shft)
226 {
190 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
191 if (keysym >= XK_F1 && keysym <= XK_F10) { 228 if (keysym >= XK_F1 && keysym <= XK_F10)
229 {
192 keysym += (XK_F11 - XK_F1); 230 keysym += (XK_F11 - XK_F1);
193 shft = 0; /* turn off Shift */ 231 shft = 0; /* turn off Shift */
232 }
194 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
195 switch (keysym) { 234 {
196 /* normal XTerm key bindings */ 235 switch (keysym)
236 {
237 /* normal XTerm key bindings */
197 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
198 rxvt_selection_request(aR_ ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
199 return; 240 return;
200 /* rxvt extras */ 241 /* rxvt extras */
201 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
202 rxvt_change_font(aR_ 0, FONT_UP); 243 change_font (FONT_UP);
203 return; 244 return;
204 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
205 rxvt_change_font(aR_ 0, FONT_DN); 246 change_font (FONT_DN);
206 return; 247 return;
207 } 248 }
208 } 249 }
209 } 250 }
210#ifdef PRINTPIPE 251#ifdef PRINTPIPE
211 if (keysym == XK_Print) { 252 if (keysym == XK_Print)
212 rxvt_scr_printscreen(aR_ ctrl | shft); 253 {
254 scr_printscreen (ctrl | shft);
213 return; 255 return;
214 } 256 }
215#endif 257#endif
216#ifdef GREEK_SUPPORT
217 if (keysym == R->ks_greekmodeswith) {
218 R->greek_mode = !R->greek_mode;
219 if (R->greek_mode) {
220 rxvt_xterm_seq(aR_ XTerm_title,
221 (greek_getmode() == GREEK_ELOT928
222 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
223 greek_reset();
224 } else
225 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
226 return;
227 }
228#endif
229 258
230 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
260 {
231#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
232 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
233 unsigned int l; 263 {
264 unsigned int l;
234 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
235 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
236 267
237 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 268 kbuf0 = (Keysym_map[keysym & 0xFF]);
238 l = (unsigned int)*kbuf0++; 269 l = (unsigned int)*kbuf0++;
239 270
240 /* escape prefix */ 271 /* escape prefix */
241 if (meta) 272 if (meta)
242# ifdef META8_OPTION 273# ifdef META8_OPTION
243 if (R->meta_char == C0_ESC) 274 if (meta_char == C0_ESC)
244# endif 275# endif
245 R->tt_write (&ch, 1); 276 tt_write (&ch, 1);
246 R->tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
247 return; 278 return;
248 } else 279 }
280 else
249#endif 281#endif
250 { 282 {
251 newlen = 1; 283 newlen = 1;
252 switch (keysym) { 284 switch (keysym)
285 {
253#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
254 case XK_BackSpace: 287 case XK_BackSpace:
255 if (R->PrivateModes & PrivMode_HaveBackSpace) { 288 if (PrivateModes & PrivMode_HaveBackSpace)
289 {
256 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
257 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
258 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
259 } else 293 }
260 STRCPY(kbuf, R->key_backspace); 294 else
261# ifdef MULTICHAR_SET 295 STRCPY (kbuf, key_backspace);
262 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 296 break;
263 int col, row;
264
265 newlen = STRLEN(kbuf);
266 col = R->screen.cur.col - 1;
267 row = R->screen.cur.row + R->TermWin.saveLines;
268 if (IS_MULTI2(R->screen.rend[row][col]))
269 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
270 }
271# endif
272 break;
273#endif 297#endif
274#ifndef NO_DELETE_KEY 298#ifndef NO_DELETE_KEY
275 case XK_Delete: 299 case XK_Delete:
276 STRCPY(kbuf, R->key_delete); 300 STRCPY (kbuf, key_delete);
277# ifdef MULTICHAR_SET 301 break;
278 if (R->Options & Opt_mc_hack) {
279 int col, row;
280
281 newlen = STRLEN(kbuf);
282 col = R->screen.cur.col;
283 row = R->screen.cur.row + R->TermWin.saveLines;
284 if (IS_MULTI1(R->screen.rend[row][col]))
285 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
286 }
287# endif 302#endif
288 break; 303 case XK_Tab:
289#endif 304 if (shft)
290 case XK_Tab: 305 STRCPY (kbuf, "\033[Z");
291 if (shft) 306 else
292 STRCPY(kbuf, "\033[Z"); 307 {
293 else {
294#ifdef CTRL_TAB_MAKES_META 308#ifdef CTRL_TAB_MAKES_META
295 if (ctrl) 309 if (ctrl)
296 meta = 1; 310 meta = 1;
297#endif 311#endif
298#ifdef MOD4_TAB_MAKES_META 312#ifdef MOD4_TAB_MAKES_META
299 if (ev->state & Mod4Mask) 313 if (ev.state & Mod4Mask)
300 meta = 1; 314 meta = 1;
301#endif 315#endif
302 newlen = 0; 316 newlen = 0;
303 } 317 }
304 break; 318 break;
305
306 319
307#ifdef XK_KP_Left 320#ifdef XK_KP_Left
308 case XK_KP_Up: /* \033Ox or standard */ 321 case XK_KP_Up: /* \033Ox or standard */
309 case XK_KP_Down: /* \033Or or standard */ 322 case XK_KP_Down: /* \033Or or standard */
310 case XK_KP_Right: /* \033Ov or standard */ 323 case XK_KP_Right: /* \033Ov or standard */
311 case XK_KP_Left: /* \033Ot or standard */ 324 case XK_KP_Left: /* \033Ot or standard */
312 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
313 STRCPY(kbuf, "\033OZ"); 326 {
314 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 327 STRCPY (kbuf, "\033OZ");
315 break; 328 kbuf[2] = "txvr"[keysym - XK_KP_Left];
316 } else 329 break;
330 }
331 else
317 /* translate to std. cursor key */ 332 /* translate to std. cursor key */
318 keysym = XK_Left + (keysym - XK_KP_Left); 333 keysym = XK_Left + (keysym - XK_KP_Left);
319 /* FALLTHROUGH */ 334 /* FALLTHROUGH */
320#endif 335#endif
321 case XK_Up: /* "\033[A" */ 336 case XK_Up: /* "\033[A" */
322 case XK_Down: /* "\033[B" */ 337 case XK_Down: /* "\033[B" */
323 case XK_Right: /* "\033[C" */ 338 case XK_Right: /* "\033[C" */
324 case XK_Left: /* "\033[D" */ 339 case XK_Left: /* "\033[D" */
325 STRCPY(kbuf, "\033[Z"); 340 STRCPY (kbuf, "\033[Z");
326 kbuf[2] = ("DACB"[keysym - XK_Left]); 341 kbuf[2] = "DACB"[keysym - XK_Left];
327 /* do Shift first */ 342 /* do Shift first */
328 if (shft) 343 if (shft)
329 kbuf[2] = ("dacb"[keysym - XK_Left]); 344 kbuf[2] = "dacb"[keysym - XK_Left];
330 else if (ctrl) { 345 else if (ctrl)
331 kbuf[1] = 'O';
332 kbuf[2] = ("dacb"[keysym - XK_Left]);
333 } else if (R->PrivateModes & PrivMode_aplCUR)
334 kbuf[1] = 'O';
335#ifdef MULTICHAR_SET
336 //TODO: ?? 346 {
337 if (R->Options & Opt_mc_hack) { 347 kbuf[1] = 'O';
338 int col, row, m; 348 kbuf[2] = "dacb"[keysym - XK_Left];
339 349 }
340 col = R->screen.cur.col; 350 else if (PrivateModes & PrivMode_aplCUR)
341 row = R->screen.cur.row + R->TermWin.saveLines; 351 kbuf[1] = 'O';
342 m = 0; 352 break;
343 if (keysym == XK_Right
344 && IS_MULTI1(R->screen.rend[row][col]))
345 m = 1;
346 else if (keysym == XK_Left) {
347 if (col > 0) {
348 if (IS_MULTI2(R->screen.rend[row][col - 1]))
349 m = 1;
350 } else if (R->screen.cur.row > 0) {
351 col = R->screen.tlen[--row];
352 if (col == -1)
353 col = R->TermWin.ncol - 1;
354 else
355 col--;
356 if (col > 0
357 && IS_MULTI2(R->screen.rend[row][col]))
358 m = 1;
359 }
360 }
361 if (m)
362 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
363 }
364#endif
365 break;
366 353
367#ifndef UNSHIFTED_SCROLLKEYS 354#ifndef UNSHIFTED_SCROLLKEYS
368# ifdef XK_KP_Prior 355# ifdef XK_KP_Prior
369 case XK_KP_Prior: 356 case XK_KP_Prior:
370 /* allow shift to override */ 357 /* allow shift to override */
371 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 358 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
372 STRCPY(kbuf, "\033Oy"); 359 {
373 break; 360 STRCPY (kbuf, "\033Oy");
374 } 361 break;
375 /* FALLTHROUGH */ 362 }
363 /* FALLTHROUGH */
376# endif 364# endif
377 case XK_Prior: 365 case XK_Prior:
378 STRCPY(kbuf, "\033[5~"); 366 STRCPY (kbuf, "\033[5~");
379 break; 367 break;
380# ifdef XK_KP_Next 368# ifdef XK_KP_Next
381 case XK_KP_Next: 369 case XK_KP_Next:
382 /* allow shift to override */ 370 /* allow shift to override */
383 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 371 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033Os"); 372 {
385 break; 373 STRCPY (kbuf, "\033Os");
386 } 374 break;
387 /* FALLTHROUGH */ 375 }
376 /* FALLTHROUGH */
388# endif 377# endif
389 case XK_Next: 378 case XK_Next:
390 STRCPY(kbuf, "\033[6~"); 379 STRCPY (kbuf, "\033[6~");
391 break; 380 break;
392#endif 381#endif
393 case XK_KP_Enter: 382 case XK_KP_Enter:
394 /* allow shift to override */ 383 /* allow shift to override */
395 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
396 STRCPY(kbuf, "\033OM"); 385 {
397 } else { 386 STRCPY (kbuf, "\033OM");
398 kbuf[0] = '\r'; 387 }
399 kbuf[1] = '\0'; 388 else
400 } 389 {
401 break; 390 kbuf[0] = '\r';
391 kbuf[1] = '\0';
392 }
393 break;
402 394
403#ifdef XK_KP_Begin 395#ifdef XK_KP_Begin
404 case XK_KP_Begin: 396 case XK_KP_Begin:
405 STRCPY(kbuf, "\033Ou"); 397 STRCPY (kbuf, "\033Ou");
406 break; 398 break;
407 399
408 case XK_KP_Insert: 400 case XK_KP_Insert:
409 STRCPY(kbuf, "\033Op"); 401 STRCPY (kbuf, "\033Op");
410 break; 402 break;
411 403
412 case XK_KP_Delete: 404 case XK_KP_Delete:
413 STRCPY(kbuf, "\033On"); 405 STRCPY (kbuf, "\033On");
414 break; 406 break;
415#endif 407#endif
416 case XK_KP_F1: /* "\033OP" */ 408 case XK_KP_F1: /* "\033OP" */
417 case XK_KP_F2: /* "\033OQ" */ 409 case XK_KP_F2: /* "\033OQ" */
418 case XK_KP_F3: /* "\033OR" */ 410 case XK_KP_F3: /* "\033OR" */
419 case XK_KP_F4: /* "\033OS" */ 411 case XK_KP_F4: /* "\033OS" */
420 STRCPY(kbuf, "\033OP"); 412 STRCPY (kbuf, "\033OP");
421 kbuf[2] += (keysym - XK_KP_F1); 413 kbuf[2] += (keysym - XK_KP_F1);
422 break; 414 break;
423 415
424 case XK_KP_Multiply: /* "\033Oj" : "*" */ 416 case XK_KP_Multiply: /* "\033Oj" : "*" */
425 case XK_KP_Add: /* "\033Ok" : "+" */ 417 case XK_KP_Add: /* "\033Ok" : "+" */
426 case XK_KP_Separator: /* "\033Ol" : "," */ 418 case XK_KP_Separator: /* "\033Ol" : "," */
427 case XK_KP_Subtract: /* "\033Om" : "-" */ 419 case XK_KP_Subtract: /* "\033Om" : "-" */
428 case XK_KP_Decimal: /* "\033On" : "." */ 420 case XK_KP_Decimal: /* "\033On" : "." */
429 case XK_KP_Divide: /* "\033Oo" : "/" */ 421 case XK_KP_Divide: /* "\033Oo" : "/" */
430 case XK_KP_0: /* "\033Op" : "0" */ 422 case XK_KP_0: /* "\033Op" : "0" */
431 case XK_KP_1: /* "\033Oq" : "1" */ 423 case XK_KP_1: /* "\033Oq" : "1" */
432 case XK_KP_2: /* "\033Or" : "2" */ 424 case XK_KP_2: /* "\033Or" : "2" */
433 case XK_KP_3: /* "\033Os" : "3" */ 425 case XK_KP_3: /* "\033Os" : "3" */
434 case XK_KP_4: /* "\033Ot" : "4" */ 426 case XK_KP_4: /* "\033Ot" : "4" */
435 case XK_KP_5: /* "\033Ou" : "5" */ 427 case XK_KP_5: /* "\033Ou" : "5" */
436 case XK_KP_6: /* "\033Ov" : "6" */ 428 case XK_KP_6: /* "\033Ov" : "6" */
437 case XK_KP_7: /* "\033Ow" : "7" */ 429 case XK_KP_7: /* "\033Ow" : "7" */
438 case XK_KP_8: /* "\033Ox" : "8" */ 430 case XK_KP_8: /* "\033Ox" : "8" */
439 case XK_KP_9: /* "\033Oy" : "9" */ 431 case XK_KP_9: /* "\033Oy" : "9" */
440 /* allow shift to override */ 432 /* allow shift to override */
441 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 433 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 STRCPY(kbuf, "\033Oj"); 434 {
443 kbuf[2] += (keysym - XK_KP_Multiply); 435 STRCPY (kbuf, "\033Oj");
444 } else { 436 kbuf[2] += (keysym - XK_KP_Multiply);
437 }
438 else
439 {
445 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 440 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
446 kbuf[1] = '\0'; 441 kbuf[1] = '\0';
447 } 442 }
448 break; 443 break;
449 444
450 case XK_Find: 445 case XK_Find:
451 STRCPY(kbuf, "\033[1~"); 446 STRCPY (kbuf, "\033[1~");
452 break; 447 break;
453 case XK_Insert: 448 case XK_Insert:
454 STRCPY(kbuf, "\033[2~"); 449 STRCPY (kbuf, "\033[2~");
455 break; 450 break;
456#ifdef DXK_Remove /* support for DEC remove like key */ 451#ifdef DXK_Remove /* support for DEC remove like key */
457 case DXK_Remove: 452 case DXK_Remove:
458 /* FALLTHROUGH */ 453 /* FALLTHROUGH */
459#endif 454#endif
460 case XK_Execute: 455 case XK_Execute:
461 STRCPY(kbuf, "\033[3~"); 456 STRCPY (kbuf, "\033[3~");
462 break; 457 break;
463 case XK_Select: 458 case XK_Select:
464 STRCPY(kbuf, "\033[4~"); 459 STRCPY (kbuf, "\033[4~");
465 break; 460 break;
466#ifdef XK_KP_End 461#ifdef XK_KP_End
467 case XK_KP_End: 462 case XK_KP_End:
468 /* allow shift to override */ 463 /* allow shift to override */
469 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 464 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
470 STRCPY(kbuf, "\033Oq"); 465 {
471 break; 466 STRCPY (kbuf, "\033Oq");
472 } 467 break;
473 /* FALLTHROUGH */ 468 }
469 /* FALLTHROUGH */
474#endif 470#endif
475 case XK_End: 471 case XK_End:
476 STRCPY(kbuf, KS_END); 472 STRCPY (kbuf, KS_END);
477 break; 473 break;
478#ifdef XK_KP_Home 474#ifdef XK_KP_Home
479 case XK_KP_Home: 475 case XK_KP_Home:
480 /* allow shift to override */ 476 /* allow shift to override */
481 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 477 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
482 STRCPY(kbuf, "\033Ow"); 478 {
483 break; 479 STRCPY (kbuf, "\033Ow");
484 } 480 break;
485 /* FALLTHROUGH */ 481 }
482 /* FALLTHROUGH */
486#endif 483#endif
487 case XK_Home: 484 case XK_Home:
488 STRCPY(kbuf, KS_HOME); 485 STRCPY (kbuf, KS_HOME);
489 break; 486 break;
490 487
491#define FKEY(n, fkey) \ 488#define FKEY(n, fkey) \
492 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 489 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
493 490
494 case XK_F1: /* "\033[11~" */ 491 case XK_F1: /* "\033[11~" */
495 case XK_F2: /* "\033[12~" */ 492 case XK_F2: /* "\033[12~" */
496 case XK_F3: /* "\033[13~" */ 493 case XK_F3: /* "\033[13~" */
497 case XK_F4: /* "\033[14~" */ 494 case XK_F4: /* "\033[14~" */
498 case XK_F5: /* "\033[15~" */ 495 case XK_F5: /* "\033[15~" */
499 FKEY(11, XK_F1); 496 FKEY (11, XK_F1);
500 break; 497 break;
501 case XK_F6: /* "\033[17~" */ 498 case XK_F6: /* "\033[17~" */
502 case XK_F7: /* "\033[18~" */ 499 case XK_F7: /* "\033[18~" */
503 case XK_F8: /* "\033[19~" */ 500 case XK_F8: /* "\033[19~" */
504 case XK_F9: /* "\033[20~" */ 501 case XK_F9: /* "\033[20~" */
505 case XK_F10: /* "\033[21~" */ 502 case XK_F10: /* "\033[21~" */
506 FKEY(17, XK_F6); 503 FKEY (17, XK_F6);
507 break; 504 break;
508 case XK_F11: /* "\033[23~" */ 505 case XK_F11: /* "\033[23~" */
509 case XK_F12: /* "\033[24~" */ 506 case XK_F12: /* "\033[24~" */
510 case XK_F13: /* "\033[25~" */ 507 case XK_F13: /* "\033[25~" */
511 case XK_F14: /* "\033[26~" */ 508 case XK_F14: /* "\033[26~" */
512 FKEY(23, XK_F11); 509 FKEY (23, XK_F11);
513 break; 510 break;
514 case XK_F15: /* "\033[28~" */ 511 case XK_F15: /* "\033[28~" */
515 case XK_F16: /* "\033[29~" */ 512 case XK_F16: /* "\033[29~" */
516 FKEY(28, XK_F15); 513 FKEY (28, XK_F15);
517 break; 514 break;
518 case XK_Help: /* "\033[28~" */ 515 case XK_Help: /* "\033[28~" */
519 FKEY(28, XK_Help); 516 FKEY (28, XK_Help);
520 break; 517 break;
521 case XK_Menu: /* "\033[29~" */ 518 case XK_Menu: /* "\033[29~" */
522 FKEY(29, XK_Menu); 519 FKEY (29, XK_Menu);
523 break; 520 break;
524 case XK_F17: /* "\033[31~" */ 521 case XK_F17: /* "\033[31~" */
525 case XK_F18: /* "\033[32~" */ 522 case XK_F18: /* "\033[32~" */
526 case XK_F19: /* "\033[33~" */ 523 case XK_F19: /* "\033[33~" */
527 case XK_F20: /* "\033[34~" */ 524 case XK_F20: /* "\033[34~" */
528 case XK_F21: /* "\033[35~" */ 525 case XK_F21: /* "\033[35~" */
529 case XK_F22: /* "\033[36~" */ 526 case XK_F22: /* "\033[36~" */
530 case XK_F23: /* "\033[37~" */ 527 case XK_F23: /* "\033[37~" */
531 case XK_F24: /* "\033[38~" */ 528 case XK_F24: /* "\033[38~" */
532 case XK_F25: /* "\033[39~" */ 529 case XK_F25: /* "\033[39~" */
533 case XK_F26: /* "\033[40~" */ 530 case XK_F26: /* "\033[40~" */
534 case XK_F27: /* "\033[41~" */ 531 case XK_F27: /* "\033[41~" */
535 case XK_F28: /* "\033[42~" */ 532 case XK_F28: /* "\033[42~" */
536 case XK_F29: /* "\033[43~" */ 533 case XK_F29: /* "\033[43~" */
537 case XK_F30: /* "\033[44~" */ 534 case XK_F30: /* "\033[44~" */
538 case XK_F31: /* "\033[45~" */ 535 case XK_F31: /* "\033[45~" */
539 case XK_F32: /* "\033[46~" */ 536 case XK_F32: /* "\033[46~" */
540 case XK_F33: /* "\033[47~" */ 537 case XK_F33: /* "\033[47~" */
541 case XK_F34: /* "\033[48~" */ 538 case XK_F34: /* "\033[48~" */
542 case XK_F35: /* "\033[49~" */ 539 case XK_F35: /* "\033[49~" */
543 FKEY(31, XK_F17); 540 FKEY (31, XK_F17);
544 break; 541 break;
545#undef FKEY 542#undef FKEY
546 default: 543 default:
547 newlen = 0; 544 newlen = 0;
548 break; 545 break;
549 } 546 }
550 if (newlen) 547 if (newlen)
551 len = STRLEN(kbuf); 548 len = STRLEN (kbuf);
552 } 549 }
553 /* 550 /*
554 * Pass meta for all function keys, if 'meta' option set 551 * Pass meta for all function keys, if 'meta' option set
555 */ 552 */
556#ifdef META8_OPTION 553#ifdef META8_OPTION
557 if (meta && (R->meta_char == 0x80) && len > 0) 554 if (meta && (meta_char == 0x80) && len > 0)
558 kbuf[len - 1] |= 0x80; 555 kbuf[len - 1] |= 0x80;
559#endif 556#endif
557
558 }
560 } else if (ctrl && keysym == XK_minus) { 559 else if (ctrl && keysym == XK_minus)
560 {
561 len = 1; 561 len = 1;
562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
563 } else { 563 }
564 else
565 {
564#ifdef META8_OPTION 566#ifdef META8_OPTION
565 /* set 8-bit on */ 567 /* set 8-bit on */
566 if (meta && (R->meta_char == 0x80)) { 568 if (meta && (meta_char == 0x80))
567 unsigned char *ch; 569 {
570 unsigned char *ch;
568 571
569 for (ch = kbuf; ch < kbuf + len; ch++) 572 for (ch = kbuf; ch < kbuf + len; ch++)
570 *ch |= 0x80; 573 *ch |= 0x80;
571 meta = 0; 574 meta = 0;
575 }
576#endif
577 /* nil */ ;
578 }
572 } 579 }
573#endif 580
574#ifdef GREEK_SUPPORT 581 if (len <= 0)
575 if (R->greek_mode) 582 return; /* not mapped */
576 len = greek_xlat(kbuf, len); 583
577#endif 584 if (Options & Opt_scrollTtyKeypress)
578 /* nil */ ; 585 if (TermWin.view_start)
579 } 586 {
587 TermWin.view_start = 0;
588 want_refresh = 1;
580 } 589 }
581 590
582 if (len <= 0) 591 /*
583 return; /* not mapped */
584
585 if (R->Options & Opt_scrollTtyKeypress)
586 if (R->TermWin.view_start) {
587 R->TermWin.view_start = 0;
588 R->want_refresh = 1;
589 }
590
591/*
592 * these modifications only affect the static keybuffer 592 * these modifications only affect the static keybuffer
593 * pass Shift/Control indicators for function keys ending with `~' 593 * pass Shift/Control indicators for function keys ending with `~'
594 * 594 *
595 * eg, 595 * eg,
596 * Prior = "ESC[5~" 596 * Prior = "ESC[5~"
597 * Shift+Prior = "ESC[5$" 597 * Shift+Prior = "ESC[5$"
598 * Ctrl+Prior = "ESC[5^" 598 * Ctrl+Prior = "ESC[5^"
599 * Ctrl+Shift+Prior = "ESC[5@" 599 * Ctrl+Shift+Prior = "ESC[5@"
600 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 600 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
601 */ 601 */
602 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 602 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
604 604
605/* escape prefix */ 605 /* escape prefix */
606 if (meta 606 if (meta
607#ifdef META8_OPTION 607#ifdef META8_OPTION
608 && (R->meta_char == C0_ESC) 608 && meta_char == C0_ESC
609#endif 609#endif
610 ) { 610 )
611 {
611 const unsigned char ch = C0_ESC; 612 const unsigned char ch = C0_ESC;
612
613 R->tt_write(&ch, 1); 613 tt_write (&ch, 1);
614 } 614 }
615
615#ifdef DEBUG_CMD 616#if defined(DEBUG_CMD)
616 if (debug_key) { /* Display keyboard buffer contents */ 617 /* Display keyboard buffer contents */
617 char *p; 618 unsigned char *p;
618 int i; 619 int i;
619 620
620 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 621 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
621 for (i = 0, p = kbuf; i < len; i++, p++) 622 for (i = 0, p = kbuf; i < len; i++, p++)
622 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 623 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
623 fprintf(stderr, "'\n"); 624 fprintf (stderr, "'\n");
624 }
625#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
626 R->tt_write(kbuf, (unsigned int)len); 626 tt_write (kbuf, (unsigned int)len);
627} 627}
628/*}}} */ 628/*}}} */
629 629
630#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
631/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
632/* attempt to `write' count to the input buffer */ 632/* attempt to `write' count to the input buffer */
633/* EXTPROTO */
634unsigned int 633unsigned int
635rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 634rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
636{ 635{
637 unsigned int n, s; 636 unsigned int n, s;
638 unsigned char *cmdbuf_base = R->cmdbuf_base,
639 *cmdbuf_endp = R->cmdbuf_endp,
640 *cmdbuf_ptr = R->cmdbuf_ptr;
641 637
642 n = cmdbuf_ptr - cmdbuf_base; 638 n = cmdbuf_ptr - cmdbuf_base;
643 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
640
644 if (n > 0 && s < count) { 641 if (n > 0 && s < count)
642 {
645 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 643 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
646 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
647 cmdbuf_ptr = cmdbuf_base; 645 cmdbuf_ptr = cmdbuf_base;
648 cmdbuf_endp -= n; 646 cmdbuf_endp -= n;
649 s += n; 647 s += n;
650 } 648 }
649
651 if (count > s) { 650 if (count > s)
651 {
652 rxvt_print_error("data loss: cmd_write too large"); 652 rxvt_print_error ("data loss: cmd_write too large");
653 count = s; 653 count = s;
654 } 654 }
655
655 for (; count--;) 656 for (; count--;)
656 *cmdbuf_endp++ = *str++; 657 *cmdbuf_endp++ = *str++;
657 R->cmdbuf_ptr = cmdbuf_ptr; 658
658 R->cmdbuf_endp = cmdbuf_endp; 659 cmd_parse ();
660
659 return 0; 661 return 0;
660} 662}
661#endif /* MENUBAR_MAX */ 663#endif /* MENUBAR_MAX */
662 664
663void 665void
664rxvt_term::flush () 666rxvt_term::flush ()
665{ 667{
666#ifdef TRANSPARENT 668#ifdef TRANSPARENT
667 if (want_full_refresh) 669 if (want_full_refresh)
668 { 670 {
669 want_full_refresh = 0; 671 want_full_refresh = 0;
670 rxvt_scr_clear (this); 672 scr_clear ();
671 rxvt_scr_touch (this, False); 673 scr_touch (false);
672 want_refresh = 1; 674 want_refresh = 1;
673 } 675 }
674#endif 676#endif
675 677
676 if (want_refresh) 678 if (want_refresh)
677 { 679 {
678 rxvt_scr_refresh (this, refresh_type); 680 scr_refresh (refresh_type);
679 rxvt_scrollbar_show (this, 1); 681 scrollbar_show (1);
680#ifdef USE_XIM 682#ifdef USE_XIM
681 rxvt_IMSendSpot (this); 683 IMSendSpot ();
682#endif 684#endif
683 }
684 685
685 XFlush (Xdisplay); 686 }
686#if 0 687
687 if (XPending (Xdisplay)) process_x_events (); 688 display->flush ();
688 if (XPending (Xdisplay)) process_x_events ();
689#endif
690} 689}
691 690
692void 691void
693rxvt_term::check_cb (check_watcher &w) 692rxvt_term::check_cb (check_watcher &w)
694{ 693{
… …
696 SET_LOCALE (locale); 695 SET_LOCALE (locale);
697 696
698 flush (); 697 flush ();
699} 698}
700 699
700#ifdef CURSOR_BLINK
701void 701void
702rxvt_term::process_x_events ()
703{
704 do
705 {
706 XEvent xev;
707
708 XNextEvent (Xdisplay, &xev);
709
710#if defined(CURSOR_BLINK)
711 if ((Options & Opt_cursorBlink)
712 && xev.type == KeyPress)
713 {
714 if (hidden_cursor)
715 {
716 hidden_cursor = 0;
717 want_refresh = 1;
718 }
719
720 blink_ev.start (NOW + BLINK_INTERVAL);
721 }
722#endif
723
724#if defined(POINTER_BLANK)
725 if ((Options & Opt_pointerBlank)
726 && (pointerBlankDelay > 0))
727 {
728 if (xev.type == MotionNotify
729 || xev.type == ButtonPress
730 || xev.type == ButtonRelease)
731 if (hidden_pointer)
732 pointer_unblank ();
733
734 if (xev.type == KeyPress && hidden_pointer == 0)
735 pointer_blank ();
736 }
737#endif
738
739#ifdef USE_XIM
740 if (!XFilterEvent (&xev, xev.xany.window))
741#endif
742 rxvt_process_x_event (this, &xev);
743 }
744 while (XPending (Xdisplay));
745}
746
747void
748rxvt_term::blink_cb (time_watcher &w) 702rxvt_term::cursor_blink_cb (time_watcher &w)
749{ 703{
750 w.at += BLINK_INTERVAL;
751 hidden_cursor = !hidden_cursor; 704 hidden_cursor = !hidden_cursor;
752 want_refresh = 1; 705 want_refresh = 1;
753}
754 706
707 w.start (w.at + BLINK_INTERVAL);
708}
709#endif
710
711#ifdef TEXT_BLINK
755void 712void
756rxvt_term::x_cb (io_watcher &w, short revents) 713rxvt_term::text_blink_cb (time_watcher &w)
757{ 714{
758 SET_R (this); 715 if (scr_refresh_rend (RS_Blink, RS_Blink))
759 SET_LOCALE (locale); 716 {
760 717 hidden_text = !hidden_text;
761 process_x_events (); 718 want_refresh = 1;
719 w.start (w.at + TEXT_BLINK_INTERVAL);
720 }
762} 721}
722#endif
763 723
764bool 724bool
765rxvt_term::pty_fill () 725rxvt_term::pty_fill ()
766{ 726{
767 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 727 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
768 728
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 729 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 730 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 731 cmdbuf_endp = cmdbuf_ptr + n;
772 732
773 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
774 734
775 if (n > 0) 735 if (n > 0)
776 { 736 {
777 cmdbuf_endp += n; 737 cmdbuf_endp += n;
778 return true; 738 return true;
779 } 739 }
780 else if (n < 0 && errno != EAGAIN) 740 else if (n < 0 && errno != EAGAIN)
781 destroy (); 741 destroy ();
782 742
783 return false; 743 return false;
784} 744}
785 745
786void 746void
787rxvt_term::pty_cb (io_watcher &w, short revents) 747rxvt_term::pty_cb (io_watcher &w, short revents)
… …
804 seen_input = 1; 764 seen_input = 1;
805 /* once we know the shell is running, send the screen size. Again! */ 765 /* once we know the shell is running, send the screen size. Again! */
806 tt_winch (); 766 tt_winch ();
807 } 767 }
808 768
769 if (cmd_parse ())
770 break;
771 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
809 uint32_t ch = NOCHAR; 779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
810 798
811 for (;;) 799 for (;;)
812 { 800 {
813 if (ch == NOCHAR)
814 ch = next_char (); 801 ch = next_char ();
815 802
816 if (ch == NOCHAR) // TODO: improve 803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
817 break; 804 break;
818 805 else
819 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
820 { 806 {
821 /* Read a text string from the input buffer */
822 uint32_t buf[BUFSIZ];
823 bool refreshnow = false;
824 int nlines = 0;
825 uint32_t *str = buf;
826
827 *str++ = ch; 807 *str++ = ch;
828 808
829 for (;;) 809 if (ch == '\n')
830 { 810 {
831 ch = next_char ();
832
833 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
834 break;
835 else 811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
836 { 816 {
837 *str++ = ch;
838
839 if (ch == '\n')
840 {
841 nlines++;
842 refresh_count++;
843
844 if (!(Options & Opt_jumpScroll)
845 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
846 {
847 refreshnow = true; 817 refreshnow = true;
848 flag = false; 818 flag = false;
849 ch = NOCHAR;
850 break;
851 }
852 }
853
854 if (str >= buf + BUFSIZ)
855 {
856 ch = NOCHAR; 819 ch = NOCHAR;
857 break; 820 break;
858 } 821 }
822
823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
824 if (nlines >= TermWin.nrow - 1)
825 {
826 scr_add_lines (buf, nlines, str - buf);
827 nlines = 0;
828 str = buf;
859 } 829 }
860 } 830 }
861 831
862 rxvt_scr_add_lines (this, buf, nlines, str - buf); 832 if (str >= buf + BUFSIZ)
863
864 /*
865 * If there have been a lot of new lines, then update the screen
866 * What the heck I'll cheat and only refresh less than every page-full.
867 * the number of pages between refreshes is refresh_limit, which
868 * is incremented here because we must be doing flat-out scrolling.
869 *
870 * refreshing should be correct for small scrolls, because of the
871 * time-out
872 */
873 if (refreshnow)
874 { 833 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 834 ch = NOCHAR;
876 refresh_limit++; 835 break;
877
878 rxvt_scr_refresh (this, refresh_type);
879 } 836 }
880
881 }
882 else
883 {
884 switch (ch)
885 {
886 default:
887 rxvt_process_nonprinting (this, ch);
888 break;
889 case C0_ESC: /* escape char */
890 rxvt_process_escape_seq (this);
891 break;
892 /*case 0x9b: */ /* CSI */
893 /* rxvt_process_csi_seq (this); */
894 }
895
896 ch = NOCHAR;
897 } 837 }
898 } 838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
899 } 861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
900 } 876 }
877
878 return flag;
901} 879}
902 880
903// read the next character, currently handles UTF-8 881// read the next character, currently handles UTF-8
904// will probably handle all sorts of other stuff in the future 882// will probably handle all sorts of other stuff in the future
905uint32_t 883uint32_t
906rxvt_term::next_char () 884rxvt_term::next_char ()
907{ 885{
908 struct mbstate &s = mbstate;
909
910 while (cmdbuf_ptr < cmdbuf_endp) 886 while (cmdbuf_ptr < cmdbuf_endp)
911 { 887 {
912 uint8_t ch = *cmdbuf_ptr; 888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
913 889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
914 if (s.cnt)
915 {
916 if ((ch & 0xc0) == 0x80)
917 {
918 cmdbuf_ptr++; 890 || !*cmdbuf_ptr)
891 return *cmdbuf_ptr++;
919 892
920 /* continuation */ 893 wchar_t wc;
921 s.reg = (s.reg << 6) | (ch & 0x7f); 894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
922 895
923 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ 896 if (len == (size_t)-2)
924 return s.reg;
925
926 continue;
927 }
928 else
929 {
930 s.cnt = 0;
931 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
932 }
933 } 897 {
934 898 // the mbstate stores incomplete sequences. didn't know this :/
935 if ((ch & 0xc0) == 0xc0) 899 cmdbuf_ptr = cmdbuf_endp;
900 break;
936 { 901 }
902
903 if (len == (size_t)-1)
904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
905
906 // assume wchar == unicode
937 cmdbuf_ptr++; 907 cmdbuf_ptr += len;
938
939 /* first byte */
940 s.orig = ch; /* for broken encodings */
941 s.reg = ch;
942 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
943 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
944 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
945 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
946 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
947 }
948 else
949 {
950 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
951 return ch; 908 return wc;
952 }
953 } 909 }
954 910
955 return NOCHAR; 911 return NOCHAR;
956} 912}
957 913
958/* rxvt_cmd_getc() - Return next input character */ 914/* rxvt_cmd_getc () - Return next input character */
959/* 915/*
960 * Return the next input character after first passing any keyboard input 916 * Return the next input character after first passing any keyboard input
961 * to the command. 917 * to the command.
962 */ 918 */
963/* INTPROTO */
964uint32_t 919uint32_t
965rxvt_cmd_getc(pR) 920rxvt_term::cmd_getc ()
966{ 921{
967 for (;;) 922 for (;;)
968 { 923 {
969 uint32_t c = R->next_char (); 924 uint32_t c = next_char ();
970 if (c != NOCHAR) 925 if (c != NOCHAR)
971 return c; 926 return c;
972 927
973 // incomplete sequences should occur rarely, still, a better solution 928 // incomplete sequences should occur rarely, still, a better solution
974 // would be preferred. either setjmp/longjmp or better design. 929 // would be preferred. either setjmp/longjmp or better design.
975 fcntl (R->cmd_fd, F_SETFL, 0); 930 fcntl (cmd_fd, F_SETFL, 0);
976 R->pty_fill (); 931 pty_fill ();
977 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
978 }
979
980#if 0
981#define TIMEOUT_USEC 5000
982 fd_set readfds;
983 int quick_timeout, select_res;
984 int want_motion_time, want_keypress_time;
985 struct timeval value;
986#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
987 struct timeval tp;
988#endif
989
990 for (;;) {
991 /* loop until we can return something */
992
993 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
994 R->tt_write(NULL, 0);
995
996#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
997 if (R->mouse_slip_wheel_speed) {
998 quick_timeout = 1;
999 if (!R->mouse_slip_wheel_delay--
1000 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
1001 abs(R->mouse_slip_wheel_speed))) {
1002 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1003 R->refresh_type |= SMOOTH_REFRESH;
1004 R->want_refresh = 1;
1005 } 933 }
1006 }
1007#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
1008#ifdef SELECTION_SCROLLING
1009 if (R->pending_scroll_selection) {
1010 quick_timeout = 1;
1011 if (!R->scroll_selection_delay--
1012 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1013 R->scroll_selection_lines)) {
1014 rxvt_selection_extend(aR_ R->selection_save_x,
1015 R->selection_save_y, R->selection_save_state);
1016 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1017 R->refresh_type |= SMOOTH_REFRESH;
1018 R->want_refresh = 1;
1019 }
1020 }
1021#endif
1022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1023 if (scrollbar_isUp() || scrollbar_isDn()) {
1024 quick_timeout = 1;
1025 if (!R->scroll_arrow_delay--
1026 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1027 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1028 R->refresh_type |= SMOOTH_REFRESH;
1029 R->want_refresh = 1;
1030 }
1031 }
1032#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1033
1034#ifdef TRANSPARENT
1035 quick_timeout |= R->want_full_refresh;
1036#endif
1037#endif
1038} 934}
1039 935
936#ifdef POINTER_BLANK
1040void 937void
1041rxvt_term::pointer_unblank () 938rxvt_term::pointer_unblank ()
1042{ 939{
1043 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 940 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1044 recolour_cursor (); 941 recolour_cursor ();
1045 942
1046#ifdef POINTER_BLANK
1047 hidden_pointer = 0; 943 hidden_pointer = 0;
1048 944
1049 if (Options & Opt_pointerBlank) 945 if (Options & Opt_pointerBlank)
1050 pointer_ev.start (NOW + pointerBlankDelay); 946 pointer_ev.start (NOW + pointerBlankDelay);
1051#endif
1052} 947}
1053 948
1054#ifdef POINTER_BLANK
1055void 949void
1056rxvt_term::pointer_blank () 950rxvt_term::pointer_blank ()
1057{ 951{
1058 pointer_ev.stop ();
1059
1060 if (!(Options & Opt_pointerBlank)) 952 if (! (Options & Opt_pointerBlank))
1061 return; 953 return;
1062 954
1063 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 955 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1064 XFlush (Xdisplay); 956 XFlush (display->display);
1065 957
1066 hidden_pointer = 1; 958 hidden_pointer = 1;
1067} 959}
1068 960
1069void 961void
… …
1074 966
1075 pointer_blank (); 967 pointer_blank ();
1076} 968}
1077#endif 969#endif
1078 970
1079/* INTPROTO */
1080void 971void
1081rxvt_mouse_report(pR_ const XButtonEvent *ev) 972rxvt_term::mouse_report (XButtonEvent &ev)
1082{ 973{
1083 int button_number, key_state = 0; 974 int button_number, key_state = 0;
1084 int x, y; 975 int x, y;
1085 976
1086 x = ev->x; 977 x = ev.x;
1087 y = ev->y; 978 y = ev.y;
1088 rxvt_pixel_position(aR_ &x, &y); 979 pixel_position (&x, &y);
1089 980
1090 if (R->MEvent.button == AnyButton) { 981 if (MEvent.button == AnyButton)
982 {
1091 button_number = 3; 983 button_number = 3;
1092 } else { 984 }
985 else
986 {
1093 button_number = R->MEvent.button - Button1; 987 button_number = MEvent.button - Button1;
1094 /* add 0x3D for wheel events, like xterm does */ 988 /* add 0x3D for wheel events, like xterm does */
1095 if (button_number >= 3) 989 if (button_number >= 3)
1096 button_number += (64 - 3); 990 button_number += (64 - 3);
1097 } 991 }
1098 992
1099 if (R->PrivateModes & PrivMode_MouseX10) { 993 if (PrivateModes & PrivMode_MouseX10)
994 {
1100 /* 995 /*
1101 * do not report ButtonRelease 996 * do not report ButtonRelease
1102 * no state info allowed 997 * no state info allowed
1103 */ 998 */
1104 key_state = 0; 999 key_state = 0;
1105 if (button_number == 3) 1000 if (button_number == 3)
1106 return; 1001 return;
1107 } else { 1002 }
1003 else
1004 {
1108 /* XTerm mouse reporting needs these values: 1005 /* XTerm mouse reporting needs these values:
1109 * 4 = Shift 1006 * 4 = Shift
1110 * 8 = Meta 1007 * 8 = Meta
1111 * 16 = Control 1008 * 16 = Control
1112 * plus will add in our own Double-Click reporting 1009 * plus will add in our own Double-Click reporting
1113 * 32 = Double Click 1010 * 32 = Double Click
1114 */ 1011 */
1115 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1012 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1116 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1013 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1117 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1014 + ((MEvent.state & ControlMask) ? 16 : 0);
1118#ifdef MOUSE_REPORT_DOUBLECLICK 1015#ifdef MOUSE_REPORT_DOUBLECLICK
1119 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1016 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1120#endif 1017#endif
1018
1121 } 1019 }
1122 1020
1123#ifdef DEBUG_MOUSEREPORT 1021#ifdef DEBUG_MOUSEREPORT
1124 fprintf(stderr, "Mouse ["); 1022 fprintf (stderr, "Mouse [");
1125 if (key_state & 16) 1023 if (key_state & 16)
1126 fputc('C', stderr); 1024 fputc ('C', stderr);
1127 if (key_state & 4) 1025 if (key_state & 4)
1128 fputc('S', stderr); 1026 fputc ('S', stderr);
1129 if (key_state & 8) 1027 if (key_state & 8)
1130 fputc('A', stderr); 1028 fputc ('A', stderr);
1131 if (key_state & 32) 1029 if (key_state & 32)
1132 fputc('2', stderr); 1030 fputc ('2', stderr);
1133 fprintf(stderr, "]: <%d>, %d/%d\n", 1031 fprintf (stderr, "]: <%d>, %d/%d\n",
1134 button_number, 1032 button_number,
1135 x + 1, 1033 x + 1,
1136 y + 1); 1034 y + 1);
1137#else 1035#else
1138 R->tt_printf("\033[M%c%c%c", 1036 tt_printf ("\033[M%c%c%c",
1139 (32 + button_number + key_state), 1037 (32 + button_number + key_state),
1140 (32 + x + 1), 1038 (32 + x + 1),
1141 (32 + y + 1)); 1039 (32 + y + 1));
1142#endif 1040#endif
1143} 1041}
1144 1042
1145#ifdef USING_W11LIB 1043#ifdef USING_W11LIB
1146/* EXTPROTO */
1147void 1044void
1148rxvt_W11_process_x_event(XEvent *ev) 1045rxvt_W11_process_x_event (XEvent *ev)
1149{ 1046{
1150 rxvt_t *r = rxvt_get_r(); 1047 rxvt_t *r = rxvt_get_r ();
1151 1048
1152 rxvt_process_x_event(aR_ ev); 1049 x_cb (*ev);
1153} 1050}
1154#endif 1051#endif
1155 1052
1156/*{{{ process an X event */ 1053/*{{{ process an X event */
1157/* INTPROTO */
1158void 1054void
1159rxvt_process_x_event(pR_ XEvent *ev) 1055rxvt_term::x_cb (XEvent &ev)
1160{ 1056{
1161 int i, want_timeout; 1057 SET_R (this);
1058 SET_LOCALE (locale);
1059
1060#if defined(CURSOR_BLINK)
1061 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1062 {
1063 if (hidden_cursor)
1064 {
1065 hidden_cursor = 0;
1066 want_refresh = 1;
1067 }
1068
1069 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1070 }
1071#endif
1072
1073#if defined(POINTER_BLANK)
1074 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1075 {
1076 if (ev.type == MotionNotify
1077 || ev.type == ButtonPress
1078 || ev.type == ButtonRelease)
1079 if (hidden_pointer)
1080 pointer_unblank ();
1081
1082 if (ev.type == KeyPress && hidden_pointer == 0)
1083 pointer_blank ();
1084 }
1085#endif
1086
1087#ifdef USE_XIM
1088 if (XFilterEvent (&ev, None))
1089 return;
1090#endif
1091
1162 Window unused_root, unused_child; 1092 Window unused_root, unused_child;
1163 int unused_root_x, unused_root_y; 1093 int unused_root_x, unused_root_y;
1164 unsigned int unused_mask; 1094 unsigned int unused_mask;
1165 1095
1166#ifdef DEBUG_X 1096#ifdef DEBUG_X
1167 const char *const eventnames[] = 1097 const char *const eventnames[] =
1168 { /* mason - this matches my system */ 1098 { /* mason - this matches my system */
1169 "", 1099 "",
1170 "", 1100 "",
1171 "KeyPress", 1101 "KeyPress",
1172 "KeyRelease", 1102 "KeyRelease",
1173 "ButtonPress", 1103 "ButtonPress",
1174 "ButtonRelease", 1104 "ButtonRelease",
1175 "MotionNotify", 1105 "MotionNotify",
1176 "EnterNotify", 1106 "EnterNotify",
1177 "LeaveNotify", 1107 "LeaveNotify",
1178 "FocusIn", 1108 "FocusIn",
1179 "FocusOut", 1109 "FocusOut",
1180 "KeymapNotify", 1110 "KeymapNotify",
1181 "Expose", 1111 "Expose",
1182 "GraphicsExpose", 1112 "GraphicsExpose",
1183 "NoExpose", 1113 "NoExpose",
1184 "VisibilityNotify", 1114 "VisibilityNotify",
1185 "CreateNotify", 1115 "CreateNotify",
1186 "DestroyNotify", 1116 "DestroyNotify",
1187 "UnmapNotify", 1117 "UnmapNotify",
1188 "MapNotify", 1118 "MapNotify",
1189 "MapRequest", 1119 "MapRequest",
1190 "ReparentNotify", 1120 "ReparentNotify",
1191 "ConfigureNotify", 1121 "ConfigureNotify",
1192 "ConfigureRequest", 1122 "ConfigureRequest",
1193 "GravityNotify", 1123 "GravityNotify",
1194 "ResizeRequest", 1124 "ResizeRequest",
1195 "CirculateNotify", 1125 "CirculateNotify",
1196 "CirculateRequest", 1126 "CirculateRequest",
1197 "PropertyNotify", 1127 "PropertyNotify",
1198 "SelectionClear", 1128 "SelectionClear",
1199 "SelectionRequest", 1129 "SelectionRequest",
1200 "SelectionNotify", 1130 "SelectionNotify",
1201 "ColormapNotify", 1131 "ColormapNotify",
1202 "ClientMessage", 1132 "ClientMessage",
1203 "MappingNotify" 1133 "MappingNotify"
1204 }; 1134 };
1205#endif 1135#endif
1206 1136
1207#ifdef DEBUG_X 1137#ifdef DEBUG_X
1208 struct timeval tp; 1138 struct timeval tp;
1209 struct tm *ltt; 1139 struct tm *ltt;
1210 (void)gettimeofday(&tp, NULL); 1140 (void)gettimeofday (&tp, NULL);
1211 ltt = localtime(&(tp.tv_sec)); 1141 ltt = localtime (& (tp.tv_sec));
1212 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1142 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));
1213#endif 1143#endif
1214 1144
1215 switch (ev->type) { 1145 switch (ev.type)
1146 {
1216 case KeyPress: 1147 case KeyPress:
1217 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1148 lookup_key (ev.xkey);
1218 break; 1149 break;
1219 1150
1220#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1221 case KeyRelease: 1152 case KeyRelease:
1222 { 1153 {
1223 if (!(ev->xkey.state & ControlMask)) 1154 if (! (ev.xkey.state & ControlMask))
1224 R->mouse_slip_wheel_speed = 0; 1155 mouse_slip_wheel_speed = 0;
1225 else { 1156 else
1226 KeySym ks; 1157 {
1227 1158 KeySym ks;
1159
1228 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1229 if (ks == XK_Control_L || ks == XK_Control_R) 1161 if (ks == XK_Control_L || ks == XK_Control_R)
1230 R->mouse_slip_wheel_speed = 0; 1162 mouse_slip_wheel_speed = 0;
1231 } 1163 }
1232 break; 1164 break;
1233 } 1165 }
1234#endif 1166#endif
1235 1167
1236 case ButtonPress: 1168 case ButtonPress:
1237 rxvt_button_press(aR_ (XButtonEvent *)ev); 1169 button_press (ev.xbutton);
1238 break; 1170 break;
1239 1171
1240 case ButtonRelease: 1172 case ButtonRelease:
1241 rxvt_button_release(aR_ (XButtonEvent *)ev); 1173 button_release (ev.xbutton);
1242 break; 1174 break;
1243 1175
1244 case ClientMessage: 1176 case ClientMessage:
1245 if (ev->xclient.format == 32 1177 if (ev.xclient.format == 32
1246 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1178 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1247 R->destroy (); 1179 destroy ();
1248#ifdef OFFIX_DND 1180#ifdef OFFIX_DND
1249 /* OffiX Dnd (drag 'n' drop) protocol */ 1181 /* OffiX Dnd (drag 'n' drop) protocol */
1250 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1182 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1251 && (ev->xclient.data.l[0] == DndFile 1183 && (ev.xclient.data.l[0] == DndFile
1252 || ev->xclient.data.l[0] == DndDir 1184 || ev.xclient.data.l[0] == DndDir
1253 || ev->xclient.data.l[0] == DndLink)) { 1185 || ev.xclient.data.l[0] == DndLink))
1254 /* Get Dnd data */ 1186 {
1187 /* Get Dnd data */
1255 Atom ActualType; 1188 Atom ActualType;
1256 int ActualFormat; 1189 int ActualFormat;
1257 unsigned char *data; 1190 unsigned char *data;
1258 unsigned long Size, RemainingBytes; 1191 unsigned long Size, RemainingBytes;
1259 1192
1260 XGetWindowProperty(R->Xdisplay, Xroot, 1193 XGetWindowProperty (display->display, display->root,
1261 R->xa[XA_DNDSELECTION], 1194 xa[XA_DNDSELECTION],
1262 0L, 1000000L, 1195 0L, 1000000L,
1263 False, AnyPropertyType, 1196 False, AnyPropertyType,
1264 &ActualType, &ActualFormat, 1197 &ActualType, &ActualFormat,
1265 &Size, &RemainingBytes, 1198 &Size, &RemainingBytes,
1266 &data); 1199 &data);
1267 XChangeProperty(R->Xdisplay, Xroot, 1200 XChangeProperty (display->display, display->root,
1268 XA_CUT_BUFFER0, XA_STRING, 1201 XA_CUT_BUFFER0, XA_STRING,
1269 8, PropModeReplace, 1202 8, PropModeReplace,
1270 data, STRLEN(data)); 1203 data, STRLEN (data));
1271 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1204 selection_paste (display->root, XA_CUT_BUFFER0, True);
1272 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1273 } 1206 }
1274#endif /* OFFIX_DND */ 1207#endif /* OFFIX_DND */
1275 break; 1208 break;
1276 1209
1277 case MappingNotify: 1210 case MappingNotify:
1278 XRefreshKeyboardMapping(&(ev->xmapping)); 1211 XRefreshKeyboardMapping (& (ev.xmapping));
1279 break; 1212 break;
1280 1213
1281 /* 1214 /*
1282 * XXX: this is not the _current_ arrangement 1215 * XXX: this is not the _current_ arrangement
1283 * Here's my conclusion: 1216 * Here's my conclusion:
1284 * If the window is completely unobscured, use bitblt's 1217 * If the window is completely unobscured, use bitblt's
1285 * to scroll. Even then, they're only used when doing partial 1218 * to scroll. Even then, they're only used when doing partial
1286 * screen scrolling. When partially obscured, we have to fill 1219 * screen scrolling. When partially obscured, we have to fill
1287 * in the GraphicsExpose parts, which means that after each refresh, 1220 * in the GraphicsExpose parts, which means that after each refresh,
1288 * we need to wait for the graphics expose or Noexpose events, 1221 * we need to wait for the graphics expose or Noexpose events,
1289 * which ought to make things real slow! 1222 * which ought to make things real slow!
1290 */ 1223 */
1291 case VisibilityNotify: 1224 case VisibilityNotify:
1292 switch (ev->xvisibility.state) 1225 switch (ev.xvisibility.state)
1293 { 1226 {
1294 case VisibilityUnobscured: 1227 case VisibilityUnobscured:
1295 R->refresh_type = FAST_REFRESH; 1228 refresh_type = FAST_REFRESH;
1296 break; 1229 break;
1297 case VisibilityPartiallyObscured: 1230 case VisibilityPartiallyObscured:
1298 R->refresh_type = SLOW_REFRESH; 1231 refresh_type = SLOW_REFRESH;
1299 break; 1232 break;
1300 default: 1233 default:
1301 R->refresh_type = NO_REFRESH; 1234 refresh_type = NO_REFRESH;
1302 break; 1235 break;
1303 } 1236 }
1304 break; 1237 break;
1305 1238
1306 case FocusIn: 1239 case FocusIn:
1307 if (!R->TermWin.focus) { 1240 if (!TermWin.focus)
1308 R->TermWin.focus = 1; 1241 {
1309 R->want_refresh = 1; 1242 TermWin.focus = 1;
1243 want_refresh = 1;
1310#ifdef USE_XIM 1244#ifdef USE_XIM
1311 if (R->Input_Context != NULL) 1245 if (Input_Context != NULL)
1312 XSetICFocus(R->Input_Context); 1246 XSetICFocus (Input_Context);
1313#endif 1247#endif
1314#ifdef CURSOR_BLINK 1248#ifdef CURSOR_BLINK
1315 if (R->Options & Opt_cursorBlink) 1249 if (Options & Opt_cursorBlink)
1316 R->blink_ev.start (NOW + BLINK_INTERVAL); 1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1317#endif 1251#endif
1318 }
1319 break;
1320 1252
1253 }
1254 break;
1255
1321 case FocusOut: 1256 case FocusOut:
1322 if (R->TermWin.focus) { 1257 if (TermWin.focus)
1323 R->TermWin.focus = 0; 1258 {
1324 R->want_refresh = 1; 1259 TermWin.focus = 0;
1260 want_refresh = 1;
1325#ifdef USE_XIM 1261#ifdef USE_XIM
1326 if (R->Input_Context != NULL) 1262 if (Input_Context != NULL)
1327 XUnsetICFocus(R->Input_Context); 1263 XUnsetICFocus (Input_Context);
1328#endif 1264#endif
1329#ifdef CURSOR_BLINK 1265#ifdef CURSOR_BLINK
1330 if (R->Options & Opt_cursorBlink) 1266 if (Options & Opt_cursorBlink)
1331 R->blink_ev.stop (); 1267 cursor_blink_ev.stop ();
1332 R->hidden_cursor = 0; 1268 hidden_cursor = 0;
1333#endif 1269#endif
1334 }
1335 break;
1336 1270
1271 }
1272 break;
1273
1337 case ConfigureNotify: 1274 case ConfigureNotify:
1338 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1275 if (ev.xconfigure.window == TermWin.parent[0])
1339 int height, width; 1276 {
1277 int height, width;
1340 1278
1279 do
1341 do { /* Wrap lots of configures into one */ 1280 { /* Wrap lots of configures into one */
1342 width = ev->xconfigure.width; 1281 width = ev.xconfigure.width;
1343 height = ev->xconfigure.height; 1282 height = ev.xconfigure.height;
1344 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1345 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1284 }
1346 ConfigureNotify, ev)); 1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286
1347 if (R->szHint.width != width || R->szHint.height != height) { 1287 if (szHint.width != width || szHint.height != height)
1288 {
1348 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1349 rxvt_resize_all_windows(aR_ (unsigned int)width, 1290 resize_all_windows (width, height, 1);
1350 (unsigned int)height, 1); 1291 }
1351 }
1352#ifdef DEBUG_SIZE 1292#ifdef DEBUG_SIZE
1353 else { 1293 else
1294 {
1354 D_SIZE((stderr, "Size: Not resizing")); 1295 D_SIZE ((stderr, "Size: Not resizing"));
1355 } 1296 }
1356#endif 1297#endif
1357#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1358 if (R->Options & Opt_transparent) { 1299 if (Options & Opt_transparent)
1359 rxvt_check_our_parents(aR); 1300 {
1360 if (R->am_transparent) 1301 check_our_parents ();
1361 R->want_full_refresh = 1; 1302 if (am_transparent)
1362 } 1303 want_full_refresh = 1;
1304 }
1363#endif 1305#endif
1364 }
1365 break;
1366 1306
1307 }
1308 break;
1309
1367 case SelectionClear: 1310 case SelectionClear:
1368 rxvt_selection_clear(aR); 1311 display->set_selection_owner (0);
1369 break; 1312 break;
1370 1313
1371 case SelectionNotify: 1314 case SelectionNotify:
1372 if (R->selection_wait == Sel_normal) 1315 if (selection_wait == Sel_normal)
1373 rxvt_selection_paste(aR_ ev->xselection.requestor, 1316 selection_paste (ev.xselection.requestor,
1374 ev->xselection.property, True); 1317 ev.xselection.property, True);
1375 break; 1318 break;
1376 1319
1377 case SelectionRequest: 1320 case SelectionRequest:
1378 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1321 selection_send (ev.xselectionrequest);
1379 break; 1322 break;
1380 1323
1381 case UnmapNotify: 1324 case UnmapNotify:
1382 R->TermWin.mapped = 0; 1325 TermWin.mapped = 0;
1383 break; 1326#ifdef TEXT_BLINK
1327 text_blink_ev.stop ();
1328#endif
1329 break;
1384 1330
1385 case MapNotify: 1331 case MapNotify:
1386 R->TermWin.mapped = 1; 1332 TermWin.mapped = 1;
1387 break; 1333#ifdef TEXT_BLINK
1388 1334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389 case PropertyNotify: 1335#endif
1390 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1391 if (ev->xproperty.state == PropertyNewValue)
1392 rxvt_selection_property(aR_ ev->xproperty.window,
1393 ev->xproperty.atom);
1394 break; 1336 break;
1395 } 1337
1396#ifdef TRANSPARENT 1338#ifdef TRANSPARENT
1397 /*
1398 * if user used some Esetroot compatible prog to set the root bg,
1399 * use the property to determine the pixmap. We use it later on.
1400 */
1401 if (R->xa[XA_XROOTPMAPID] == 0)
1402 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1403 "_XROOTPMAP_ID", False);
1404 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1405 break;
1406 /* FALLTHROUGH */
1407 case ReparentNotify: 1339 case ReparentNotify:
1408 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1340 rootwin_cb (ev);
1409 if (R->am_transparent) 1341 break;
1410 R->want_full_refresh = 1;
1411 }
1412#endif /* TRANSPARENT */ 1342#endif /* TRANSPARENT */
1413 break;
1414 1343
1415 case GraphicsExpose: 1344 case GraphicsExpose:
1416 case Expose: 1345 case Expose:
1417 if (ev->xany.window == R->TermWin.vt) { 1346 if (ev.xany.window == TermWin.vt)
1347 {
1418#ifdef NO_SLOW_LINK_SUPPORT 1348#ifdef NO_SLOW_LINK_SUPPORT
1419 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1349 scr_expose (ev.xexpose.x, ev.xexpose.y,
1420 ev->xexpose.width, ev->xexpose.height, False); 1350 ev.xexpose.width, ev.xexpose.height, False);
1421#else 1351#else
1422 // don't understand this, so commented it out 1352 // don't understand this, so commented it out
1423 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1353 scr_expose (ev.xexpose.x, ev.xexpose.y,
1424 ev->xexpose.width, ev->xexpose.height, False); 1354 ev.xexpose.width, ev.xexpose.height, False);
1425 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1355 //scr_expose (ev.xexpose.x, 0,
1426 // ev->xexpose.width, R->TermWin.height, False); 1356 // ev.xexpose.width, TermWin.height, False);
1427#endif 1357#endif
1428 R->want_refresh = 1; 1358 want_refresh = 1;
1429 } else { 1359 }
1430 XEvent unused_xevent; 1360 else
1361 {
1362 XEvent unused_event;
1431 1363
1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1433 Expose, 1365 Expose,
1434 &unused_xevent)) ; 1366 &unused_event)) ;
1435 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1436 GraphicsExpose, 1368 GraphicsExpose,
1437 &unused_xevent)) ; 1369 &unused_event)) ;
1438 if (isScrollbarWindow(ev->xany.window)) { 1370 if (isScrollbarWindow (ev.xany.window))
1439 R->scrollBar.setIdle(); 1371 {
1440 rxvt_scrollbar_show(aR_ 0); 1372 scrollBar.setIdle ();
1441 } 1373 scrollbar_show (0);
1374 }
1442#ifdef MENUBAR 1375#ifdef MENUBAR
1443 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1444 rxvt_menubar_expose(aR); 1377 menubar_expose ();
1445#endif 1378#endif
1446#ifdef RXVT_GRAPHICS 1379 }
1447 rxvt_Gr_expose(aR_ ev->xany.window); 1380 break;
1448#endif
1449 }
1450 break;
1451 1381
1452 case MotionNotify: 1382 case MotionNotify:
1453#ifdef POINTER_BLANK 1383#ifdef POINTER_BLANK
1454 if (R->hidden_pointer) 1384 if (hidden_pointer)
1455 R->pointer_unblank (); 1385 pointer_unblank ();
1456#endif 1386#endif
1457#if MENUBAR 1387#if MENUBAR
1458 if (isMenuBarWindow(ev->xany.window)) { 1388 if (isMenuBarWindow (ev.xany.window))
1459 rxvt_menubar_control(aR_ &(ev->xbutton)); 1389 {
1460 break; 1390 menubar_control (ev.xbutton);
1461 } 1391 break;
1392 }
1462#endif 1393#endif
1463 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1464 break; 1395 break;
1465 1396
1466 if (ev->xany.window == R->TermWin.vt) { 1397 if (ev.xany.window == TermWin.vt)
1398 {
1467 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1468 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1400 {
1469 MotionNotify, ev)) ; 1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1470 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1402 ;
1471 &unused_root, &unused_child, 1403
1472 &unused_root_x, &unused_root_y, 1404 XQueryPointer (display->display, TermWin.vt,
1473 &(ev->xbutton.x), &(ev->xbutton.y), 1405 &unused_root, &unused_child,
1474 &unused_mask); 1406 &unused_root_x, &unused_root_y,
1407 & (ev.xbutton.x), & (ev.xbutton.y),
1408 &unused_mask);
1475#ifdef MOUSE_THRESHOLD 1409#ifdef MOUSE_THRESHOLD
1476 /* deal with a `jumpy' mouse */ 1410 /* deal with a `jumpy' mouse */
1477 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1412 {
1478#endif 1413#endif
1479 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1480 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1415 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1481#ifdef SELECTION_SCROLLING 1416#ifdef SELECTION_SCROLLING
1482 if (ev->xbutton.y<R->TermWin.int_bwidth || 1417 if (ev.xbutton.y < TermWin.int_bwidth
1483 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1484 int dist; 1419 {
1485 1420 int dist;
1486 R->pending_scroll_selection=1; 1421
1487 1422 pending_scroll_selection=1;
1423
1488 /* don't clobber the current delay if we are 1424 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1425 * already in the middle of scrolling.
1490 */ 1426 */
1491 if (R->scroll_selection_delay<=0) 1427 if (scroll_selection_delay<=0)
1492 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1493 1429
1494 /* save the event params so we can highlight 1430 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1431 * the selection in the pending-scroll loop
1496 */ 1432 */
1497 R->selection_save_x=ev->xbutton.x; 1433 selection_save_x=ev.xbutton.x;
1498 R->selection_save_y=ev->xbutton.y; 1434 selection_save_y=ev.xbutton.y;
1499 R->selection_save_state= 1435 selection_save_state=
1500 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1436 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501 1437
1502 /* calc number of lines to scroll */ 1438 /* calc number of lines to scroll */
1503 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1439 if (ev.xbutton.y<TermWin.int_bwidth)
1504 R->scroll_selection_dir = UP; 1440 {
1505 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1441 scroll_selection_dir = UP;
1506 } 1442 dist = TermWin.int_bwidth - ev.xbutton.y;
1507 else { 1443 }
1508 R->scroll_selection_dir = DN; 1444 else
1509 dist = ev->xbutton.y - 1445 {
1510 (R->TermWin.int_bwidth + R->TermWin.height); 1446 scroll_selection_dir = DN;
1511 } 1447 dist = ev.xbutton.y -
1512 R->scroll_selection_lines=(Pixel2Height(dist)/ 1448 (TermWin.int_bwidth + TermWin.height);
1513 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1449 }
1514 MIN_IT(R->scroll_selection_lines, 1450 scroll_selection_lines= (Pixel2Height (dist)/
1515 SELECTION_SCROLL_MAX_LINES); 1451 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 } 1452 MIN_IT (scroll_selection_lines,
1517 else { 1453 SELECTION_SCROLL_MAX_LINES);
1454 }
1455 else
1456 {
1518 /* we are within the text window, so we 1457 /* we are within the text window, so we
1519 * shouldn't be scrolling 1458 * shouldn't be scrolling
1520 */ 1459 */
1521 R->pending_scroll_selection = 0; 1460 pending_scroll_selection = 0;
1522 } 1461 }
1523#endif 1462#endif
1524#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1525 } 1464
1465 }
1526#endif 1466#endif
1467
1468 }
1469 }
1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1471 {
1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1473 MotionNotify, &ev)) ;
1474 XQueryPointer (display->display, scrollBar.win,
1475 &unused_root, &unused_child,
1476 &unused_root_x, &unused_root_y,
1477 & (ev.xbutton.x), & (ev.xbutton.y),
1478 &unused_mask);
1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1480 scrollbar_size ());
1481 scr_refresh (refresh_type);
1482 refresh_limit = 0;
1483 scrollbar_show (1);
1484 }
1485 break;
1527 } 1486 }
1528 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1529 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1530 MotionNotify, ev)) ;
1531 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1532 &unused_root, &unused_child,
1533 &unused_root_x, &unused_root_y,
1534 &(ev->xbutton.x), &(ev->xbutton.y),
1535 &unused_mask);
1536 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1537 scrollbar_size());
1538 rxvt_scr_refresh(aR_ R->refresh_type);
1539 R->refresh_limit = 0;
1540 rxvt_scrollbar_show(aR_ 1);
1541 }
1542 break;
1543 }
1544} 1487}
1545 1488
1546/* INTPROTO */
1547void 1489void
1548rxvt_button_press(pR_ XButtonEvent *ev) 1490rxvt_term::rootwin_cb (XEvent &ev)
1549{ 1491{
1550 int reportmode = 0, clickintime; 1492 SET_R (this);
1493 SET_LOCALE (locale);
1551 1494
1552 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1495 switch (ev.type)
1553 if (!R->bypass_keystate)
1554 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1555/*
1556 * VT window processing of button press
1557 */
1558 if (ev->window == R->TermWin.vt)
1559 { 1496 {
1560#if RXVT_GRAPHICS 1497 case PropertyNotify:
1561 if (ev->subwindow != None) 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1562 rxvt_Gr_ButtonPress (ev->x, ev->y);
1563 else
1564#endif
1565 { 1499 {
1500 if (ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 break;
1503 }
1504#ifdef TRANSPARENT
1505 else
1506 {
1507 /*
1508 * if user used some Esetroot compatible prog to set the root bg,
1509 * use the property to determine the pixmap. We use it later on.
1510 */
1511 if (xa[XA_XROOTPMAPID] == 0)
1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1513
1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1515 return;
1516 }
1517
1518 /* FALLTHROUGH */
1519 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ())
1521 if (am_transparent)
1522 want_full_refresh = 1;
1523 break;
1524#endif
1525 }
1526}
1527
1528void
1529rxvt_term::button_press (XButtonEvent &ev)
1530{
1531 int reportmode = 0, clickintime;
1532
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1534 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1536 /*
1537 * VT window processing of button press
1538 */
1539 if (ev.window == TermWin.vt)
1540 {
1566 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1567 if (reportmode) 1542 if (reportmode)
1568 { 1543 {
1569 /* mouse report from vt window */ 1544 /* mouse report from vt window */
1570 /* save the xbutton state (for ButtonRelease) */ 1545 /* save the xbutton state (for ButtonRelease) */
1571 R->MEvent.state = ev->state; 1546 MEvent.state = ev.state;
1572#ifdef MOUSE_REPORT_DOUBLECLICK 1547#ifdef MOUSE_REPORT_DOUBLECLICK
1573 if (ev->button == R->MEvent.button && clickintime) 1548 if (ev.button == MEvent.button && clickintime)
1549 {
1550 /* same button, within alloted time */
1551 MEvent.clicks++;
1552 if (MEvent.clicks > 1)
1553 {
1554 /* only report double clicks */
1555 MEvent.clicks = 2;
1556 mouse_report (ev);
1557
1558 /* don't report the release */
1559 MEvent.clicks = 0;
1560 MEvent.button = AnyButton;
1561 }
1562 }
1563 else
1564 {
1565 /* different button, or time expired */
1566 MEvent.clicks = 1;
1567 MEvent.button = ev.button;
1568 mouse_report (ev);
1569 }
1570#else
1571 MEvent.button = ev.button;
1572 mouse_report (ev);
1573#endif /* MOUSE_REPORT_DOUBLECLICK */
1574
1575 }
1576 else
1577 {
1578 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0;
1580 switch (ev.button)
1581 {
1582 case Button1:
1583 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1574 { 1585 {
1575 /* same button, within alloted time */ 1586 if (MEvent.button == Button1 && clickintime)
1576 R->MEvent.clicks++; 1587 selection_rotate (ev.x, ev.y);
1577 if (R->MEvent.clicks > 1) 1588 else
1589 selection_extend (ev.x, ev.y, 1);
1578 { 1590 }
1579 /* only report double clicks */
1580 R->MEvent.clicks = 2;
1581 rxvt_mouse_report(aR_ ev);
1582
1583 /* don't report the release */
1584 R->MEvent.clicks = 0;
1585 R->MEvent.button = AnyButton;
1586 }
1587 }
1588 else 1591 else
1589 { 1592 {
1590 /* different button, or time expired */ 1593 if (MEvent.button == Button1 && clickintime)
1591 R->MEvent.clicks = 1; 1594 MEvent.clicks++;
1592 R->MEvent.button = ev->button; 1595 else
1593 rxvt_mouse_report(aR_ ev); 1596 MEvent.clicks = 1;
1594 } 1597
1598 selection_click (MEvent.clicks, ev.x, ev.y);
1599 }
1600
1601 MEvent.button = Button1;
1602 break;
1603
1604 case Button3:
1605 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y);
1607 else
1608 selection_extend (ev.x, ev.y, 1);
1609 MEvent.button = Button3;
1610 break;
1611 }
1612 }
1613 MEvent.time = ev.time;
1614 return;
1615 }
1616
1617 /*
1618 * Scrollbar window processing of button press
1619 */
1620 if (isScrollbarWindow (ev.window))
1621 {
1622 scrollBar.setIdle ();
1623 /*
1624 * Rxvt-style scrollbar:
1625 * move up if mouse is above slider
1626 * move dn if mouse is below slider
1627 *
1628 * XTerm-style scrollbar:
1629 * Move display proportional to pointer location
1630 * pointer near top -> scroll one line
1631 * pointer near bot -> scroll full page
1632 */
1633#ifndef NO_SCROLLBAR_REPORT
1634 if (reportmode)
1635 {
1636 /*
1637 * Mouse report disabled scrollbar:
1638 * arrow buttons - send up/down
1639 * click on scrollbar - send pageup/down
1640 */
1641 if ((scrollBar.style == R_SB_NEXT
1642 && scrollbarnext_upButton (ev.y))
1643 || (scrollBar.style == R_SB_RXVT
1644 && scrollbarrxvt_upButton (ev.y)))
1645 tt_printf ("\033[A");
1646 else if ((scrollBar.style == R_SB_NEXT
1647 && scrollbarnext_dnButton (ev.y))
1648 || (scrollBar.style == R_SB_RXVT
1649 && scrollbarrxvt_dnButton (ev.y)))
1650 tt_printf ("\033[B");
1651 else
1652 switch (ev.button)
1653 {
1654 case Button2:
1655 tt_printf ("\014");
1656 break;
1657 case Button1:
1658 tt_printf ("\033[6~");
1659 break;
1660 case Button3:
1661 tt_printf ("\033[5~");
1662 break;
1663 }
1664 }
1665 else
1666#endif /* NO_SCROLLBAR_REPORT */
1667
1668 {
1669 char upordown = 0;
1670
1671 if (scrollBar.style == R_SB_NEXT)
1672 {
1673 if (scrollbarnext_upButton (ev.y))
1674 upordown = -1; /* up */
1675 else if (scrollbarnext_dnButton (ev.y))
1676 upordown = 1; /* down */
1677 }
1678 else if (scrollBar.style == R_SB_RXVT)
1679 {
1680 if (scrollbarrxvt_upButton (ev.y))
1681 upordown = -1; /* up */
1682 else if (scrollbarrxvt_dnButton (ev.y))
1683 upordown = 1; /* down */
1684 }
1685 if (upordown)
1686 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1689#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 }
1698 else
1699 switch (ev.button)
1700 {
1701 case Button2:
1702 switch (scrollbar_align)
1703 {
1704 case R_SB_ALIGN_TOP:
1705 csrO = 0;
1706 break;
1707 case R_SB_ALIGN_CENTRE:
1708 csrO = (scrollBar.bot - scrollBar.top) / 2;
1709 break;
1710 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top;
1712 break;
1713 }
1714 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO,
1718 scrollbar_size ());
1719 scrollBar.setMotion ();
1720 break;
1721
1722 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1724 csrO = ev.y - scrollBar.top;
1725 /* FALLTHROUGH */
1726
1727 case Button3:
1728 if (scrollBar.style != R_SB_XTERM)
1729 {
1730 if (scrollbar_above_slider (ev.y))
1731# ifdef RXVT_SCROLL_FULL
1732 scr_page (UP, TermWin.nrow - 1);
1595#else 1733# else
1596 R->MEvent.button = ev->button; 1734 scr_page (UP, TermWin.nrow / 4);
1597 rxvt_mouse_report(aR_ ev); 1735# endif
1736 else if (scrollbar_below_slider (ev.y))
1737# ifdef RXVT_SCROLL_FULL
1738 scr_page (DN, TermWin.nrow - 1);
1739# else
1740 scr_page (DN, TermWin.nrow / 4);
1741# endif
1742 else
1743 scrollBar.setMotion ();
1744 }
1745 else
1746 {
1747 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow
1749 * scrollbar_position (ev.y)
1750 / scrollbar_size ()));
1751 }
1752 break;
1753 }
1754 }
1755 return;
1756 }
1757#if MENUBAR
1758 /*
1759 * Menubar window processing of button press
1760 */
1761 if (isMenuBarWindow (ev.window))
1762 menubar_control (ev);
1763#endif
1764}
1765
1766void
1767rxvt_term::button_release (XButtonEvent &ev)
1768{
1769 int reportmode = 0;
1770
1771 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1774
1775 if (scrollbar_isUpDn ())
1776 {
1777 scrollBar.setIdle ();
1778 scrollbar_show (0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 refresh_type &= ~SMOOTH_REFRESH;
1781#endif
1782
1783 }
1784#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0;
1786#endif
1787 if (ev.window == TermWin.vt)
1788 {
1789 if (reportmode)
1790 {
1791 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4)
1794 return;
1795#ifdef MOUSE_REPORT_DOUBLECLICK
1796 /* only report the release of 'slow' single clicks */
1797 if (MEvent.button != AnyButton
1798 && (ev.button != MEvent.button
1799 || (ev.time - MEvent.time
1800 > MULTICLICK_TIME / 2)))
1801 {
1802 MEvent.clicks = 0;
1803 MEvent.button = AnyButton;
1804 mouse_report (ev);
1805 }
1806#else /* MOUSE_REPORT_DOUBLECLICK */
1807 MEvent.button = AnyButton;
1808 mouse_report (ev);
1598#endif /* MOUSE_REPORT_DOUBLECLICK */ 1809#endif /* MOUSE_REPORT_DOUBLECLICK */
1599 }
1600 else
1601 {
1602 if (ev->button != R->MEvent.button)
1603 R->MEvent.clicks = 0;
1604 switch (ev->button)
1605 {
1606 case Button1:
1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->MEvent.clicks++;
1609 else
1610 R->MEvent.clicks = 1;
1611 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1612 R->MEvent.button = Button1;
1613 break;
1614
1615 case Button3:
1616 if (R->MEvent.button == Button3 && clickintime)
1617 rxvt_selection_rotate(aR_ ev->x, ev->y);
1618 else
1619 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1620 R->MEvent.button = Button3;
1621 break;
1622 }
1623 }
1624 R->MEvent.time = ev->time;
1625 return; 1810 return;
1626 }
1627 } 1811 }
1628
1629/*
1630 * Scrollbar window processing of button press
1631 */
1632 if (isScrollbarWindow(ev->window))
1633 {
1634 R->scrollBar.setIdle ();
1635 /*
1636 * Rxvt-style scrollbar:
1637 * move up if mouse is above slider
1638 * move dn if mouse is below slider
1639 *
1640 * XTerm-style scrollbar:
1641 * Move display proportional to pointer location
1642 * pointer near top -> scroll one line
1643 * pointer near bot -> scroll full page
1644 */
1645#ifndef NO_SCROLLBAR_REPORT
1646 if (reportmode) {
1647 /*
1648 * Mouse report disabled scrollbar:
1649 * arrow buttons - send up/down
1650 * click on scrollbar - send pageup/down
1651 */
1652 if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_upButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_upButton(ev->y)))
1656 R->tt_printf("\033[A");
1657 else if ((R->scrollBar.style == R_SB_NEXT
1658 && scrollbarnext_dnButton(ev->y))
1659 || (R->scrollBar.style == R_SB_RXVT
1660 && scrollbarrxvt_dnButton(ev->y)))
1661 R->tt_printf("\033[B");
1662 else
1663 switch (ev->button) {
1664 case Button2:
1665 R->tt_printf("\014");
1666 break;
1667 case Button1:
1668 R->tt_printf("\033[6~");
1669 break;
1670 case Button3:
1671 R->tt_printf("\033[5~");
1672 break;
1673 }
1674 }
1675 else
1676#endif /* NO_SCROLLBAR_REPORT */
1677 {
1678 char upordown = 0;
1679
1680 if (R->scrollBar.style == R_SB_NEXT) {
1681 if (scrollbarnext_upButton(ev->y))
1682 upordown = -1; /* up */
1683 else if (scrollbarnext_dnButton(ev->y))
1684 upordown = 1; /* down */
1685 } else if (R->scrollBar.style == R_SB_RXVT) {
1686 if (scrollbarrxvt_upButton(ev->y))
1687 upordown = -1; /* up */
1688 else if (scrollbarrxvt_dnButton(ev->y))
1689 upordown = 1; /* down */
1690 }
1691 if (upordown) {
1692#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1693 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1694#endif
1695 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1696 if (upordown < 0)
1697 R->scrollBar.setUp ();
1698 else
1699 R->scrollBar.setDn ();
1700 }
1701 } else
1702 switch (ev->button) {
1703 case Button2:
1704 switch (R->scrollbar_align) {
1705 case R_SB_ALIGN_TOP:
1706 R->csrO = 0;
1707 break;
1708 case R_SB_ALIGN_CENTRE:
1709 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1710 break;
1711 case R_SB_ALIGN_BOTTOM:
1712 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1713 break;
1714 }
1715 if (R->scrollBar.style == R_SB_XTERM
1716 || scrollbar_above_slider(ev->y)
1717 || scrollbar_below_slider(ev->y))
1718 rxvt_scr_move_to(aR_
1719 scrollbar_position(ev->y) - R->csrO,
1720 scrollbar_size());
1721 R->scrollBar.setMotion ();
1722 break;
1723
1724 case Button1:
1725 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1726 R->csrO = ev->y - R->scrollBar.top;
1727 /* FALLTHROUGH */
1728
1729 case Button3:
1730 if (R->scrollBar.style != R_SB_XTERM) {
1731 if (scrollbar_above_slider(ev->y))
1732# ifdef RXVT_SCROLL_FULL
1733 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1734# else
1735 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1736# endif
1737 else if (scrollbar_below_slider(ev->y))
1738# ifdef RXVT_SCROLL_FULL
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1740# else
1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1742# endif
1743 else
1744 R->scrollBar.setMotion ();
1745 } else {
1746 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1747 (R->TermWin.nrow
1748 * scrollbar_position(ev->y)
1749 / scrollbar_size()));
1750 }
1751 break;
1752 }
1753 }
1754 return;
1755 }
1756#if MENUBAR
1757 /* 1812 /*
1758 * Menubar window processing of button press
1759 */
1760 if (isMenuBarWindow(ev->window))
1761 rxvt_menubar_control(aR_ ev);
1762#endif
1763}
1764
1765/* INTPROTO */
1766void
1767rxvt_button_release(pR_ XButtonEvent *ev)
1768{
1769 int reportmode = 0;
1770
1771 R->csrO = 0; /* reset csr Offset */
1772 if (!R->bypass_keystate)
1773 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1774
1775 if (scrollbar_isUpDn()) {
1776 R->scrollBar.setIdle ();
1777 rxvt_scrollbar_show(aR_ 0);
1778#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1779 R->refresh_type &= ~SMOOTH_REFRESH;
1780#endif
1781 }
1782#ifdef SELECTION_SCROLLING
1783 R->pending_scroll_selection=0;
1784#endif
1785 if (ev->window == R->TermWin.vt)
1786 {
1787#ifdef RXVT_GRAPHICS
1788 if (ev->subwindow != None)
1789 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1790 else
1791#endif
1792 {
1793 if (reportmode)
1794 {
1795 /* mouse report from vt window */
1796 /* don't report release of wheel "buttons" */
1797 if (ev->button >= 4)
1798 return;
1799#ifdef MOUSE_REPORT_DOUBLECLICK
1800 /* only report the release of 'slow' single clicks */
1801 if (R->MEvent.button != AnyButton
1802 && (ev->button != R->MEvent.button
1803 || (ev->time - R->MEvent.time
1804 > MULTICLICK_TIME / 2)))
1805 {
1806 R->MEvent.clicks = 0;
1807 R->MEvent.button = AnyButton;
1808 rxvt_mouse_report(aR_ ev);
1809 }
1810#else /* MOUSE_REPORT_DOUBLECLICK */
1811 R->MEvent.button = AnyButton;
1812 rxvt_mouse_report(aR_ ev);
1813#endif /* MOUSE_REPORT_DOUBLECLICK */
1814 return;
1815 }
1816 /*
1817 * dumb hack to compensate for the failure of click-and-drag 1813 * dumb hack to compensate for the failure of click-and-drag
1818 * when overriding mouse reporting 1814 * when overriding mouse reporting
1819 */ 1815 */
1820 if (R->PrivateModes & PrivMode_mouse_report 1816 if (PrivateModes & PrivMode_mouse_report
1821 && R->bypass_keystate 1817 && bypass_keystate
1822 && ev->button == Button1 && R->MEvent.clicks <= 1) 1818 && ev.button == Button1 && MEvent.clicks <= 1)
1823 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1819 selection_extend (ev.x, ev.y, 0);
1824 1820
1825 switch (ev->button) { 1821 switch (ev.button)
1822 {
1826 case Button1: 1823 case Button1:
1827 case Button3: 1824 case Button3:
1828 rxvt_selection_make(aR_ ev->time); 1825 selection_make (ev.time);
1829 break; 1826 break;
1830 case Button2: 1827 case Button2:
1831 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1828 selection_request (ev.time, ev.x, ev.y);
1832 break; 1829 break;
1833#ifdef MOUSE_WHEEL 1830#ifdef MOUSE_WHEEL
1834 case Button4: 1831 case Button4:
1835 case Button5: 1832 case Button5:
1836 { 1833 {
1837 int i; 1834 int i;
1838 page_dirn v; 1835 page_dirn v;
1839 1836
1840 v = (ev->button == Button4) ? UP : DN; 1837 v = (ev.button == Button4) ? UP : DN;
1841 if (ev->state & ShiftMask) 1838 if (ev.state & ShiftMask)
1842 i = 1; 1839 i = 1;
1843 else if ((R->Options & Opt_mouseWheelScrollPage)) 1840 else if ((Options & Opt_mouseWheelScrollPage))
1844 i = R->TermWin.nrow - 1; 1841 i = TermWin.nrow - 1;
1845 else 1842 else
1846 i = 5; 1843 i = 5;
1847# ifdef MOUSE_SLIP_WHEELING 1844# ifdef MOUSE_SLIP_WHEELING
1848 if (ev->state & ControlMask) 1845 if (ev.state & ControlMask)
1849 { 1846 {
1850 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1847 mouse_slip_wheel_speed += (v ? -1 : 1);
1851 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1852 } 1849 }
1853# endif 1850# endif
1854# ifdef JUMP_MOUSE_WHEEL 1851# ifdef JUMP_MOUSE_WHEEL
1855 rxvt_scr_page(aR_ v, i); 1852 scr_page (v, i);
1856 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1853 scr_refresh (SMOOTH_REFRESH);
1857 rxvt_scrollbar_show(aR_ 1); 1854 scrollbar_show (1);
1858# else 1855# else
1859 for (; i--;) 1856 while (i--)
1860 { 1857 {
1861 rxvt_scr_page(aR_ v, 1); 1858 scr_page (v, 1);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1859 scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1860 scrollbar_show (1);
1864 } 1861 }
1865# endif 1862# endif
1866 } 1863
1867 break; 1864 }
1865 break;
1868#endif 1866#endif
1869 } 1867
1870 }
1871 } 1868 }
1869 }
1872#ifdef MENUBAR 1870#ifdef MENUBAR
1873 else if (isMenuBarWindow(ev->window)) 1871 else if (isMenuBarWindow (ev.window))
1874 rxvt_menubar_control(aR_ ev); 1872 menubar_control (ev);
1875#endif 1873#endif
1876} 1874}
1877 1875
1878 1876
1879#ifdef TRANSPARENT 1877#ifdef TRANSPARENT
1880/* 1878/*
1881 * Check our parents are still who we think they are. 1879 * Check our parents are still who we think they are.
1882 * Do transparency updates if required 1880 * Do transparency updates if required
1883 */ 1881 */
1884/* EXTPROTO */
1885int 1882int
1886rxvt_check_our_parents(pR) 1883rxvt_term::check_our_parents ()
1887{ 1884{
1888 int i, pchanged, aformat, have_pixmap, rootdepth; 1885 int i, pchanged, aformat, have_pixmap, rootdepth;
1889 unsigned long nitems, bytes_after; 1886 unsigned long nitems, bytes_after;
1890 Atom atype; 1887 Atom atype;
1891 unsigned char *prop = NULL; 1888 unsigned char *prop = NULL;
1892 Window root, oldp, *list; 1889 Window root, oldp, *list;
1893 Pixmap rootpixmap = None; 1890 Pixmap rootpixmap = None;
1894 XWindowAttributes wattr, wrootattr; 1891 XWindowAttributes wattr, wrootattr;
1895 1892
1896 pchanged = 0; 1893 pchanged = 0;
1897 1894
1898 if (!(R->Options & Opt_transparent)) 1895 if (! (Options & Opt_transparent))
1899 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1900 1897
1901 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1898 XGetWindowAttributes (display->display, display->root, &wrootattr);
1902 rootdepth = wrootattr.depth; 1899 rootdepth = wrootattr.depth;
1903 1900
1904 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1905 if (rootdepth != wattr.depth) { 1902 if (rootdepth != wattr.depth)
1903 {
1906 if (R->am_transparent) { 1904 if (am_transparent)
1905 {
1907 pchanged = 1; 1906 pchanged = 1;
1908 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1907 XSetWindowBackground (display->display, TermWin.vt,
1909 R->PixColors[Color_bg]); 1908 PixColors[Color_bg]);
1910 R->am_transparent = R->am_pixmap_trans = 0; 1909 am_transparent = am_pixmap_trans = 0;
1911 } 1910 }
1912 return pchanged; /* Don't try any more */ 1911 return pchanged; /* Don't try any more */
1913 } 1912 }
1914 1913
1915/* Get all X ops out of the queue so that our information is up-to-date. */ 1914 /* Get all X ops out of the queue so that our information is up-to-date. */
1916 XSync(R->Xdisplay, False); 1915 XSync (display->display, False);
1917 1916
1918/* 1917 /*
1919 * Make the frame window set by the window manager have 1918 * Make the frame window set by the window manager have
1920 * the root background. Some window managers put multiple nested frame 1919 * the root background. Some window managers put multiple nested frame
1921 * windows for each client, so we have to take care about that. 1920 * windows for each client, so we have to take care about that.
1922 */ 1921 */
1923 i = (R->xa[XA_XROOTPMAPID] != 0 1922 i = (xa[XA_XROOTPMAPID] != 0
1924 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1925 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1926 &nitems, &bytes_after, &prop) == Success)); 1925 &nitems, &bytes_after, &prop) == Success));
1927 if (!i || prop == NULL) 1926 if (!i || prop == NULL)
1928 have_pixmap = 0; 1927 have_pixmap = 0;
1929 else { 1928 else
1929 {
1930 have_pixmap = 1; 1930 have_pixmap = 1;
1931 rootpixmap = *((Pixmap *)prop); 1931 rootpixmap = * ((Pixmap *)prop);
1932 XFree(prop); 1932 XFree (prop);
1933 } 1933 }
1934 if (have_pixmap) { 1934 if (have_pixmap)
1935/* 1935 {
1936 /*
1936 * Copy Xroot pixmap transparency 1937 * Copy display->root pixmap transparency
1937 */ 1938 */
1938 int sx, sy, nx, ny; 1939 int sx, sy, nx, ny;
1939 unsigned int nw, nh; 1940 unsigned int nw, nh;
1940 Window cr; 1941 Window cr;
1941 XImage *image; 1942 XImage *image;
1942 GC gc; 1943 GC gc;
1943 XGCValues gcvalue; 1944 XGCValues gcvalue;
1944 1945
1945 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1946 0, 0, &sx, &sy, &cr); 1947 0, 0, &sx, &sy, &cr);
1947 nw = (unsigned int)R->szHint.width; 1948 nw = (unsigned int)szHint.width;
1948 nh = (unsigned int)R->szHint.height; 1949 nh = (unsigned int)szHint.height;
1949 nx = ny = 0; 1950 nx = ny = 0;
1950 if (sx < 0) { 1951
1952 if (sx < 0)
1953 {
1951 nw += sx; 1954 nw += sx;
1952 nx = -sx; 1955 nx = -sx;
1953 sx = 0; 1956 sx = 0;
1954 } 1957 }
1955 if (sy < 0) { 1958
1959 if (sy < 0)
1960 {
1956 nh += sy; 1961 nh += sy;
1957 ny = -sy; 1962 ny = -sy;
1958 sy = 0; 1963 sy = 0;
1959 } 1964 }
1965
1960 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1966 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1961 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1967 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1962 R->allowedxerror = -1; 1968 allowedxerror = -1;
1963 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1969 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1964 ZPixmap); 1970 ZPixmap);
1965 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1971 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1966 /* XXX: may need a delay here? */ 1972 /* XXX: may need a delay here? */
1967 R->allowedxerror = 0; 1973 allowedxerror = 0;
1968 if (image == NULL) { 1974 if (image == NULL)
1975 {
1969 if (R->am_transparent && R->am_pixmap_trans) { 1976 if (am_transparent && am_pixmap_trans)
1970 pchanged = 1; 1977 {
1978 pchanged = 1;
1979 if (TermWin.pixmap != None)
1980 {
1981 XFreePixmap (display->display, TermWin.pixmap);
1982 TermWin.pixmap = None;
1983 }
1984 }
1985 am_pixmap_trans = 0;
1986 }
1987 else
1988 {
1971 if (R->TermWin.pixmap != None) { 1989 if (TermWin.pixmap != None)
1972 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1990 XFreePixmap (display->display, TermWin.pixmap);
1973 R->TermWin.pixmap = None; 1991 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1974 } 1992 (unsigned int)szHint.width,
1993 (unsigned int)szHint.height,
1994 (unsigned int)image->depth);
1995 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1996 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1997 nx, ny, (unsigned int)image->width,
1998 (unsigned int)image->height);
1999 XFreeGC (display->display, gc);
2000 XDestroyImage (image);
2001 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2002 TermWin.pixmap);
2003 if (!am_transparent || !am_pixmap_trans)
2004 pchanged = 1;
2005 am_transparent = am_pixmap_trans = 1;
2006 }
1975 } 2007 }
1976 R->am_pixmap_trans = 0; 2008
1977 } else {
1978 if (R->TermWin.pixmap != None)
1979 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1980 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1981 (unsigned int)R->szHint.width,
1982 (unsigned int)R->szHint.height,
1983 (unsigned int)image->depth);
1984 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1985 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1986 nx, ny, (unsigned int)image->width,
1987 (unsigned int)image->height);
1988 XFreeGC(R->Xdisplay, gc);
1989 XDestroyImage(image);
1990 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1991 R->TermWin.pixmap);
1992 if (!R->am_transparent || !R->am_pixmap_trans)
1993 pchanged = 1;
1994 R->am_transparent = R->am_pixmap_trans = 1;
1995 }
1996 }
1997 if (!R->am_pixmap_trans) { 2009 if (!am_pixmap_trans)
2010 {
1998 unsigned int n; 2011 unsigned int n;
1999/* 2012 /*
2000 * InheritPixmap transparency 2013 * InheritPixmap transparency
2001 */ 2014 */
2002 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2015 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2003 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2016 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2004 i++) { 2017 i++)
2018 {
2005 oldp = R->TermWin.parent[i]; 2019 oldp = TermWin.parent[i];
2006 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2020 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2007 &R->TermWin.parent[i], &list, &n); 2021 &TermWin.parent[i], &list, &n);
2008 XFree(list); 2022 XFree (list);
2009 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2023 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2010 if (R->TermWin.parent[i] == Xroot) { 2024 if (TermWin.parent[i] == display->root)
2011 if (oldp != None) 2025 {
2012 pchanged = 1; 2026 if (oldp != None)
2013 break; 2027 pchanged = 1;
2014 } 2028 break;
2029 }
2015 if (oldp != R->TermWin.parent[i]) 2030 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2031 pchanged = 1;
2017 } 2032 }
2018 n = 0; 2033
2019 if (pchanged) { 2034 n = 0;
2035
2036 if (pchanged)
2037 {
2020 for (; n < (unsigned int)i; n++) { 2038 for (; n < (unsigned int)i; n++)
2039 {
2021 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2022 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2041 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2023 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2042 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2043 {
2024 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2044 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2025 break; 2045 break;
2026 } 2046 }
2027 } 2047 }
2028 } 2048 }
2049
2029 if (n > (int)(sizeof(R->TermWin.parent) 2050 if (n > (int) (sizeof (TermWin.parent)
2030 / sizeof(R->TermWin.parent[0]))) { 2051 / sizeof (TermWin.parent[0])))
2052 {
2031 D_X((stderr, "InheritPixmap Turning off")); 2053 D_X ((stderr, "InheritPixmap Turning off"));
2032 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2054 XSetWindowBackground (display->display, TermWin.parent[0],
2033 R->PixColors[Color_fg]); 2055 PixColors[Color_fg]);
2034 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2056 XSetWindowBackground (display->display, TermWin.vt,
2035 R->PixColors[Color_bg]); 2057 PixColors[Color_bg]);
2036 R->am_transparent = 0; 2058 am_transparent = 0;
2037 /* XXX: also turn off Opt_transparent? */ 2059 /* XXX: also turn off Opt_transparent? */
2038 } else { 2060 }
2061 else
2062 {
2039 /* wait (an arbitrary period) for the WM to do its thing 2063 /* wait (an arbitrary period) for the WM to do its thing
2040 * needed for fvwm2.2.2 (and before?) */ 2064 * needed for fvwm2.2.2 (and before?) */
2041# ifdef HAVE_NANOSLEEP 2065# ifdef HAVE_NANOSLEEP
2042 struct timespec rqt; 2066 struct timespec rqt;
2043 2067
2044 rqt.tv_sec = 1; 2068 rqt.tv_sec = 1;
2045 rqt.tv_nsec = 0; 2069 rqt.tv_nsec = 0;
2046 nanosleep(&rqt, NULL); 2070 nanosleep (&rqt, NULL);
2047# else 2071# else
2048 sleep(1); 2072 sleep (1);
2049# endif 2073# endif
2050 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2074 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2051 for (n = 0; n < (unsigned int)i; n++) 2075 for (n = 0; n < (unsigned int)i; n++)
2052 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2076 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2053 ParentRelative); 2077 ParentRelative);
2054 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2078 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2055 ParentRelative); 2079 ParentRelative);
2056 R->am_transparent = 1; 2080 am_transparent = 1;
2057 } 2081 }
2082
2058 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2083 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2059 R->TermWin.parent[i] = None; 2084 TermWin.parent[i] = None;
2060 } 2085 }
2061 return pchanged; 2086 return pchanged;
2062} 2087}
2063#endif 2088#endif
2064 2089
2065/*}}} */ 2090/*}}} */
2066 2091
2067/*{{{ print pipe */ 2092/*{{{ print pipe */
2068/*----------------------------------------------------------------------*/ 2093/*----------------------------------------------------------------------*/
2069#ifdef PRINTPIPE 2094#ifdef PRINTPIPE
2070/* EXTPROTO */ 2095FILE *
2071FILE *
2072rxvt_popen_printer(pR) 2096rxvt_term::popen_printer ()
2073{ 2097{
2074 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2098 FILE *stream = popen (rs[Rs_print_pipe], "w");
2075 2099
2076 if (stream == NULL) 2100 if (stream == NULL)
2077 rxvt_print_error("can't open printer pipe"); 2101 rxvt_print_error ("can't open printer pipe");
2078 return stream; 2102 return stream;
2079} 2103}
2080 2104
2081/* EXTPROTO */
2082int 2105int
2083rxvt_pclose_printer (FILE *stream) 2106rxvt_term::pclose_printer (FILE *stream)
2084{ 2107{
2085 fflush (stream); 2108 fflush (stream);
2086/* pclose() reported not to work on SunOS 4.1.3 */ 2109 /* pclose () reported not to work on SunOS 4.1.3 */
2087# if defined (__sun__) /* TODO: RESOLVE THIS */ 2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2088/* pclose works provided SIGCHLD handler uses waitpid */ 2111 /* pclose works provided SIGCHLD handler uses waitpid */
2089 return pclose (stream); /* return fclose (stream); */ 2112 return pclose (stream); /* return fclose (stream); */
2090# else 2113# else
2091 return pclose (stream); 2114 return pclose (stream);
2092# endif 2115# endif
2093} 2116}
2094 2117
2095/* 2118/*
2096 * simulate attached vt100 printer 2119 * simulate attached vt100 printer
2097 */ 2120 */
2098/* INTPROTO */
2099void 2121void
2100rxvt_process_print_pipe(pR) 2122rxvt_term::process_print_pipe ()
2101{ 2123{
2102 int done; 2124 int done;
2103 FILE *fd; 2125 FILE *fd;
2104 2126
2105 if ((fd = rxvt_popen_printer(aR)) == NULL) 2127 if ((fd = popen_printer ()) == NULL)
2106 return; 2128 return;
2107 2129
2108/* 2130 /*
2109 * Send all input to the printer until either ESC[4i or ESC[?4i 2131 * Send all input to the printer until either ESC[4i or ESC[?4i
2110 * is received. 2132 * is received.
2111 */ 2133 */
2112 for (done = 0; !done;) { 2134 for (done = 0; !done;)
2135 {
2113 unsigned char buf[8]; 2136 unsigned char buf[8];
2114 unsigned char ch; 2137 unsigned char ch;
2115 unsigned int i, len; 2138 unsigned int i, len;
2116 2139
2117 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2140 if ((ch = cmd_getc ()) != C0_ESC)
2141 {
2118 if (putc(ch, fd) == EOF) 2142 if (putc (ch, fd) == EOF)
2119 break; /* done = 1 */ 2143 break; /* done = 1 */
2120 } else { 2144 }
2145 else
2146 {
2121 len = 0; 2147 len = 0;
2122 buf[len++] = ch; 2148 buf[len++] = ch;
2123 2149
2124 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2150 if ((buf[len++] = cmd_getc ()) == '[')
2125 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2151 {
2126 buf[len++] = '?'; 2152 if ((ch = cmd_getc ()) == '?')
2127 ch = rxvt_cmd_getc(aR); 2153 {
2128 } 2154 buf[len++] = '?';
2155 ch = cmd_getc ();
2156 }
2129 if ((buf[len++] = ch) == '4') { 2157 if ((buf[len++] = ch) == '4')
2158 {
2130 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2159 if ((buf[len++] = cmd_getc ()) == 'i')
2131 break; /* done = 1 */ 2160 break; /* done = 1 */
2132 } 2161 }
2162 }
2163 for (i = 0; i < len; i++)
2164 if (putc (buf[i], fd) == EOF)
2165 {
2166 done = 1;
2167 break;
2168 }
2169 }
2133 } 2170 }
2134 for (i = 0; i < len; i++)
2135 if (putc(buf[i], fd) == EOF) {
2136 done = 1;
2137 break;
2138 }
2139 }
2140 }
2141 rxvt_pclose_printer(fd); 2171 pclose_printer (fd);
2142} 2172}
2143#endif /* PRINTPIPE */ 2173#endif /* PRINTPIPE */
2144/*}}} */ 2174/*}}} */
2145 2175
2146/* *INDENT-OFF* */ 2176/* *INDENT-OFF* */
2147enum { 2177enum {
2148 C1_40 = 0x40, 2178 C1_40 = 0x40,
2149 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2179 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2150 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2180 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2151 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2181 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2152 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2182 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2153}; 2183};
2154/* *INDENT-ON* */ 2184/* *INDENT-ON* */
2155 2185
2156/*{{{ process non-printing single characters */ 2186/*{{{ process non-printing single characters */
2157/* INTPROTO */
2158void 2187void
2159rxvt_process_nonprinting(pR_ unsigned char ch) 2188rxvt_term::process_nonprinting (unsigned char ch)
2160{ 2189{
2161 switch (ch) { 2190 switch (ch)
2191 {
2162 case C0_ENQ: /* terminal Status */ 2192 case C0_ENQ: /* terminal Status */
2163 if (R->rs[Rs_answerbackstring]) 2193 if (rs[Rs_answerbackstring])
2164 R->tt_write( 2194 tt_write (
2165 (const unsigned char *)R->rs[Rs_answerbackstring], 2195 (const unsigned char *)rs[Rs_answerbackstring],
2166 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2196 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2167 else 2197 else
2168 R->tt_write((unsigned char *)VT100_ANS, 2198 tt_write ((unsigned char *)VT100_ANS,
2169 (unsigned int)STRLEN(VT100_ANS)); 2199 (unsigned int)STRLEN (VT100_ANS));
2170 break; 2200 break;
2171 case C0_BEL: /* bell */ 2201 case C0_BEL: /* bell */
2172 rxvt_scr_bell(aR); 2202 scr_bell ();
2173 break; 2203 break;
2174 case C0_BS: /* backspace */ 2204 case C0_BS: /* backspace */
2175 rxvt_scr_backspace(aR); 2205 scr_backspace ();
2176 break; 2206 break;
2177 case C0_HT: /* tab */ 2207 case C0_HT: /* tab */
2178 rxvt_scr_tab(aR_ 1); 2208 scr_tab (1);
2179 break; 2209 break;
2180 case C0_CR: /* carriage return */ 2210 case C0_CR: /* carriage return */
2181 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2211 scr_gotorc (0, 0, R_RELATIVE);
2182 break; 2212 break;
2183 case C0_VT: /* vertical tab, form feed */ 2213 case C0_VT: /* vertical tab, form feed */
2184 case C0_FF: 2214 case C0_FF:
2185 case C0_LF: /* line feed */ 2215 case C0_LF: /* line feed */
2186 rxvt_scr_index(aR_ UP); 2216 scr_index (UP);
2187 break; 2217 break;
2188 case C0_SO: /* shift out - acs */ 2218 case C0_SO: /* shift out - acs */
2189 rxvt_scr_charset_choose(aR_ 1); 2219 scr_charset_choose (1);
2190 break; 2220 break;
2191 case C0_SI: /* shift in - acs */ 2221 case C0_SI: /* shift in - acs */
2192 rxvt_scr_charset_choose(aR_ 0); 2222 scr_charset_choose (0);
2193 break; 2223 break;
2194 } 2224 }
2195} 2225}
2196/*}}} */ 2226/*}}} */
2197 2227
2198 2228
2199/*{{{ process VT52 escape sequences */ 2229/*{{{ process VT52 escape sequences */
2200/* INTPROTO */
2201void 2230void
2202rxvt_process_escape_vt52(pR_ unsigned char ch) 2231rxvt_term::process_escape_vt52 (unsigned char ch)
2203{ 2232{
2204 int row, col; 2233 int row, col;
2234
2235 switch (ch)
2205 2236 {
2206 switch (ch) {
2207 case 'A': /* cursor up */ 2237 case 'A': /* cursor up */
2208 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2238 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2209 break; 2239 break;
2210 case 'B': /* cursor down */ 2240 case 'B': /* cursor down */
2211 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2241 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2212 break; 2242 break;
2213 case 'C': /* cursor right */ 2243 case 'C': /* cursor right */
2214 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2244 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2215 break; 2245 break;
2216 case 'D': /* cursor left */ 2246 case 'D': /* cursor left */
2217 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2247 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2218 break; 2248 break;
2219 case 'H': /* cursor home */ 2249 case 'H': /* cursor home */
2220 rxvt_scr_gotorc(aR_ 0, 0, 0); 2250 scr_gotorc (0, 0, 0);
2221 break; 2251 break;
2222 case 'I': /* cursor up and scroll down if needed */ 2252 case 'I': /* cursor up and scroll down if needed */
2223 rxvt_scr_index(aR_ DN); 2253 scr_index (DN);
2224 break; 2254 break;
2225 case 'J': /* erase to end of screen */ 2255 case 'J': /* erase to end of screen */
2226 rxvt_scr_erase_screen(aR_ 0); 2256 scr_erase_screen (0);
2227 break; 2257 break;
2228 case 'K': /* erase to end of line */ 2258 case 'K': /* erase to end of line */
2229 rxvt_scr_erase_line(aR_ 0); 2259 scr_erase_line (0);
2230 break; 2260 break;
2231 case 'Y': /* move to specified row and col */ 2261 case 'Y': /* move to specified row and col */
2232 /* full command is 'ESC Y row col' where row and col 2262 /* full command is 'ESC Y row col' where row and col
2233 * are encoded by adding 32 and sending the ascii 2263 * are encoded by adding 32 and sending the ascii
2234 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2264 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2235 * etc. */ 2265 * etc. */
2236 row = rxvt_cmd_getc(aR) - ' '; 2266 row = cmd_getc () - ' ';
2237 col = rxvt_cmd_getc(aR) - ' '; 2267 col = cmd_getc () - ' ';
2238 rxvt_scr_gotorc(aR_ row, col, 0); 2268 scr_gotorc (row, col, 0);
2239 break; 2269 break;
2240 case 'Z': /* identify the terminal type */ 2270 case 'Z': /* identify the terminal type */
2241 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2271 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2242 break; 2272 break;
2243 case '<': /* turn off VT52 mode */ 2273 case '<': /* turn off VT52 mode */
2244 PrivMode(0, PrivMode_vt52); 2274 PrivMode (0, PrivMode_vt52);
2245 break; 2275 break;
2246 case 'F': /* use special graphics character set */ 2276 case 'F': /* use special graphics character set */
2247 case 'G': /* use regular character set */ 2277 case 'G': /* use regular character set */
2248 /* unimplemented */ 2278 /* unimplemented */
2249 break; 2279 break;
2250 case '=': /* use alternate keypad mode */ 2280 case '=': /* use alternate keypad mode */
2251 case '>': /* use regular keypad mode */ 2281 case '>': /* use regular keypad mode */
2252 /* unimplemented */ 2282 /* unimplemented */
2253 break; 2283 break;
2254 } 2284 }
2255} 2285}
2256/*}}} */ 2286/*}}} */
2257 2287
2258 2288
2259/*{{{ process escape sequences */ 2289/*{{{ process escape sequences */
2260/* INTPROTO */
2261void 2290void
2262rxvt_process_escape_seq(pR) 2291rxvt_term::process_escape_seq ()
2263{ 2292{
2264 unsigned char ch = rxvt_cmd_getc(aR); 2293 unsigned char ch = cmd_getc ();
2265 2294
2266 if (R->PrivateModes & PrivMode_vt52) { 2295 if (PrivateModes & PrivMode_vt52)
2267 rxvt_process_escape_vt52(aR_ ch);
2268 return;
2269 }
2270 2296 {
2297 process_escape_vt52 (ch);
2298 return;
2299 }
2300
2271 switch (ch) { 2301 switch (ch)
2302 {
2272 /* case 1: do_tek_mode (); break; */ 2303 /* case 1: do_tek_mode (); break; */
2273 case '#': 2304 case '#':
2274 if (rxvt_cmd_getc(aR) == '8') 2305 if (cmd_getc () == '8')
2275 rxvt_scr_E(aR); 2306 scr_E ();
2276 break; 2307 break;
2277 case '(': 2308 case '(':
2278 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2309 scr_charset_set (0, (unsigned int)cmd_getc ());
2279 break; 2310 break;
2280 case ')': 2311 case ')':
2281 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2312 scr_charset_set (1, (unsigned int)cmd_getc ());
2282 break; 2313 break;
2283 case '*': 2314 case '*':
2284 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2315 scr_charset_set (2, (unsigned int)cmd_getc ());
2285 break; 2316 break;
2286 case '+': 2317 case '+':
2287 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2318 scr_charset_set (3, (unsigned int)cmd_getc ());
2288 break; 2319 break;
2289#ifdef MULTICHAR_SET
2290 case '$':
2291 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR));
2292 break;
2293#endif
2294#ifndef NO_FRILLS 2320#ifndef NO_FRILLS
2295 case '6': 2321 case '6':
2296 rxvt_scr_backindex(aR); 2322 scr_backindex ();
2297 break; 2323 break;
2298#endif 2324#endif
2299 case '7': 2325 case '7':
2300 rxvt_scr_cursor(aR_ SAVE); 2326 scr_cursor (SAVE);
2301 break; 2327 break;
2302 case '8': 2328 case '8':
2303 rxvt_scr_cursor(aR_ RESTORE); 2329 scr_cursor (RESTORE);
2304 break; 2330 break;
2305#ifndef NO_FRILLS 2331#ifndef NO_FRILLS
2306 case '9': 2332 case '9':
2307 rxvt_scr_forwardindex(aR); 2333 scr_forwardindex ();
2308 break; 2334 break;
2309#endif 2335#endif
2310 case '=': 2336 case '=':
2311 case '>': 2337 case '>':
2312 PrivMode((ch == '='), PrivMode_aplKP); 2338 PrivMode ((ch == '='), PrivMode_aplKP);
2313 break; 2339 break;
2314 2340
2315 case C1_40: 2341 case C1_40:
2316 rxvt_cmd_getc(aR); 2342 cmd_getc ();
2317 break; 2343 break;
2318 case C1_44: 2344 case C1_44:
2319 rxvt_scr_index(aR_ UP); 2345 scr_index (UP);
2320 break; 2346 break;
2321 2347
2322 /* 8.3.87: NEXT LINE */ 2348 /* 8.3.87: NEXT LINE */
2323 case C1_NEL: /* ESC E */ 2349 case C1_NEL: /* ESC E */
2324 { 2350 {
2325 uint32_t nlcr[] = { '\n', '\r' }; 2351 uint32_t nlcr[] = { '\n', '\r' };
2326 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2352 scr_add_lines (nlcr, 1, 2);
2327 } 2353 }
2328 break; 2354 break;
2329 2355
2330 /* kidnapped escape sequence: Should be 8.3.48 */ 2356 /* kidnapped escape sequence: Should be 8.3.48 */
2331 case C1_ESA: /* ESC G */ 2357 case C1_ESA: /* ESC G */
2332 rxvt_process_graphics(aR); 2358 process_graphics ();
2333 break; 2359 break;
2334 2360
2335 /* 8.3.63: CHARACTER TABULATION SET */ 2361 /* 8.3.63: CHARACTER TABULATION SET */
2336 case C1_HTS: /* ESC H */ 2362 case C1_HTS: /* ESC H */
2337 rxvt_scr_set_tab(aR_ 1); 2363 scr_set_tab (1);
2338 break; 2364 break;
2339 2365
2340 /* 8.3.105: REVERSE LINE FEED */ 2366 /* 8.3.105: REVERSE LINE FEED */
2341 case C1_RI: /* ESC M */ 2367 case C1_RI: /* ESC M */
2342 rxvt_scr_index(aR_ DN); 2368 scr_index (DN);
2343 break; 2369 break;
2344 2370
2345 /* 8.3.142: SINGLE-SHIFT TWO */ 2371 /* 8.3.142: SINGLE-SHIFT TWO */
2346 /*case C1_SS2: scr_single_shift (2); break; */ 2372 /*case C1_SS2: scr_single_shift (2); break; */
2347 2373
2348 /* 8.3.143: SINGLE-SHIFT THREE */ 2374 /* 8.3.143: SINGLE-SHIFT THREE */
2349 /*case C1_SS3: scr_single_shift (3); break; */ 2375 /*case C1_SS3: scr_single_shift (3); break; */
2350 2376
2351 /* 8.3.27: DEVICE CONTROL STRING */ 2377 /* 8.3.27: DEVICE CONTROL STRING */
2352 case C1_DCS: /* ESC P */ 2378 case C1_DCS: /* ESC P */
2353 rxvt_process_dcs_seq(aR); 2379 process_dcs_seq ();
2354 break; 2380 break;
2355 2381
2356 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2382 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2357 case C1_SCI: /* ESC Z */ 2383 case C1_SCI: /* ESC Z */
2358 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2384 tt_write ((const unsigned char *)ESCZ_ANSWER,
2359 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2385 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2360 break; /* steal obsolete ESC [ c */ 2386 break; /* steal obsolete ESC [ c */
2361 2387
2362 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2388 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2363 case C1_CSI: /* ESC [ */ 2389 case C1_CSI: /* ESC [ */
2364 rxvt_process_csi_seq(aR); 2390 process_csi_seq ();
2365 break; 2391 break;
2366 2392
2367 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2393 /* 8.3.90: OPERATING SYSTEM COMMAND */
2368 case C1_OSC: /* ESC ] */ 2394 case C1_OSC: /* ESC ] */
2369 rxvt_process_osc_seq(aR); 2395 process_osc_seq ();
2370 break; 2396 break;
2371 2397
2372 /* 8.3.106: RESET TO INITIAL STATE */ 2398 /* 8.3.106: RESET TO INITIAL STATE */
2373 case 'c': 2399 case 'c':
2374 rxvt_scr_poweron(aR); 2400 scr_poweron ();
2375 rxvt_scrollbar_show(aR_ 1); 2401 scrollbar_show (1);
2376 break; 2402 break;
2377 2403
2378 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2404 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2379 case 'n': 2405 case 'n':
2380 rxvt_scr_charset_choose(aR_ 2); 2406 scr_charset_choose (2);
2381 break; 2407 break;
2382 2408
2383 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2409 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2384 case 'o': 2410 case 'o':
2385 rxvt_scr_charset_choose(aR_ 3); 2411 scr_charset_choose (3);
2386 break; 2412 break;
2387 } 2413 }
2388} 2414}
2389/*}}} */ 2415/*}}} */
2390 2416
2391/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2417/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2392/* *INDENT-OFF* */ 2418/* *INDENT-OFF* */
2393enum { 2419enum {
2394 CSI_ICH = 0x40, 2420 CSI_ICH = 0x40,
2395 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2421 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2396 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2422 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2397 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2423 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2398 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2424 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2399 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2425 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2400 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2426 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2401 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2427 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2402 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2428 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2403}; 2429};
2404 2430
2405#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2431#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2406 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2432 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2407 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2433 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2408#define get_byte_array_bit(array, bit) \ 2434#define get_byte_array_bit(array, bit) \
2409 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2435 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2410 2436
2411const unsigned char csi_defaults[] = { 2437const unsigned char csi_defaults[] =
2438 {
2412 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2439 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2413 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2440 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2414 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2441 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2415 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2442 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2416 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2443 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2417 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2444 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2418 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2445 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2419 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2446 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2420}; 2447 };
2421/* *INDENT-ON* */ 2448/* *INDENT-ON* */
2422 2449
2423/* INTPROTO */
2424void 2450void
2425rxvt_process_csi_seq(pR) 2451rxvt_term::process_csi_seq ()
2426{ 2452{
2427 unsigned char ch, priv, i; 2453 unsigned char ch, priv, i;
2428 unsigned int nargs, p; 2454 unsigned int nargs, p;
2429 int n, ndef; 2455 int n, ndef;
2430 int arg[ESC_ARGS]; 2456 int arg[ESC_ARGS];
2431 2457
2432 for (nargs = ESC_ARGS; nargs > 0;) 2458 for (nargs = ESC_ARGS; nargs > 0;)
2433 arg[--nargs] = 0; 2459 arg[--nargs] = 0;
2434 2460
2435 priv = 0; 2461 priv = 0;
2462 ch = cmd_getc ();
2463 if (ch >= '<' && ch <= '?')
2464 { /* '<' '=' '>' '?' */
2465 priv = ch;
2436 ch = rxvt_cmd_getc(aR); 2466 ch = cmd_getc ();
2437 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2438 priv = ch;
2439 ch = rxvt_cmd_getc(aR);
2440 } 2467 }
2441/* read any numerical arguments */ 2468 /* read any numerical arguments */
2442 for (n = -1; ch < CSI_ICH; ) { 2469 for (n = -1; ch < CSI_ICH; )
2470 {
2443 if (isdigit(ch)) { 2471 if (isdigit (ch))
2472 {
2444 if (n < 0) 2473 if (n < 0)
2445 n = ch - '0'; 2474 n = ch - '0';
2446 else 2475 else
2447 n = n * 10 + ch - '0'; 2476 n = n * 10 + ch - '0';
2477 }
2448 } else if (ch == ';') { 2478 else if (ch == ';')
2479 {
2449 if (nargs < ESC_ARGS) 2480 if (nargs < ESC_ARGS)
2450 arg[nargs++] = n; 2481 arg[nargs++] = n;
2451 n = -1; 2482 n = -1;
2483 }
2452 } else if (ch == '\b') { 2484 else if (ch == '\b')
2453 rxvt_scr_backspace(aR); 2485 {
2486 scr_backspace ();
2487 }
2454 } else if (ch == C0_ESC) { 2488 else if (ch == C0_ESC)
2455 rxvt_process_escape_seq(aR); 2489 {
2490 process_escape_seq ();
2491 return;
2492 }
2493 else if (ch < ' ')
2494 {
2495 process_nonprinting (ch);
2496 }
2497 ch = cmd_getc ();
2498 }
2499
2500 if (ch > CSI_7F)
2456 return; 2501 return;
2457 } else if (ch < ' ') {
2458 rxvt_process_nonprinting(aR_ ch);
2459 }
2460 ch = rxvt_cmd_getc(aR);
2461 }
2462 2502
2463 if (ch > CSI_7F)
2464 return;
2465
2466 if (nargs < ESC_ARGS) 2503 if (nargs < ESC_ARGS)
2467 arg[nargs++] = n; 2504 arg[nargs++] = n;
2468 2505
2469 i = ch - CSI_ICH; 2506 i = ch - CSI_ICH;
2470 ndef = get_byte_array_bit(csi_defaults, i); 2507 ndef = get_byte_array_bit (csi_defaults, i);
2471 for (p = 0; p < nargs; p++) 2508 for (p = 0; p < nargs; p++)
2472 if (arg[p] == -1) 2509 if (arg[p] == -1)
2473 arg[p] = ndef; 2510 arg[p] = ndef;
2474 2511
2475#ifdef DEBUG_CMD 2512#ifdef DEBUG_CMD
2476 fprintf(stderr, "CSI "); 2513 fprintf (stderr, "CSI ");
2477 for (p = 0; p < nargs; p++) 2514 for (p = 0; p < nargs; p++)
2478 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2515 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2479 fprintf(stderr, "%c\n", ch); 2516 fprintf (stderr, "%c\n", ch);
2480#endif 2517#endif
2481 2518
2482/* 2519 /*
2483 * private mode handling 2520 * private mode handling
2484 */ 2521 */
2485 if (priv) { 2522 if (priv)
2486 switch (priv) { 2523 {
2487 case '>': 2524 switch (priv)
2525 {
2526 case '>':
2488 if (ch == CSI_DA) /* secondary device attributes */ 2527 if (ch == CSI_DA) /* secondary device attributes */
2489 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2528 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2490 break; 2529 break;
2491 case '?': 2530 case '?':
2492 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2531 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2493 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2532 process_terminal_mode (ch, priv, nargs, arg);
2494 break; 2533 break;
2495 } 2534 }
2496 return; 2535 return;
2497 } 2536 }
2498 2537
2499 switch (ch) { 2538 switch (ch)
2500/* 2539 {
2540 /*
2501 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2541 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2502 */ 2542 */
2503#ifdef PRINTPIPE 2543#ifdef PRINTPIPE
2504 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2544 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2505 switch (arg[0]) { 2545 switch (arg[0])
2546 {
2506 case 0: /* initiate transfer to primary aux device */ 2547 case 0: /* initiate transfer to primary aux device */
2507 rxvt_scr_printscreen(aR_ 0); 2548 scr_printscreen (0);
2508 break; 2549 break;
2509 case 5: /* start relay to primary aux device */ 2550 case 5: /* start relay to primary aux device */
2510 rxvt_process_print_pipe(aR); 2551 process_print_pipe ();
2552 break;
2553 }
2511 break; 2554 break;
2512 }
2513 break;
2514#endif 2555#endif
2515 2556
2516 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2557 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2517 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2558 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2518 arg[0] = -arg[0]; 2559 arg[0] = -arg[0];
2519 /* FALLTHROUGH */ 2560 /* FALLTHROUGH */
2520 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2561 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2521 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2562 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2522 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2563 scr_gotorc (arg[0], 0, RELATIVE);
2523 break; 2564 break;
2524 2565
2525 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2566 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2526 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2567 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2527#ifdef ISO6429 2568#ifdef ISO6429
2528 arg[0] = -arg[0]; 2569 arg[0] = -arg[0];
2529#else /* emulate common DEC VTs */ 2570#else /* emulate common DEC VTs */
2530 arg[0] = arg[0] ? -arg[0] : -1; 2571 arg[0] = arg[0] ? -arg[0] : -1;
2531#endif 2572#endif
2532 /* FALLTHROUGH */ 2573 /* FALLTHROUGH */
2533 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2574 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2534 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2575 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2535#ifdef ISO6429 2576#ifdef ISO6429
2536 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2577 scr_gotorc (0, arg[0], RELATIVE);
2537#else /* emulate common DEC VTs */ 2578#else /* emulate common DEC VTs */
2538 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2579 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2539#endif 2580#endif
2540 break; 2581 break;
2541 2582
2542 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2583 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2543 arg[0] = -arg[0]; 2584 arg[0] = -arg[0];
2544 /* FALLTHROUGH */ 2585 /* FALLTHROUGH */
2545 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2586 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2546 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2587 scr_gotorc (arg[0], 0, R_RELATIVE);
2547 break; 2588 break;
2548 2589
2549 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2590 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2550 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2591 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2551 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2592 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2552 break; 2593 break;
2553 2594
2554 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2595 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2555 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2596 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2556 break; 2597 break;
2557 2598
2558 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2599 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2559 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2600 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2560 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2601 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2561 break; 2602 break;
2562 2603
2563 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2604 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2564 arg[0] = -arg[0]; 2605 arg[0] = -arg[0];
2565 /* FALLTHROUGH */ 2606 /* FALLTHROUGH */
2566 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2607 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2567 rxvt_scr_tab(aR_ arg[0]); 2608 scr_tab (arg[0]);
2568 break; 2609 break;
2569 2610
2570 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2611 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2571 rxvt_scr_erase_screen(aR_ arg[0]); 2612 scr_erase_screen (arg[0]);
2572 break; 2613 break;
2573 2614
2574 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2615 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2575 rxvt_scr_erase_line(aR_ arg[0]); 2616 scr_erase_line (arg[0]);
2576 break; 2617 break;
2577 2618
2578 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2619 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2579 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2620 scr_insdel_chars (arg[0], INSERT);
2580 break; 2621 break;
2581 2622
2582 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2623 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2583 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2624 scr_insdel_lines (arg[0], INSERT);
2584 break; 2625 break;
2585 2626
2586 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2627 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2587 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2628 scr_insdel_lines (arg[0], DELETE);
2588 break; 2629 break;
2589 2630
2590 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2631 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2591 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2632 scr_insdel_chars (arg[0], ERASE);
2592 break; 2633 break;
2593 2634
2594 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2635 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2595 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2636 scr_insdel_chars (arg[0], DELETE);
2596 break; 2637 break;
2597 2638
2598 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2639 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2599 arg[0] = -arg[0]; 2640 arg[0] = -arg[0];
2600 /* FALLTHROUGH */ 2641 /* FALLTHROUGH */
2601 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2642 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2602 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2643 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2603 break; 2644 break;
2604 2645
2605 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2646 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2606 R->tt_write((const unsigned char *)VT100_ANS, 2647 tt_write ((const unsigned char *)VT100_ANS,
2607 (unsigned int)(sizeof(VT100_ANS) - 1)); 2648 (unsigned int) (sizeof (VT100_ANS) - 1));
2608 break; 2649 break;
2609 2650
2610 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2651 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2611 rxvt_process_sgr_mode(aR_ nargs, arg); 2652 process_sgr_mode (nargs, arg);
2612 break; 2653 break;
2613 2654
2614 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2655 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2615 switch (arg[0]) { 2656 switch (arg[0])
2657 {
2616 case 5: /* DSR requested */ 2658 case 5: /* DSR requested */
2617 R->tt_printf("\033[0n"); 2659 tt_printf ("\033[0n");
2618 break; 2660 break;
2619 case 6: /* CPR requested */ 2661 case 6: /* CPR requested */
2620 rxvt_scr_report_position(aR); 2662 scr_report_position ();
2621 break; 2663 break;
2622#if defined (ENABLE_DISPLAY_ANSWER) 2664#if defined (ENABLE_DISPLAY_ANSWER)
2623 case 7: /* unofficial extension */ 2665 case 7: /* unofficial extension */
2624 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2666 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2625 break; 2667 break;
2626#endif 2668#endif
2627 case 8: /* unofficial extension */ 2669 case 8: /* unofficial extension */
2628 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2670 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2671 break;
2672 }
2629 break; 2673 break;
2630 }
2631 break;
2632 2674
2633 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2675 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2634 switch (arg[0]) { 2676 switch (arg[0])
2677 {
2635 case 0: /* char tab stop cleared at active position */ 2678 case 0: /* char tab stop cleared at active position */
2636 rxvt_scr_set_tab(aR_ 0); 2679 scr_set_tab (0);
2637 break; 2680 break;
2638 /* case 1: */ /* line tab stop cleared in active line */ 2681 /* case 1: */ /* line tab stop cleared in active line */
2639 /* case 2: */ /* char tab stops cleared in active line */ 2682 /* case 2: */ /* char tab stops cleared in active line */
2640 case 3: /* all char tab stops are cleared */ 2683 case 3: /* all char tab stops are cleared */
2641 /* case 4: */ /* all line tab stops are cleared */ 2684 /* case 4: */ /* all line tab stops are cleared */
2642 case 5: /* all tab stops are cleared */ 2685 case 5: /* all tab stops are cleared */
2643 rxvt_scr_set_tab(aR_ -1); 2686 scr_set_tab (-1);
2687 break;
2688 }
2644 break; 2689 break;
2645 }
2646 break;
2647 2690
2648 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2691 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2649 switch (arg[0]) { 2692 switch (arg[0])
2693 {
2650 case 0: /* char tab stop set at active position */ 2694 case 0: /* char tab stop set at active position */
2651 rxvt_scr_set_tab(aR_ 1); 2695 scr_set_tab (1);
2652 break; /* = ESC H */ 2696 break; /* = ESC H */
2653 /* case 1: */ /* line tab stop set at active line */ 2697 /* case 1: */ /* line tab stop set at active line */
2654 case 2: /* char tab stop cleared at active position */ 2698 case 2: /* char tab stop cleared at active position */
2655 rxvt_scr_set_tab(aR_ 0); 2699 scr_set_tab (0);
2656 break; /* = ESC [ 0 g */ 2700 break; /* = ESC [ 0 g */
2657 /* case 3: */ /* line tab stop cleared at active line */ 2701 /* case 3: */ /* line tab stop cleared at active line */
2658 /* case 4: */ /* char tab stops cleared at active line */ 2702 /* case 4: */ /* char tab stops cleared at active line */
2659 case 5: /* all char tab stops are cleared */ 2703 case 5: /* all char tab stops are cleared */
2660 rxvt_scr_set_tab(aR_ -1); 2704 scr_set_tab (-1);
2661 break; /* = ESC [ 3 g */ 2705 break; /* = ESC [ 3 g */
2662 /* case 6: */ /* all line tab stops are cleared */ 2706 /* case 6: */ /* all line tab stops are cleared */
2663 } 2707 }
2664 break; 2708 break;
2665 2709
2666 case CSI_RM: /* 8.3.107: RESET MODE */ 2710 case CSI_RM: /* 8.3.107: RESET MODE */
2667 if (arg[0] == 4) 2711 if (arg[0] == 4)
2668 rxvt_scr_insert_mode(aR_ 0); 2712 scr_insert_mode (0);
2669 break; 2713 break;
2670 2714
2671 case CSI_SM: /* 8.3.126: SET MODE */ 2715 case CSI_SM: /* 8.3.126: SET MODE */
2672 if (arg[0] == 4) 2716 if (arg[0] == 4)
2673 rxvt_scr_insert_mode(aR_ 1); 2717 scr_insert_mode (1);
2674 break; 2718 break;
2675 2719
2676/* 2720 /*
2677 * PRIVATE USE beyond this point. All CSI_7? sequences here 2721 * PRIVATE USE beyond this point. All CSI_7? sequences here
2678 */ 2722 */
2679 case CSI_72: /* DECSTBM: set top and bottom margins */ 2723 case CSI_72: /* DECSTBM: set top and bottom margins */
2680 if (nargs == 1) 2724 if (nargs == 1)
2681 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2725 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2682 else if (nargs == 0 || arg[0] >= arg[1]) 2726 else if (nargs == 0 || arg[0] >= arg[1])
2683 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2727 scr_scroll_region (0, MAX_ROWS - 1);
2684 else 2728 else
2685 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2729 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2686 break; 2730 break;
2687 2731
2688 case CSI_73: 2732 case CSI_73:
2689 rxvt_scr_cursor(aR_ SAVE); 2733 scr_cursor (SAVE);
2690 break; 2734 break;
2691 case CSI_75: 2735 case CSI_75:
2692 rxvt_scr_cursor(aR_ RESTORE); 2736 scr_cursor (RESTORE);
2693 break; 2737 break;
2694 2738
2695#ifndef NO_FRILLS 2739#ifndef NO_FRILLS
2696 case CSI_74: 2740 case CSI_74:
2697 rxvt_process_window_ops(aR_ arg, nargs); 2741 process_window_ops (arg, nargs);
2698 break; 2742 break;
2699#endif 2743#endif
2700 2744
2701 case CSI_78: /* DECREQTPARM */ 2745 case CSI_78: /* DECREQTPARM */
2702 if (arg[0] == 0 || arg[0] == 1) 2746 if (arg[0] == 0 || arg[0] == 1)
2703 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2747 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2704 /* FALLTHROUGH */ 2748 /* FALLTHROUGH */
2705 2749
2706 default: 2750 default:
2707 break; 2751 break;
2708 } 2752 }
2709} 2753}
2710/*}}} */ 2754/*}}} */
2711 2755
2712#ifndef NO_FRILLS 2756#ifndef NO_FRILLS
2713/* ARGSUSED */ 2757/* ARGSUSED */
2714/* INTPROTO */
2715void 2758void
2716rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2759rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2717{ 2760{
2718 int x, y; 2761 int x, y;
2719#if 0 2762#if 0
2720 char *s; 2763 char *s;
2721#endif 2764#endif
2722 XWindowAttributes wattr; 2765 XWindowAttributes wattr;
2723 Window wdummy; 2766 Window wdummy;
2724 2767
2725 if (nargs == 0) 2768 if (nargs == 0)
2726 return; 2769 return;
2727 switch (args[0]) { 2770 switch (args[0])
2771 {
2728 /* 2772 /*
2729 * commands 2773 * commands
2730 */ 2774 */
2731 case 1: /* deiconify window */ 2775 case 1: /* deiconify window */
2732 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2776 XMapWindow (display->display, TermWin.parent[0]);
2733 break; 2777 break;
2734 case 2: /* iconify window */ 2778 case 2: /* iconify window */
2735 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2779 XIconifyWindow (display->display, TermWin.parent[0],
2736 DefaultScreen(R->Xdisplay)); 2780 DefaultScreen (display->display));
2737 break; 2781 break;
2738 case 3: /* set position (pixels) */ 2782 case 3: /* set position (pixels) */
2739 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2783 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2740 break; 2784 break;
2741 case 4: /* set size (pixels) */ 2785 case 4: /* set size (pixels) */
2742 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2786 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2743 break; 2787 break;
2744 case 5: /* raise window */ 2788 case 5: /* raise window */
2745 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2789 XRaiseWindow (display->display, TermWin.parent[0]);
2746 break; 2790 break;
2747 case 6: /* lower window */ 2791 case 6: /* lower window */
2748 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2792 XLowerWindow (display->display, TermWin.parent[0]);
2749 break; 2793 break;
2750 case 7: /* refresh window */ 2794 case 7: /* refresh window */
2751 rxvt_scr_touch(aR_ True); 2795 scr_touch (true);
2752 break; 2796 break;
2753 case 8: /* set size (chars) */ 2797 case 8: /* set size (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2798 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2799 (unsigned int) (args[1] * TermWin.fheight));
2756 break; 2800 break;
2757 default: 2801 default:
2758 if (args[0] >= 24) /* set height (chars) */ 2802 if (args[0] >= 24) /* set height (chars) */
2759 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2803 set_widthheight ((unsigned int)TermWin.width,
2760 (unsigned int)(args[1] * R->TermWin.fheight)); 2804 (unsigned int) (args[1] * TermWin.fheight));
2761 break; 2805 break;
2762 /* 2806 /*
2763 * reports - some output format copied from XTerm 2807 * reports - some output format copied from XTerm
2764 */ 2808 */
2765 case 11: /* report window state */ 2809 case 11: /* report window state */
2766 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2767 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2811 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2768 break; 2812 break;
2769 case 13: /* report window position */ 2813 case 13: /* report window position */
2770 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2814 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2771 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2815 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2772 -wattr.border_width, -wattr.border_width, 2816 -wattr.border_width, -wattr.border_width,
2773 &x, &y, &wdummy); 2817 &x, &y, &wdummy);
2774 R->tt_printf("\033[3;%d;%dt", x, y); 2818 tt_printf ("\033[3;%d;%dt", x, y);
2775 break; 2819 break;
2776 case 14: /* report window size (pixels) */ 2820 case 14: /* report window size (pixels) */
2777 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2821 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2778 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2822 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2779 break; 2823 break;
2780 case 18: /* report window size (chars) */ 2824 case 18: /* report window size (chars) */
2781 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2825 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2782 break; 2826 break;
2783#if 0 /* XXX: currently disabled due to security concerns */ 2827#if 0 /* XXX: currently disabled due to security concerns */
2784 case 20: /* report icon label */ 2828 case 20: /* report icon label */
2785 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2829 XGetIconName (display->display, TermWin.parent[0], &s);
2786 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2830 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2787 break; 2831 break;
2788 case 21: /* report window title */ 2832 case 21: /* report window title */
2789 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2833 XFetchName (display->display, TermWin.parent[0], &s);
2790 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2834 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2791 break; 2835 break;
2792#endif 2836#endif
2837
2793 } 2838 }
2794} 2839}
2795#endif 2840#endif
2796 2841
2797/*----------------------------------------------------------------------*/ 2842/*----------------------------------------------------------------------*/
2798/* 2843/*
2799 * get input up until STRING TERMINATOR (or BEL) 2844 * get input up until STRING TERMINATOR (or BEL)
2800 * ends_how is terminator used. returned input must be free()d 2845 * ends_how is terminator used. returned input must be free ()d
2801 */ 2846 */
2802/* INTPROTO */
2803unsigned char * 2847unsigned char *
2804rxvt_get_to_st(pR_ unsigned char *ends_how) 2848rxvt_term::get_to_st (unsigned char *ends_how)
2805{ 2849{
2806 int seen_esc = 0; /* seen escape? */ 2850 int seen_esc = 0; /* seen escape? */
2807 unsigned int n = 0; 2851 unsigned int n = 0;
2808 unsigned char *s; 2852 unsigned char *s;
2809 unsigned char ch, string[STRING_MAX]; 2853 unsigned char ch, string[STRING_MAX];
2810 2854
2811 for (; (ch = rxvt_cmd_getc(aR));) { 2855 for (; (ch = cmd_getc ());)
2856 {
2812 if (ch == C0_BEL 2857 if (ch == C0_BEL
2813 || ch == CHAR_ST 2858 || ch == CHAR_ST
2814 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2859 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2815 break; 2860 break;
2816 if (ch == C0_ESC) { 2861 if (ch == C0_ESC)
2862 {
2817 seen_esc = 1; 2863 seen_esc = 1;
2818 continue; 2864 continue;
2865 }
2819 } else if (ch == '\t') 2866 else if (ch == '\t')
2820 ch = ' '; /* translate '\t' to space */ 2867 ch = ' '; /* translate '\t' to space */
2821 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2868 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2822 return NULL; /* other control character - exit */ 2869 return NULL; /* other control character - exit */
2823 if (n < sizeof(string) - 1) 2870 if (n < sizeof (string) - 1)
2824 string[n++] = ch; 2871 string[n++] = ch;
2825 seen_esc = 0; 2872 seen_esc = 0;
2826 } 2873 }
2827 string[n++] = '\0'; 2874 string[n++] = '\0';
2828 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2875 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2829 return NULL; 2876 return NULL;
2830 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2877 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2831 STRNCPY(s, string, n); 2878 STRNCPY (s, string, n);
2832 return s; 2879 return s;
2833} 2880}
2834 2881
2835/*----------------------------------------------------------------------*/ 2882/*----------------------------------------------------------------------*/
2836/* 2883/*
2837 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2884 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2838 */ 2885 */
2839/* INTPROTO */
2840void 2886void
2841rxvt_process_dcs_seq(pR) 2887rxvt_term::process_dcs_seq ()
2842{ 2888{
2843 unsigned char eh, *s; 2889 unsigned char eh, *s;
2844/* 2890 /*
2845 * Not handled yet 2891 * Not handled yet
2846 */ 2892 */
2847 s = rxvt_get_to_st(aR_ &eh); 2893 s = get_to_st (&eh);
2848 if (s) 2894 if (s)
2849 free(s); 2895 free (s);
2850 return; 2896 return;
2851} 2897}
2852 2898
2853/*----------------------------------------------------------------------*/ 2899/*----------------------------------------------------------------------*/
2854/* 2900/*
2855 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2901 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2856 */ 2902 */
2857/* INTPROTO */
2858void 2903void
2859rxvt_process_osc_seq(pR) 2904rxvt_term::process_osc_seq ()
2860{ 2905{
2861 unsigned char ch, eh, *s; 2906 unsigned char ch, eh, *s;
2862 int arg; 2907 int arg;
2863 2908
2864 ch = rxvt_cmd_getc(aR); 2909 ch = cmd_getc ();
2865 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2910 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2866 arg = arg * 10 + (ch - '0'); 2911 arg = arg * 10 + (ch - '0');
2867 2912
2868 if (ch == ';') { 2913 if (ch == ';')
2869 s = rxvt_get_to_st(aR_ &eh); 2914 {
2870 if (s) { 2915 s = get_to_st (&eh);
2871 /* 2916 if (s)
2917 {
2918 /*
2872 * rxvt_menubar_dispatch() violates the constness of the string, 2919 * rxvt_menubar_dispatch () violates the constness of the string,
2873 * so do it here 2920 * so do it here
2874 */ 2921 */
2875 if (arg == XTerm_Menu) 2922 if (arg == XTerm_Menu)
2876#if 0 /* XXX: currently disabled due to security concerns */ 2923#if 0 /* XXX: currently disabled due to security concerns */
2877 rxvt_menubar_dispatch(aR_ (char *)s); 2924 menubar_dispatch ((char *)s);
2878#else 2925#else
2879 0; 2926 (void)0;
2880#endif 2927#endif
2881 else 2928 else
2882 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2929 xterm_seq (arg, (char *)s, eh);
2883 free(s); 2930 free (s);
2884 } 2931 }
2885 } 2932 }
2886} 2933}
2887/* 2934/*
2888 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2935 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2889 * 0 = change iconName/title 2936 * 0 = change iconName/title
… …
2902 * 10 = menu (may change in future) 2949 * 10 = menu (may change in future)
2903 * 20 = bg pixmap 2950 * 20 = bg pixmap
2904 * 39 = change default fg color 2951 * 39 = change default fg color
2905 * 49 = change default bg color 2952 * 49 = change default bg color
2906 * 55 = dump scrollback buffer and all of screen 2953 * 55 = dump scrollback buffer and all of screen
2954 * 701 = change locale
2955 * 702 = find font
2907 */ 2956 */
2908/* EXTPROTO */
2909void 2957void
2910rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2958rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2911{ 2959{
2912 int changed = 0; 2960 int changed = 0;
2913 int color; 2961 int color;
2914 char *buf, *name; 2962 char *buf, *name;
2915 2963
2916 assert(str != NULL); 2964 assert (str != NULL);
2917 switch (op) { 2965 switch (op)
2966 {
2918 case XTerm_name: 2967 case XTerm_name:
2919 rxvt_set_title(aR_ str); 2968 set_title (str);
2920 /* FALLTHROUGH */ 2969 /* FALLTHROUGH */
2921 case XTerm_iconName: 2970 case XTerm_iconName:
2922 rxvt_set_iconName(aR_ str); 2971 set_iconName (str);
2923 break; 2972 break;
2924 case XTerm_title: 2973 case XTerm_title:
2925 rxvt_set_title(aR_ str); 2974 set_title (str);
2926 break; 2975 break;
2927 case XTerm_Color: 2976 case XTerm_Color:
2928 for (buf = (char *)str; buf && *buf;) { 2977 for (buf = (char *)str; buf && *buf;)
2978 {
2929 if ((name = STRCHR(buf, ';')) == NULL) 2979 if ((name = STRCHR (buf, ';')) == NULL)
2930 break; 2980 break;
2931 *name++ = '\0'; 2981 *name++ = '\0';
2932 color = atoi(buf); 2982 color = atoi (buf);
2933 if (color < 0 || color >= TOTAL_COLORS) 2983 if (color < 0 || color >= TOTAL_COLORS)
2934 break; 2984 break;
2935 if ((buf = STRCHR(name, ';')) != NULL) 2985 if ((buf = STRCHR (name, ';')) != NULL)
2936 *buf++ = '\0'; 2986 *buf++ = '\0';
2937 rxvt_set_window_color(aR_ color + minCOLOR, name); 2987 set_window_color (color + minCOLOR, name);
2938 } 2988 }
2939 break; 2989 break;
2940#ifndef NO_CURSORCOLOR 2990#ifndef NO_CURSORCOLOR
2941 case XTerm_Color_cursor: 2991 case XTerm_Color_cursor:
2942 rxvt_set_window_color(aR_ Color_cursor, str); 2992 set_window_color (Color_cursor, str);
2943 break; 2993 break;
2944#endif 2994#endif
2945 case XTerm_Color_pointer: 2995 case XTerm_Color_pointer:
2946 rxvt_set_window_color(aR_ Color_pointer, str); 2996 set_window_color (Color_pointer, str);
2947 break; 2997 break;
2948#ifndef NO_BOLD_UNDERLINE_REVERSE 2998#ifndef NO_BOLD_UNDERLINE_REVERSE
2949 case XTerm_Color_BD: 2999 case XTerm_Color_BD:
2950 rxvt_set_window_color(aR_ Color_BD, str); 3000 set_window_color (Color_BD, str);
2951 break; 3001 break;
2952 case XTerm_Color_UL: 3002 case XTerm_Color_UL:
2953 rxvt_set_window_color(aR_ Color_UL, str); 3003 set_window_color (Color_UL, str);
2954 break; 3004 break;
2955 case XTerm_Color_RV: 3005 case XTerm_Color_RV:
2956 rxvt_set_window_color(aR_ Color_RV, str); 3006 set_window_color (Color_RV, str);
2957 break; 3007 break;
2958#endif 3008#endif
2959 3009
2960 case XTerm_Menu: 3010 case XTerm_Menu:
2961 /* 3011 /*
2962 * rxvt_menubar_dispatch() violates the constness of the string, 3012 * rxvt_menubar_dispatch () violates the constness of the string,
2963 * so DON'T do it here 3013 * so DON'T do it here
2964 */ 3014 */
2965 break; 3015 break;
2966 case XTerm_Pixmap: 3016 case XTerm_Pixmap:
2967 if (*str != ';') { 3017 if (*str != ';')
3018 {
2968#if XPM_BACKGROUND 3019#if XPM_BACKGROUND
2969 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3020 scale_pixmap (""); /* reset to default scaling */
2970 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3021 set_bgPixmap (str); /* change pixmap */
2971#endif 3022#endif
2972 rxvt_scr_touch(aR_ True); 3023 scr_touch (true);
2973 } 3024 }
2974 while ((str = STRCHR(str, ';')) != NULL) { 3025 while ((str = STRCHR (str, ';')) != NULL)
2975 str++; 3026 {
3027 str++;
2976#if XPM_BACKGROUND 3028#if XPM_BACKGROUND
2977 changed += rxvt_scale_pixmap(aR_ str); 3029 changed += scale_pixmap (str);
2978#endif 3030#endif
2979 } 3031
2980 if (changed) { 3032 }
3033 if (changed)
3034 {
2981#ifdef XPM_BACKGROUND 3035#ifdef XPM_BACKGROUND
2982 rxvt_resize_pixmap(aR); 3036 resize_pixmap ();
2983#endif 3037#endif
2984 rxvt_scr_touch(aR_ True); 3038 scr_touch (true);
2985 } 3039 }
2986 break; 3040 break;
2987 3041
2988 case XTerm_restoreFG: 3042 case XTerm_restoreFG:
2989 rxvt_set_window_color(aR_ Color_fg, str); 3043 set_window_color (Color_fg, str);
2990 break; 3044 break;
2991 case XTerm_restoreBG: 3045 case XTerm_restoreBG:
2992 rxvt_set_window_color(aR_ Color_bg, str); 3046 set_window_color (Color_bg, str);
2993 break; 3047 break;
2994 case XTerm_logfile: 3048 case XTerm_logfile:
2995 break; 3049 break;
2996 case XTerm_font: 3050 case XTerm_font:
2997 rxvt_change_font(aR_ 0, str); 3051 change_font (str);
2998 break; 3052 break;
3053#ifndef NO_FRILLS
3054 case XTerm_locale:
3055 if (str[0] == '?' && !str[1])
3056 tt_printf ("%-.250s\n", locale);
3057 else
3058 {
3059 set_locale (str);
3060# ifdef USE_XIM
3061 im_cb ();
3062# endif
3063 }
3064 break;
3065 case XTerm_findfont:
3066 {
3067 int fid = TermWin.fontset->find_font (atoi (str));
3068 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3069 }
3070 break;
3071#endif
2999#if 0 3072#if 0
3000 case XTerm_dumpscreen: /* no error notices */ 3073 case XTerm_dumpscreen: /* no error notices */
3001 { 3074 {
3002 int fd; 3075 int fd;
3003 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3076 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3004 rxvt_scr_dump(aR_ fd); 3077 {
3005 close(fd); 3078 scr_dump (fd);
3006 } 3079 close (fd);
3007 } 3080 }
3008 break; 3081 }
3082 break;
3009#endif 3083#endif
3084
3010 } 3085 }
3011} 3086}
3012/*----------------------------------------------------------------------*/ 3087/*----------------------------------------------------------------------*/
3013 3088
3014/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3089/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3019 * 's' = save 3094 * 's' = save
3020 * 'r' = restore 3095 * 'r' = restore
3021 * 't' = toggle 3096 * 't' = toggle
3022 * so no need for fancy checking 3097 * so no need for fancy checking
3023 */ 3098 */
3024/* INTPROTO */
3025int 3099int
3026rxvt_privcases(pR_ int mode, unsigned long bit) 3100rxvt_term::privcases (int mode, unsigned long bit)
3027{ 3101{
3028 int state; 3102 int state;
3029 3103
3030 if (mode == 's') { 3104 if (mode == 's')
3105 {
3031 R->SavedModes |= (R->PrivateModes & bit); 3106 SavedModes |= (PrivateModes & bit);
3032 return -1; 3107 return -1;
3033 } else { 3108 }
3109 else
3110 {
3034 if (mode == 'r') 3111 if (mode == 'r')
3035 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3112 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3036 else 3113 else
3037 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3114 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3038 PrivMode(state, bit); 3115 PrivMode (state, bit);
3039 } 3116 }
3040 return state; 3117 return state;
3041} 3118}
3042 3119
3043/* we're not using priv _yet_ */ 3120/* we're not using priv _yet_ */
3044/* INTPROTO */
3045void 3121void
3046rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3122rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3047{ 3123{
3048 unsigned int i, j; 3124 unsigned int i, j;
3049 int state; 3125 int state;
3050 static const struct { 3126 static const struct
3127 {
3051 const int argval; 3128 const int argval;
3052 const unsigned long bit; 3129 const unsigned long bit;
3130 }
3053 } argtopriv[] = { 3131 argtopriv[] = {
3054 { 1, PrivMode_aplCUR }, 3132 { 1, PrivMode_aplCUR },
3055 { 2, PrivMode_vt52 }, 3133 { 2, PrivMode_vt52 },
3056 { 3, PrivMode_132 }, 3134 { 3, PrivMode_132 },
3057 { 4, PrivMode_smoothScroll }, 3135 { 4, PrivMode_smoothScroll },
3058 { 5, PrivMode_rVideo }, 3136 { 5, PrivMode_rVideo },
3059 { 6, PrivMode_relOrigin }, 3137 { 6, PrivMode_relOrigin },
3060 { 7, PrivMode_Autowrap }, 3138 { 7, PrivMode_Autowrap },
3061 { 9, PrivMode_MouseX10 }, 3139 { 9, PrivMode_MouseX10 },
3062#ifdef menuBar_esc 3140#ifdef menuBar_esc
3063 { menuBar_esc, PrivMode_menuBar }, 3141 { menuBar_esc, PrivMode_menuBar },
3064#endif 3142#endif
3065#ifdef scrollBar_esc 3143#ifdef scrollBar_esc
3066 { scrollBar_esc, PrivMode_scrollBar }, 3144 { scrollBar_esc, PrivMode_scrollBar },
3067#endif 3145#endif
3068 { 25, PrivMode_VisibleCursor }, 3146 { 25, PrivMode_VisibleCursor },
3069 { 35, PrivMode_ShiftKeys }, 3147 { 35, PrivMode_ShiftKeys },
3070 { 40, PrivMode_132OK }, 3148 { 40, PrivMode_132OK },
3071 { 47, PrivMode_Screen }, 3149 { 47, PrivMode_Screen },
3072 { 66, PrivMode_aplKP }, 3150 { 66, PrivMode_aplKP },
3073#ifndef NO_BACKSPACE_KEY 3151#ifndef NO_BACKSPACE_KEY
3074 { 67, PrivMode_BackSpace }, 3152 { 67, PrivMode_BackSpace },
3075#endif 3153#endif
3076 { 1000, PrivMode_MouseX11 }, 3154 { 1000, PrivMode_MouseX11 },
3077 { 1010, PrivMode_TtyOutputInh }, 3155 { 1010, PrivMode_TtyOutputInh },
3078 { 1011, PrivMode_Keypress }, 3156 { 1011, PrivMode_Keypress },
3079 { 1047, PrivMode_Screen }, 3157 { 1047, PrivMode_Screen },
3080 }; 3158 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3159 };
3081 3160
3082 if (nargs == 0) 3161 if (nargs == 0)
3083 return; 3162 return;
3084 3163
3085/* make lo/hi boolean */ 3164 /* make lo/hi boolean */
3086 if (mode == 'l') 3165 if (mode == 'l')
3087 mode = 0; /* reset */ 3166 mode = 0; /* reset */
3088 else if (mode == 'h') 3167 else if (mode == 'h')
3089 mode = 1; /* set */ 3168 mode = 1; /* set */
3090 3169
3091 for (i = 0; i < nargs; i++) { 3170 for (i = 0; i < nargs; i++)
3171 {
3092 state = -1; 3172 state = -1;
3093 3173
3094 /* basic handling */ 3174 /* basic handling */
3095 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3175 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3096 if (argtopriv[j].argval == arg[i]) { 3176 if (argtopriv[j].argval == arg[i])
3177 {
3097 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3178 state = privcases (mode, argtopriv[j].bit);
3098 break; 3179 break;
3099 } 3180 }
3100 3181
3101 /* extra handling for values with state unkept */ 3182 /* extra handling for values with state unkept */
3102 if (state == -1) 3183 if (state == -1)
3103 switch (arg[i]) { 3184 switch (arg[i])
3185 {
3104 case 1048: /* alternative cursor save */ 3186 case 1048: /* alternative cursor save */
3105 if (mode == 0) 3187 if (mode == 0)
3106 rxvt_scr_cursor(aR_ RESTORE); 3188 scr_cursor (RESTORE);
3107 else if (mode == 1) 3189 else if (mode == 1)
3108 rxvt_scr_cursor(aR_ SAVE); 3190 scr_cursor (SAVE);
3109 /* FALLTHROUGH */ 3191 /* FALLTHROUGH */
3110 default: 3192 default:
3111 continue; /* for(;i;) */ 3193 continue; /* for (;i;) */
3112 } 3194 }
3113 3195
3114 /* extra handling for values with valid 0 or 1 state */ 3196 /* extra handling for values with valid 0 or 1 state */
3115 switch (arg[i]) { 3197 switch (arg[i])
3198 {
3116 /* case 1: - application cursor keys */ 3199 /* case 1: - application cursor keys */
3117 case 2: /* VT52 mode */ 3200 case 2: /* VT52 mode */
3118 /* oddball mode. should be set regardless of set/reset 3201 /* oddball mode. should be set regardless of set/reset
3119 * parameter. Return from VT52 mode with an ESC < from 3202 * parameter. Return from VT52 mode with an ESC < from
3120 * within VT52 mode 3203 * within VT52 mode
3121 */ 3204 */
3122 PrivMode(1, PrivMode_vt52); 3205 PrivMode (1, PrivMode_vt52);
3123 break; 3206 break;
3124 case 3: /* 80/132 */ 3207 case 3: /* 80/132 */
3125 if (R->PrivateModes & PrivMode_132OK) 3208 if (PrivateModes & PrivMode_132OK)
3126 rxvt_set_widthheight(aR_ 3209 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3127 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3210 break;
3128 (unsigned int)R->TermWin.height);
3129 break;
3130 case 4: /* smooth scrolling */ 3211 case 4: /* smooth scrolling */
3131 if (state) 3212 if (state)
3132 R->Options &= ~Opt_jumpScroll; 3213 Options &= ~Opt_jumpScroll;
3133 else 3214 else
3134 R->Options |= Opt_jumpScroll; 3215 Options |= Opt_jumpScroll;
3135 break; 3216 break;
3136 case 5: /* reverse video */ 3217 case 5: /* reverse video */
3137 rxvt_scr_rvideo_mode(aR_ state); 3218 scr_rvideo_mode (state);
3138 break; 3219 break;
3139 case 6: /* relative/absolute origins */ 3220 case 6: /* relative/absolute origins */
3140 rxvt_scr_relative_origin(aR_ state); 3221 scr_relative_origin (state);
3141 break; 3222 break;
3142 case 7: /* autowrap */ 3223 case 7: /* autowrap */
3143 rxvt_scr_autowrap(aR_ state); 3224 scr_autowrap (state);
3144 break; 3225 break;
3145 /* case 8: - auto repeat, can't do on a per window basis */ 3226 /* case 8: - auto repeat, can't do on a per window basis */
3146 case 9: /* X10 mouse reporting */ 3227 case 9: /* X10 mouse reporting */
3147 if (state) /* orthogonal */ 3228 if (state) /* orthogonal */
3148 R->PrivateModes &= ~(PrivMode_MouseX11); 3229 PrivateModes &= ~ (PrivMode_MouseX11);
3149 break; 3230 break;
3150#ifdef menuBar_esc 3231#ifdef menuBar_esc
3151 case menuBar_esc: 3232 case menuBar_esc:
3152#ifdef MENUBAR 3233#ifdef MENUBAR
3153 rxvt_map_menuBar(aR_ state); 3234 map_menuBar (state);
3154#endif 3235#endif
3155 break; 3236 break;
3156#endif 3237#endif
3157#ifdef scrollBar_esc 3238#ifdef scrollBar_esc
3158 case scrollBar_esc: 3239 case scrollBar_esc:
3159 if (rxvt_scrollbar_mapping(aR_ state)) { 3240 if (scrollbar_mapping (state))
3160 rxvt_resize_all_windows(aR_ 0, 0, 0); 3241 {
3161 rxvt_scr_touch(aR_ True); 3242 resize_all_windows (0, 0, 0);
3162 } 3243 scr_touch (true);
3163 break; 3244 }
3245 break;
3164#endif 3246#endif
3165 case 25: /* visible/invisible cursor */ 3247 case 25: /* visible/invisible cursor */
3166 rxvt_scr_cursor_visible(aR_ state); 3248 scr_cursor_visible (state);
3167 break; 3249 break;
3168 /* case 35: - shift keys */ 3250 /* case 35: - shift keys */
3169 /* case 40: - 80 <--> 132 mode */ 3251 /* case 40: - 80 <--> 132 mode */
3170 case 47: /* secondary screen */ 3252 case 47: /* secondary screen */
3171 rxvt_scr_change_screen(aR_ state); 3253 scr_change_screen (state);
3172 break; 3254 break;
3173 /* case 66: - application key pad */ 3255 /* case 66: - application key pad */
3174 /* case 67: - backspace key */ 3256 /* case 67: - backspace key */
3175 case 1000: /* X11 mouse reporting */ 3257 case 1000: /* X11 mouse reporting */
3176 if (state) /* orthogonal */ 3258 if (state) /* orthogonal */
3177 R->PrivateModes &= ~(PrivMode_MouseX10); 3259 PrivateModes &= ~ (PrivMode_MouseX10);
3178 break; 3260 break;
3179#if 0 3261#if 0
3180 case 1001: 3262 case 1001:
3181 break; /* X11 mouse highlighting */ 3263 break; /* X11 mouse highlighting */
3182#endif 3264#endif
3183 case 1010: /* scroll to bottom on TTY output inhibit */ 3265 case 1010: /* scroll to bottom on TTY output inhibit */
3184 if (state) 3266 if (state)
3185 R->Options &= ~Opt_scrollTtyOutput; 3267 Options &= ~Opt_scrollTtyOutput;
3186 else 3268 else
3187 R->Options |= Opt_scrollTtyOutput; 3269 Options |= Opt_scrollTtyOutput;
3188 break; 3270 break;
3189 case 1011: /* scroll to bottom on key press */ 3271 case 1011: /* scroll to bottom on key press */
3190 if (state) 3272 if (state)
3191 R->Options |= Opt_scrollTtyKeypress; 3273 Options |= Opt_scrollTtyKeypress;
3192 else 3274 else
3193 R->Options &= ~Opt_scrollTtyKeypress; 3275 Options &= ~Opt_scrollTtyKeypress;
3194 break; 3276 break;
3195 case 1047: /* secondary screen w/ clearing */ 3277 case 1047: /* secondary screen w/ clearing */
3278 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3196 if (R->current_screen != PRIMARY) 3279 if (current_screen != PRIMARY)
3197 rxvt_scr_erase_screen(aR_ 2); 3280 scr_erase_screen (2);
3198 rxvt_scr_change_screen(aR_ state); 3281 scr_change_screen (state);
3199 /* FALLTHROUGH */ 3282 /* FALLTHROUGH */
3200 default: 3283 default:
3201 break; 3284 break;
3202 } 3285 }
3203 } 3286 }
3204} 3287}
3205/*}}} */ 3288/*}}} */
3206 3289
3207/*{{{ process sgr sequences */ 3290/*{{{ process sgr sequences */
3208/* INTPROTO */
3209void 3291void
3210rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3292rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3211{ 3293{
3212 unsigned int i; 3294 unsigned int i;
3213 short rendset; 3295 short rendset;
3214 int rendstyle; 3296 int rendstyle;
3215 3297
3216 if (nargs == 0) { 3298 if (nargs == 0)
3217 rxvt_scr_rendition(aR_ 0, ~RS_None);
3218 return;
3219 } 3299 {
3300 scr_rendition (0, ~RS_None);
3301 return;
3302 }
3220 for (i = 0; i < nargs; i++) { 3303 for (i = 0; i < nargs; i++)
3304 {
3221 rendset = -1; 3305 rendset = -1;
3222 switch (arg[i]) { 3306 switch (arg[i])
3223 case 0: 3307 {
3308 case 0:
3224 rendset = 0, rendstyle = ~RS_None; 3309 rendset = 0, rendstyle = ~RS_None;
3225 break; 3310 break;
3226 case 1: 3311 case 1:
3227 rendset = 1, rendstyle = RS_Bold; 3312 rendset = 1, rendstyle = RS_Bold;
3228 break; 3313 break;
3229 case 4: 3314 case 4:
3230 rendset = 1, rendstyle = RS_Uline; 3315 rendset = 1, rendstyle = RS_Uline;
3231 break; 3316 break;
3232 case 5: 3317 case 5:
3233 rendset = 1, rendstyle = RS_Blink; 3318 rendset = 1, rendstyle = RS_Blink;
3234 break; 3319 break;
3235 case 7: 3320 case 7:
3236 rendset = 1, rendstyle = RS_RVid; 3321 rendset = 1, rendstyle = RS_RVid;
3237 break; 3322 break;
3238 case 22: 3323 case 22:
3239 rendset = 0, rendstyle = RS_Bold; 3324 rendset = 0, rendstyle = RS_Bold;
3240 break; 3325 break;
3241 case 24: 3326 case 24:
3242 rendset = 0, rendstyle = RS_Uline; 3327 rendset = 0, rendstyle = RS_Uline;
3243 break; 3328 break;
3244 case 25: 3329 case 25:
3245 rendset = 0, rendstyle = RS_Blink; 3330 rendset = 0, rendstyle = RS_Blink;
3246 break; 3331 break;
3247 case 27: 3332 case 27:
3248 rendset = 0, rendstyle = RS_RVid; 3333 rendset = 0, rendstyle = RS_RVid;
3249 break; 3334 break;
3250 } 3335 }
3251 if (rendset != -1) { 3336 if (rendset != -1)
3252 rxvt_scr_rendition(aR_ rendset, rendstyle); 3337 {
3338 scr_rendition (rendset, rendstyle);
3253 continue; /* for(;i;) */ 3339 continue; /* for (;i;) */
3254 } 3340 }
3255 3341
3256 switch (arg[i]) { 3342 switch (arg[i])
3257 case 30: 3343 {
3344 case 30:
3258 case 31: /* set fg color */ 3345 case 31: /* set fg color */
3259 case 32: 3346 case 32:
3260 case 33: 3347 case 33:
3261 case 34: 3348 case 34:
3262 case 35: 3349 case 35:
3263 case 36: 3350 case 36:
3264 case 37: 3351 case 37:
3265 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3266 Color_fg); 3353 Color_fg);
3267 break; 3354 break;
3268#ifdef TTY_256COLOR 3355#ifdef TTY_256COLOR
3269 case 38: 3356 case 38:
3270 if (nargs > i + 2 && arg[i + 1] == 5) { 3357 if (nargs > i + 2 && arg[i + 1] == 5)
3358 {
3271 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3359 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3272 Color_fg); 3360 Color_fg);
3273 i += 2; 3361 i += 2;
3274 } 3362 }
3275 break; 3363 break;
3276#endif 3364#endif
3277 case 39: /* default fg */ 3365 case 39: /* default fg */
3278 rxvt_scr_color(aR_ Color_fg, Color_fg); 3366 scr_color (Color_fg, Color_fg);
3279 break; 3367 break;
3280 3368
3281 case 40: 3369 case 40:
3282 case 41: /* set bg color */ 3370 case 41: /* set bg color */
3283 case 42: 3371 case 42:
3284 case 43: 3372 case 43:
3285 case 44: 3373 case 44:
3286 case 45: 3374 case 45:
3287 case 46: 3375 case 46:
3288 case 47: 3376 case 47:
3289 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3377 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3290 Color_bg); 3378 Color_bg);
3291 break; 3379 break;
3292#ifdef TTY_256COLOR 3380#ifdef TTY_256COLOR
3293 case 48: 3381 case 48:
3294 if (nargs > i + 2 && arg[i + 1] == 5) { 3382 if (nargs > i + 2 && arg[i + 1] == 5)
3383 {
3295 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3296 Color_bg); 3385 Color_bg);
3297 i += 2; 3386 i += 2;
3298 } 3387 }
3299 break; 3388 break;
3300#endif 3389#endif
3301 case 49: /* default bg */ 3390 case 49: /* default bg */
3302 rxvt_scr_color(aR_ Color_bg, Color_bg); 3391 scr_color (Color_bg, Color_bg);
3303 break; 3392 break;
3304 3393
3305#ifndef NO_BRIGHTCOLOR 3394#ifndef NO_BRIGHTCOLOR
3306 case 90: 3395 case 90:
3307 case 91: /* set bright fg color */ 3396 case 91: /* set bright fg color */
3308 case 92: 3397 case 92:
3309 case 93: 3398 case 93:
3310 case 94: 3399 case 94:
3311 case 95: 3400 case 95:
3312 case 96: 3401 case 96:
3313 case 97: 3402 case 97:
3314 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3315 Color_fg); 3404 Color_fg);
3316 break; 3405 break;
3317 case 100: 3406 case 100:
3318 case 101: /* set bright bg color */ 3407 case 101: /* set bright bg color */
3319 case 102: 3408 case 102:
3320 case 103: 3409 case 103:
3321 case 104: 3410 case 104:
3322 case 105: 3411 case 105:
3323 case 106: 3412 case 106:
3324 case 107: 3413 case 107:
3325 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3326 Color_bg); 3415 Color_bg);
3327 break; 3416 break;
3328#endif 3417#endif
3329 } 3418
3419 }
3330 } 3420 }
3331} 3421}
3332/*}}} */ 3422/*}}} */
3333 3423
3334/*{{{ process Rob Nation's own graphics mode sequences */ 3424/*{{{ process Rob Nation's own graphics mode sequences */
3335/* INTPROTO */
3336void 3425void
3337rxvt_process_graphics(pR) 3426rxvt_term::process_graphics ()
3338{ 3427{
3339 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3428 unsigned char ch, cmd = cmd_getc ();
3340 3429
3341#ifndef RXVT_GRAPHICS 3430 if (cmd == 'Q')
3342 if (cmd == 'Q') { /* query graphics */ 3431 { /* query graphics */
3343 R->tt_printf("\033G0\n"); /* no graphics */ 3432 tt_printf ("\033G0\n"); /* no graphics */
3344 return; 3433 return;
3345 } 3434 }
3346/* swallow other graphics sequences until terminating ':' */ 3435 /* swallow other graphics sequences until terminating ':' */
3347 do 3436 do
3348 ch = rxvt_cmd_getc(aR); 3437 ch = cmd_getc ();
3349 while (ch != ':'); 3438 while (ch != ':');
3350#else
3351 unsigned int nargs;
3352 int args[NGRX_PTS];
3353 unsigned char *text = NULL;
3354
3355 if (cmd == 'Q') { /* query graphics */
3356 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3357 return;
3358 }
3359 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3360 int neg;
3361
3362 ch = rxvt_cmd_getc(aR);
3363 neg = (ch == '-');
3364 if (neg || ch == '+')
3365 ch = rxvt_cmd_getc(aR);
3366
3367 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3368 args[nargs] = args[nargs] * 10 + (ch - '0');
3369 if (neg)
3370 args[nargs] = -args[nargs];
3371
3372 nargs++;
3373 args[nargs] = 0;
3374 if (ch != ';')
3375 break;
3376 }
3377
3378 if ((cmd == 'T') && (nargs >= 5)) {
3379 int i, len = args[4];
3380
3381 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3382
3383 if (text != NULL) {
3384 for (i = 0; i < len; i++)
3385 text[i] = rxvt_cmd_getc(aR);
3386 text[len] = '\0';
3387 }
3388 }
3389 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3390#endif
3391} 3439}
3392/*}}} */ 3440/*}}} */
3393 3441
3394/* ------------------------------------------------------------------------- */ 3442/* ------------------------------------------------------------------------- */
3395 3443
3396/* 3444/*
3397 * Send printf() formatted output to the command. 3445 * Send printf () formatted output to the command.
3398 * Only use for small amounts of data. 3446 * Only use for small amounts of data.
3399 */ 3447 */
3400void 3448void
3401rxvt_term::tt_printf (const char *fmt,...) 3449rxvt_term::tt_printf (const char *fmt,...)
3402{ 3450{
… …
3420 3468
3421 if (len) 3469 if (len)
3422 { 3470 {
3423 if (v_buflen == 0) 3471 if (v_buflen == 0)
3424 { 3472 {
3425 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3426 if (written == len) 3475 if ((unsigned int)written == len)
3427 return; 3476 return;
3428 3477
3429 data += written; 3478 data += written;
3430 len -= written; 3479 len -= written;
3431 } 3480 }

Diff Legend

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