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.16 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.55 by pcg, Sun Feb 22 20:08:18 2004 UTC

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

Diff Legend

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