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.21 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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