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.23 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.53 by pcg, Sun Feb 22 12:34:53 2004 UTC

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

Diff Legend

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