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.25 by pcg, Fri Dec 19 09:41:09 2003 UTC vs.
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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