ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.7 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.43 by pcg, Tue Feb 24 00:02:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.7 2003/11/26 10:42:34 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb) 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
71{ 103{
72 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
73} 105}
74 106
75rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
76{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
126
77 delete PixColors; 127 delete PixColors;
128
129 displays.put (display);
130
131 scr_release ();
132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
137 free (locale);
138 free (codeset);
139
140 delete envv;
141 delete argv;
142}
143
144void
145rxvt_term::destroy ()
146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 }
163
164 check_ev.stop ();
165 pty_ev.stop ();
166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
170 text_blink_ev.stop ();
171#endif
172#ifdef POINTER_BLANK
173 pointer_ev.stop ();
174#endif
175
176 destroy_ev.start (0);
177}
178
179void
180rxvt_term::destroy_cb (time_watcher &w)
181{
182 SET_R (this);
183
184 delete this;
78} 185}
79 186
80/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
81/* rxvt_init() */ 188/* rxvt_init () */
82/* LIBPROTO */ 189/* LIBPROTO */
83rxvt_t 190rxvt_t
84rxvt_init(int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
85{ 192{
86 SET_R(new rxvt_term); 193 SET_R (new rxvt_term);
87 dR;
88 194
89 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
90 { 196 {
91 delete R; 197 delete GET_R;
92 return NULL; 198 SET_R (0);
93 } 199 }
94 200
95 return R; 201 return GET_R;
202}
203
204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
206void
207rxvt_init_signals ()
208{
209 /* install exit handler for cleanup */
210#if 0
211#ifdef HAVE_ATEXIT
212 atexit (rxvt_clean_exit);
213#else
214#endif
215#endif
216
217 struct sigaction sa;
218
219 sigfillset (&sa.sa_mask);
220 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
221 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
222 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
227
228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
229 /* signal (SIGURG, SIG_DFL); */
230
231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
96} 233}
97 234
98bool 235bool
99rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
100{ 237{
101 dR;//TODO (scrollbar, setidle)
102
103 /* 238 /*
104 * Save and then give up any super-user privileges 239 * Save and then give up any super-user privileges
105 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
106 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
107 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
108 * 2. chown tty on some systems 243 * 2. chown tty on some systems
109 */ 244 */
110 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
111 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
112 247
113 rxvt_init_secondary (this); 248 init_secondary ();
114 249
115 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
251
252 set_locale ("");
116 253
117#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
118 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
119#endif 256#endif
120#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
121 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
122 scrollbar_setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
123#endif 260#endif
124 261
125 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
126 263
127 rxvt_init_xlocale (this); 264 init_xlocale ();
128 265
129 rxvt_scr_reset (this); /* initialize screen */ 266 scr_reset (); /* initialize screen */
130#ifdef RXVT_GRAPHICS
131 rxvt_Gr_reset (this); /* reset graphics */
132#endif
133 267
134#if 0 268#if 0
135#ifdef DEBUG_X
136 XSynchronize(Xdisplay, True); 269 XSynchronize (display->display, True);
137 XSetErrorHandler((XErrorHandler) abort);
138#else
139 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
140#endif
141#endif 270#endif
142 271
143#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
144 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
145 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
146#endif 275#endif
147#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
148 if (menubar_visible(r)) 277 if (menubar_visible ())
149 XMapWindow (Xdisplay, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
150#endif 279#endif
151#ifdef TRANSPARENT 280#ifdef TRANSPARENT
152 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
153 { 282 {
154 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 283 XSelectInput (display->display, display->root, PropertyChangeMask);
155 rxvt_check_our_parents (this); 284 check_our_parents ();
156 } 285 }
157#endif 286#endif
287
288 rootwin_ev.start (display, display->root);
289
158 XMapWindow (Xdisplay, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
159 XMapWindow (Xdisplay, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
160 292
161 rxvt_init_env (this);
162 rxvt_init_command (this, cmd_argv); 293 init_command (cmd_argv);
163 294
164 x_ev.start (Xfd, EVENT_READ);
165 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
166 296
167 flush (); 297 check_ev.start ();
168 298
169 return true; 299 return true;
170} 300}
171 301
172/* ------------------------------------------------------------------------- * 302/* ------------------------------------------------------------------------- *
176 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
177 */ 307 */
178/* ARGSUSED */ 308/* ARGSUSED */
179/* EXTPROTO */ 309/* EXTPROTO */
180RETSIGTYPE 310RETSIGTYPE
181rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
182{ 312{
183 dR;
184 int pid, save_errno = errno; 313 int pid, save_errno = errno;
185
186 do {
187 errno = 0;
188 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
189 315 ;
190 if (pid == R->cmd_pid)
191 exit(EXIT_SUCCESS);
192
193 errno = save_errno; 316 errno = save_errno;
194 signal(SIGCHLD, rxvt_Child_signal); 317
318#if 0
319 if (pid == cmd_pid)
320 exit (EXIT_SUCCESS);
321#endif
195} 322}
196 323
197/* 324/*
198 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
199 */ 326 */
200/* EXTPROTO */ 327/* EXTPROTO */
201RETSIGTYPE 328RETSIGTYPE
202rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
203{ 330{
204 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
205#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
206 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
207#endif 334#endif
208 rxvt_clean_exit(); 335 rxvt_clean_exit ();
209 kill(getpid(), sig); 336 kill (getpid (), sig);
210} 337}
211 338
212/* ARGSUSED */
213/* INTPROTO */ 339/* INTPROTO */
214int 340int
215rxvt_xerror_handler(const Display * display 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
216 __attribute__ ((unused)), const XErrorEvent * event)
217{ 342{
218 dR;
219
220 if (R->allowedxerror == -1) { 343 if (GET_R->allowedxerror == -1)
221 R->allowedxerror = event->error_code; 344 GET_R->allowedxerror = event->error_code;
222 return 0; /* ignored anyway */ 345 else
223 } 346 {
224 rxvt_print_error("XError: Request: %d . %d, Error: %d", 347 old_xerror_handler (display, event);
225 event->request_code, event->minor_code, 348 GET_R->destroy ();
226 event->error_code); 349 }
227/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 350
228 exit(EXIT_FAILURE); 351 return 0;
229/* NOTREACHED */
230} 352}
231 353
232/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
233/* 355/*
234 * Exit gracefully, clearing the utmp entry and restoring tty attributes 356 * Exit gracefully, clearing the utmp entry and restoring tty attributes
235 * TODO: if debugging, this should free up any known resources if we can 357 * TODO: if debugging, this should free up any known resources if we can
236 */ 358 */
237/* EXTPROTO */ 359/* EXTPROTO */
238void 360void
239rxvt_clean_exit(void) 361rxvt_clean_exit ()
240{ 362{
241 dR; 363 // TODO: rxvtd should clean up all ressources
242 364 if (GET_R)
243#ifdef DEBUG_SCREEN 365 GET_R->destroy ();
244 rxvt_scr_release(aR);
245#endif
246#ifndef NO_SETOWNER_TTYDEV
247 rxvt_privileged_ttydev(aR_ RESTORE);
248#endif
249#ifdef UTMP_SUPPORT
250 rxvt_privileged_utmp(aR_ RESTORE);
251#endif
252#ifdef USE_XIM
253 if (R->Input_Context != NULL) {
254 XDestroyIC(R->Input_Context);
255 R->Input_Context = NULL;
256 }
257#endif
258} 366}
259 367
260/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
261 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
262 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
263/* EXTPROTO */ 371/* EXTPROTO */
264void * 372void *
265rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
266{ 374{
267 void *p; 375 void *p;
268 376
269 p = malloc(size); 377 p = malloc (size);
270 if (p) 378 if (p)
271 return p; 379 return p;
272 380
273 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
274 rxvt_clean_exit(); 382 rxvt_clean_exit ();
275 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
276/* NOTREACHED */ 384 /* NOTREACHED */
277} 385}
278 386
279/* EXTPROTO */ 387/* EXTPROTO */
280void * 388void *
281rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
282{ 390{
283 void *p; 391 void *p;
284 392
285 p = calloc(number, size); 393 p = calloc (number, size);
286 if (p) 394 if (p)
287 return p; 395 return p;
288 396
289 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
290 rxvt_clean_exit(); 398 rxvt_clean_exit ();
291 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
292/* NOTREACHED */ 400 /* NOTREACHED */
293} 401}
294 402
295/* EXTPROTO */ 403/* EXTPROTO */
296void * 404void *
297rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
298{ 406{
299 void *p; 407 void *p;
300 408
301 if (ptr) 409 if (ptr)
302 p = realloc(ptr, size); 410 p = realloc (ptr, size);
303 else 411 else
304 p = malloc(size); 412 p = malloc (size);
305 if (p) 413 if (p)
306 return p; 414 return p;
307 415
308 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
309 rxvt_clean_exit(); 417 rxvt_clean_exit ();
310 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
311/* NOTREACHED */ 419 /* NOTREACHED */
312} 420}
313 421
314/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
315 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
316 * ------------------------------------------------------------------------- */ 424 * ------------------------------------------------------------------------- */
317/* take care of suid/sgid super-user (root) privileges */ 425/* take care of suid/sgid super-user (root) privileges */
318/* INTPROTO */
319void 426void
320rxvt_privileges(pR_ int mode) 427rxvt_term::privileges (int mode)
321{ 428{
322#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
323# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
324/* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
325# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
326# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
327# define HAVE_SETEUID 434# define HAVE_SETEUID
328# endif 435# endif
329# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
330 switch (mode) { 437 switch (mode)
438 {
331 case IGNORE: 439 case IGNORE:
332 /* 440 /*
333 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
334 * back to root later, as required 442 * back to root later, as required
335 */ 443 */
336 seteuid(getuid()); 444 seteuid (getuid ());
337 setegid(getgid()); 445 setegid (getgid ());
338 break; 446 break;
339 case SAVE: 447 case SAVE:
340 R->euid = geteuid(); 448 euid = geteuid ();
341 R->egid = getegid(); 449 egid = getegid ();
342 break; 450 break;
343 case RESTORE: 451 case RESTORE:
344 seteuid(R->euid); 452 seteuid (euid);
345 setegid(R->egid); 453 setegid (egid);
346 break; 454 break;
347 } 455 }
348# else 456# else
349 switch (mode) { 457 switch (mode)
458 {
350 case IGNORE: 459 case IGNORE:
351 setuid(getuid()); 460 setuid (getuid ());
352 setgid(getgid()); 461 setgid (getgid ());
353 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
354 case SAVE: 463 case SAVE:
355 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
356 case RESTORE: 465 case RESTORE:
357 break; 466 break;
358 } 467 }
359# endif 468# endif
360#endif 469#endif
361} 470}
362 471
363#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
364/* EXTPROTO */
365void 473void
366rxvt_privileged_utmp(pR_ char action) 474rxvt_term::privileged_utmp (char action)
367{ 475{
368 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
369 action, R->next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
370 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
371 || (R->Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
372 || R->ttydev == NULL || *R->ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
373 return; 481 return;
374 482
375 rxvt_privileges(aR_ RESTORE); 483 privileges (RESTORE);
376 if (action == SAVE) { 484 if (action == SAVE)
485 {
377 R->next_utmp_action = RESTORE; 486 next_utmp_action = RESTORE;
378 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 487 makeutent (ttydev, rs[Rs_display_name]);
488 }
489 else
379 } else { /* action == RESTORE */ 490 { /* action == RESTORE */
380 R->next_utmp_action = IGNORE; 491 next_utmp_action = IGNORE;
381 rxvt_cleanutent(aR); 492 cleanutent ();
382 } 493 }
383 rxvt_privileges(aR_ IGNORE); 494 privileges (IGNORE);
384} 495}
385#endif 496#endif
386 497
387#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
388/* EXTPROTO */
389void 499void
390rxvt_privileged_ttydev(pR_ char action) 500rxvt_term::privileged_ttydev (char action)
391{ 501{
392 D_MAIN((stderr, 502 D_MAIN ((stderr,
393 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
394 action, R->next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
395 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
396 || R->ttydev == NULL || *R->ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
397 return; 507 return;
398 508
399 rxvt_privileges(aR_ RESTORE); 509 privileges (RESTORE);
400 510
401 if (action == SAVE) { 511 if (action == SAVE)
512 {
402 R->next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
403# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
404/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
405 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
406 R->next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
407 else 518 else
408# endif 519# endif
520
409 { 521 {
410 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
411 chmod(R->ttydev, R->ttymode); 523 chmod (ttydev, ttymode);
412# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
413 revoke(R->ttydev); 525 revoke (ttydev);
414# endif 526# endif
527
415 } 528 }
529 }
530 else
416 } else { /* action == RESTORE */ 531 { /* action == RESTORE */
417 R->next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
418# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
419 chmod(R->ttydev, R->ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
420 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
421# else 536# else
422 chmod(R->ttydev, 537 chmod (ttydev,
423 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
424 chown(R->ttydev, 0, 0); 539 chown (ttydev, 0, 0);
425# endif 540# endif
426 }
427 541
542 }
543
428 rxvt_privileges(aR_ IGNORE); 544 privileges (IGNORE);
429 545
430# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
431 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
432 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
433 SAVE ? "Saving" : 549 SAVE ? "Saving" :
434 "UNKNOWN ERROR for"), R->ttydev, 550 "UNKNOWN ERROR for"), ttydev,
435 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
436 R->ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
437# endif 553# endif
438} 554}
439#endif 555#endif
440 556
441/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
442/* 558/*
443 * window size/position calculcations for XSizeHint and other storage. 559 * window size/position calculcations for XSizeHint and other storage.
444 * if width/height are non-zero then override calculated width/height 560 * if width/height are non-zero then override calculated width/height
445 */ 561 */
446/* EXTPROTO */
447void 562void
448rxvt_window_calc(pR_ unsigned int width, unsigned int height) 563rxvt_term::window_calc (unsigned int width, unsigned int height)
449{ 564{
450 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
451 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
452 unsigned int w, h; 567 unsigned int w, h;
453 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
454 569
455 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
456 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
457 R->szHint.height)); 572 szHint.height));
458 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
459 R->szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
460/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
461 576
462 recalc_x = recalc_y = 0; 577 recalc_x = recalc_y = 0;
463 flags = 0; 578 flags = 0;
464 if (!R->parsed_geometry) { 579 if (!parsed_geometry)
580 {
465 R->parsed_geometry = 1; 581 parsed_geometry = 1;
466 if (R->rs[Rs_geometry]) 582 if (rs[Rs_geometry])
467 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
468 if (flags & WidthValue) { 584 if (flags & WidthValue)
585 {
469 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
470 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
471 } 588 }
472 if (flags & HeightValue) { 589 if (flags & HeightValue)
590 {
473 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
474 R->szHint.flags |= USSize; 592 szHint.flags |= USSize;
475 } 593 }
476 if (flags & XValue) { 594 if (flags & XValue)
595 {
477 R->szHint.x = x; 596 szHint.x = x;
478 R->szHint.flags |= USPosition; 597 szHint.flags |= USPosition;
479 if (flags & XNegative) { 598 if (flags & XNegative)
599 {
480 recalc_x = 1; 600 recalc_x = 1;
481 R->szHint.win_gravity = NorthEastGravity; 601 szHint.win_gravity = NorthEastGravity;
482 } 602 }
483 } 603 }
484 if (flags & YValue) { 604 if (flags & YValue)
605 {
485 R->szHint.y = y; 606 szHint.y = y;
486 R->szHint.flags |= USPosition; 607 szHint.flags |= USPosition;
487 if (flags & YNegative) { 608 if (flags & YNegative)
609 {
488 recalc_y = 1; 610 recalc_y = 1;
489 if (R->szHint.win_gravity == NorthEastGravity) 611 if (szHint.win_gravity == NorthEastGravity)
490 R->szHint.win_gravity = SouthEastGravity; 612 szHint.win_gravity = SouthEastGravity;
491 else 613 else
492 R->szHint.win_gravity = SouthWestGravity; 614 szHint.win_gravity = SouthWestGravity;
493 } 615 }
494 } 616 }
495 } 617 }
496/* TODO: BOUNDS */ 618 /* TODO: BOUNDS */
497 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 619 TermWin.width = TermWin.ncol * TermWin.fwidth;
498 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 620 TermWin.height = TermWin.nrow * TermWin.fheight;
499 max_width = MAX_COLS * R->TermWin.fwidth; 621 max_width = MAX_COLS * TermWin.fwidth;
500 max_height = MAX_ROWS * R->TermWin.fheight; 622 max_height = MAX_ROWS * TermWin.fheight;
501 623
502 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
503 625
504 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
505 R->window_vt_x = R->window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
506 if (scrollbar_visible(R)) { 628 if (scrollbar_visible ())
629 {
507 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
508 R->szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
509 if (!(R->Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
510 R->window_vt_x = sb_w; 633 window_vt_x = sb_w;
511 } 634 }
512 if (menubar_visible(R)) { 635 if (menubar_visible ())
636 {
513 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
514 R->szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
515 R->window_vt_y = mb_h; 639 window_vt_y = mb_h;
516 } 640 }
517 R->szHint.width_inc = R->TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
518 R->szHint.height_inc = R->TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
519 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 643 szHint.min_width = szHint.base_width + szHint.width_inc;
520 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 644 szHint.min_height = szHint.base_height + szHint.height_inc;
521 645
522 if (width && width - R->szHint.base_width < max_width) { 646 if (width && width - szHint.base_width < max_width)
647 {
523 R->szHint.width = width; 648 szHint.width = width;
524 R->TermWin.width = width - R->szHint.base_width; 649 TermWin.width = width - szHint.base_width;
525 } else { 650 }
651 else
652 {
526 MIN_IT(R->TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
527 R->szHint.width = R->szHint.base_width + R->TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
528 } 655 }
529 if (height && height - R->szHint.base_height < max_height) { 656 if (height && height - szHint.base_height < max_height)
657 {
530 R->szHint.height = height; 658 szHint.height = height;
531 R->TermWin.height = height - R->szHint.base_height; 659 TermWin.height = height - szHint.base_height;
532 } else { 660 }
661 else
662 {
533 MIN_IT(R->TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
534 R->szHint.height = R->szHint.base_height + R->TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
535 } 665 }
536 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
537 R->window_sb_x = R->szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
538 668
539 if (recalc_x) 669 if (recalc_x)
540 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
541 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 671 - szHint.width - 2 * TermWin.ext_bwidth);
542 if (recalc_y) 672 if (recalc_y)
543 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
544 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
545 675
546 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
547 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
548 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
549 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
550 R->szHint.height)); 680 szHint.height));
551 return; 681 return;
552} 682}
553 683
554/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
555/* 685/*
556 * Tell the teletype handler what size the window is. 686 * Tell the teletype handler what size the window is.
557 * Called after a window size change. 687 * Called after a window size change.
558 */ 688 */
559/* EXTPROTO */
560void 689void
561rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 690rxvt_term::tt_winch ()
562{ 691{
563 struct winsize ws; 692 struct winsize ws;
564 693
565 if (fd < 0) 694 if (cmd_fd < 0)
566 return; 695 return;
696
567 ws.ws_col = col; 697 ws.ws_col = TermWin.ncol;
568 ws.ws_row = row; 698 ws.ws_row = TermWin.nrow;
569 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
570#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
571 (void)ioctl(fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
572#else 702#else
573 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
574 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
575 }
576# ifdef SIGWINCH 705# ifdef SIGWINCH
577 else if (pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
578 kill(pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
579# endif 708# endif
580#endif 709#endif
581} 710}
582 711
583/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
584/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
585/* 714/*
586 * init = 1 - initialize 715 * init = 1 - initialize
587 * 716 *
588 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
589 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
590 */ 719 */
591/* EXTPROTO */ 720bool
592void
593rxvt_change_font(pR_ int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
594{ 722{
595} 723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
596 734
597/* INTPROTO */ 735 if (fs && fs->populate (fontname))
598void 736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0])
746 {
747 resize_all_windows (0, 0, 0);
748 scr_remap_chars ();
749 scr_touch (true);
750 }
751
752 return true;
753 }
754 }
755
756 return false;
757}
758
759bool
599rxvt_font_up_down(pR_ int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
600{ 761{
762 return false;
601} 763}
602 764
603/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
604/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
605/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
606/* EXTPROTO */
607void 768void
608rxvt_set_title(pR_ const char *str) 769rxvt_term::set_title (const char *str)
609{ 770{
610#ifndef SMART_WINDOW_TITLE 771#ifndef SMART_WINDOW_TITLE
611 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
612#else 773#else
613 char *name; 774 char *name;
614 775
615 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
616 name = NULL; 777 name = NULL;
617 if (name == NULL || STRCMP(name, str)) 778 if (name == NULL || STRCMP (name, str))
618 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
619 if (name) 780 if (name)
620 XFree(name); 781 XFree (name);
621#endif 782#endif
622} 783}
623 784
624/* EXTPROTO */
625void 785void
626rxvt_set_iconName(pR_ const char *str) 786rxvt_term::set_iconName (const char *str)
627{ 787{
628#ifndef SMART_WINDOW_TITLE 788#ifndef SMART_WINDOW_TITLE
629 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
630#else 790#else
631 char *name; 791 char *name;
632 792
633 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 793 if (XGetIconName (display->display, TermWin.parent[0], &name))
634 name = NULL; 794 name = NULL;
635 if (name == NULL || STRCMP(name, str)) 795 if (name == NULL || STRCMP (name, str))
636 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
637 if (name) 797 if (name)
638 XFree(name); 798 XFree (name);
639#endif 799#endif
640} 800}
641 801
642#ifdef XTERM_COLOR_CHANGE 802#ifdef XTERM_COLOR_CHANGE
643/* EXTPROTO */
644void 803void
645rxvt_set_window_color(pR_ int idx, const char *color) 804rxvt_term::set_window_color (int idx, const char *color)
646{ 805{
647 rxvt_color xcol; 806 rxvt_color xcol;
648 int i; 807 int i;
649 808
650 if (color == NULL || *color == '\0') 809 if (color == NULL || *color == '\0')
651 return; 810 return;
652 811
653/* handle color aliases */ 812 /* handle color aliases */
654 if (isdigit(*color)) { 813 if (isdigit (*color))
814 {
655 i = atoi(color); 815 i = atoi (color);
816 if (i >= 8 && i <= 15)
656 if (i >= 8 && i <= 15) { /* bright colors */ 817 { /* bright colors */
657 i -= 8; 818 i -= 8;
658# ifndef NO_BRIGHTCOLOR 819# ifndef NO_BRIGHTCOLOR
659 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 820 PixColors[idx] = PixColors[minBrightCOLOR + i];
660 SET_PIXCOLOR(R, idx); 821 SET_PIXCOLOR (idx);
661 goto Done; 822 goto Done;
662# endif 823# endif
824
663 } 825 }
664 if (i >= 0 && i <= 7) { /* normal colors */ 826 if (i >= 0 && i <= 7)
827 { /* normal colors */
665 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 828 PixColors[idx] = PixColors[minCOLOR + i];
666 SET_PIXCOLOR(R, idx); 829 SET_PIXCOLOR (idx);
667 goto Done; 830 goto Done;
668 } 831 }
669 } 832 }
670 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 833 if (!rXParseAllocColor (& xcol, color))
671 return; 834 return;
672/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 835 /* XStoreColor (display->display, XCMAP, XColor*); */
673 836
674/* 837 /*
675 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
676 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
677 */ 840 */
678# if 0 841# if 0
679 for (i = Color_Black; i <= Color_White; i++) 842 for (i = Color_Black; i <= Color_White; i++)
680 if (R->PixColors[idx] == R->PixColors[i]) 843 if (PixColors[idx] == PixColors[i])
681 break; 844 break;
682 if (i > Color_White) { 845 if (i > Color_White)
846 {
683 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
684 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
685 DisplayPlanes(R->Xdisplay, Xscreen)); 849 DisplayPlanes (display->display, display->screen));
686 } 850 }
687# endif 851# endif
688 852
689 R->PixColors[idx] = xcol; 853 PixColors[idx] = xcol;
690 SET_PIXCOLOR(R, idx); 854 SET_PIXCOLOR (idx);
691 855
692/* XSetWindowAttributes attr; */ 856 /* XSetWindowAttributes attr; */
693/* Cursor cursor; */ 857 /* Cursor cursor; */
694 Done: 858Done:
695 if (idx == Color_bg && !(R->Options & Opt_transparent)) 859 if (idx == Color_bg && ! (Options & Opt_transparent))
696 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 860 XSetWindowBackground (display->display, TermWin.vt,
697 R->PixColors[Color_bg]); 861 PixColors[Color_bg]);
698 862
699/* handle Color_BD, scrollbar background, etc. */ 863 /* handle Color_BD, scrollbar background, etc. */
700 864
701 rxvt_set_colorfgbg(aR); 865 set_colorfgbg ();
702 rxvt_recolour_cursor(aR); 866 recolour_cursor ();
703/* the only reasonable way to enforce a clean update */ 867 /* the only reasonable way to enforce a clean update */
704 rxvt_scr_poweron(aR); 868 scr_poweron ();
705} 869}
706 870
707#else 871#else
708# define rxvt_set_window_color(aR_ idx,color) ((void)0) 872# define set_window_color (idx,color) ((void)0)
709#endif /* XTERM_COLOR_CHANGE */ 873#endif /* XTERM_COLOR_CHANGE */
710 874
711/* EXTPROTO */
712void 875void
713rxvt_recolour_cursor(pR) 876rxvt_term::recolour_cursor ()
714{ 877{
715 rxvt_color xcol[2];
716
717#if TODO 878#if TODO
879 rxvt_color xcol[2];
880
718 xcol[0] = R->PixColors[Color_pointer]; 881 xcol[0] = PixColors[Color_pointer];
719 xcol[1] = R->PixColors[Color_bg]; 882 xcol[1] = PixColors[Color_bg];
720 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 883 XQueryColors (display->display, XCMAP, xcol, 2);
721 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
722#endif 885#endif
723} 886}
724 887
725/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
726/* 889/*
727 * find if fg/bg matches any of the normal (low-intensity) colors 890 * find if fg/bg matches any of the normal (low-intensity) colors
728 */ 891 */
729/* INTPROTO */
730void 892void
731rxvt_set_colorfgbg(pR) 893rxvt_term::set_colorfgbg ()
732{ 894{
733 unsigned int i; 895 unsigned int i;
734 const char *xpmb = "\0"; 896 const char *xpmb = "\0";
735 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 897 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
736 898
737 R->env_colorfgbg = 899 env_colorfgbg =
738 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 900 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
739 STRCPY(fstr, "default"); 901 STRCPY (fstr, "default");
740 STRCPY(bstr, "default"); 902 STRCPY (bstr, "default");
741 for (i = Color_Black; i <= Color_White; i++) 903 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[Color_fg] == R->PixColors[i]) { 904 if (PixColors[Color_fg] == PixColors[i])
905 {
743 sprintf(fstr, "%d", (i - Color_Black)); 906 sprintf (fstr, "%d", (i - Color_Black));
744 break; 907 break;
745 } 908 }
746 for (i = Color_Black; i <= Color_White; i++) 909 for (i = Color_Black; i <= Color_White; i++)
747 if (R->PixColors[Color_bg] == R->PixColors[i]) { 910 if (PixColors[Color_bg] == PixColors[i])
911 {
748 sprintf(bstr, "%d", (i - Color_Black)); 912 sprintf (bstr, "%d", (i - Color_Black));
749#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
750 xpmb = "default;"; 914 xpmb = "default;";
751#endif 915#endif
752 break; 916 break;
753 } 917 }
918
754 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
755 putenv(R->env_colorfgbg);
756 920
757#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
758 R->colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
759 for (i = minCOLOR; i <= maxCOLOR; i++) { 923 for (i = minCOLOR; i <= maxCOLOR; i++)
924 {
760 if (R->PixColors[Color_fg] == R->PixColors[i]) 925 if (PixColors[Color_fg] == PixColors[i])
761 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 926 colorfgbg = SET_FGCOLOR (colorfgbg, i);
762 if (R->PixColors[Color_bg] == R->PixColors[i]) 927 if (PixColors[Color_bg] == PixColors[i])
763 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 928 colorfgbg = SET_BGCOLOR (colorfgbg, i);
764 } 929 }
765#endif 930#endif
766} 931}
767 932
768/*----------------------------------------------------------------------*/ 933/*----------------------------------------------------------------------*/
769/* 934/*
770 * Colour determination for low colour displays, routine from 935 * Colour determination for low colour displays, routine from
771 * Hans de Goede <hans@highrise.nl> 936 * Hans de Goede <hans@highrise.nl>
772 */ 937 */
773 938
774/* EXTPROTO */
775int 939int
776rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
777{ 941{
778 screen_in_out->set(aR_ colour);
779
780 if (!screen_in_out->set(aR_ colour)) { 942 if (!screen_in_out->set (display, colour))
943 {
781 rxvt_print_error("can't allocate colour: %s", colour); 944 rxvt_print_error ("can't allocate colour: %s", colour);
782 return false; 945 return false;
783 } 946 }
784 947
785 return true; 948 return true;
786} 949}
787 950
788/* -------------------------------------------------------------------- * 951/* -------------------------------------------------------------------- *
789 * - WINDOW RESIZING - * 952 * - WINDOW RESIZING - *
790 * -------------------------------------------------------------------- */ 953 * -------------------------------------------------------------------- */
791/* EXTPROTO */
792void 954void
793rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 955rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
794 int ignoreparent)
795{ 956{
796 int fix_screen; 957 int fix_screen;
797 958
798#ifdef SMART_RESIZE 959#ifdef SMART_RESIZE
799 int old_width = R->szHint.width, old_height = R->szHint.height; 960 int old_width = szHint.width, old_height = szHint.height;
800#endif 961#endif
801 962
802 rxvt_window_calc(aR_ width, height); 963 window_calc (width, height);
803 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
804 if (!ignoreparent) { 965 if (!ignoreparent)
966 {
805#ifdef SMART_RESIZE 967#ifdef SMART_RESIZE
806/* 968 /*
807 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
808 * reposition window on resize depending on placement on screen 970 * reposition window on resize depending on placement on screen
809 */ 971 */
810 int x, y, x1, y1; 972 int x, y, x1, y1;
811 int dx, dy; 973 int dx, dy;
812 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 974 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
813 Window unused_cr; 975 Window unused_cr;
814 976
815 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 977 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
816 0, 0, &x, &y, &unused_cr); 978 0, 0, &x, &y, &unused_cr);
817 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 979 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
818 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 980 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
819 /* 981 /*
820 * if Xroot isn't the parent window, a WM will probably have offset 982 * if display->root isn't the parent window, a WM will probably have offset
821 * our position for handles and decorations. Counter it 983 * our position for handles and decorations. Counter it
822 */ 984 */
823 if (x1 != x || y1 != y) { 985 if (x1 != x || y1 != y)
986 {
824 x -= x1; 987 x -= x1;
825 y -= y1; 988 y -= y1;
826 } 989 }
827 990
828 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 991 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
829 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 992 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
830 dx = old_width - R->szHint.width; 993 dx = old_width - szHint.width;
831 dy = old_height - R->szHint.height; 994 dy = old_height - szHint.height;
832 995
833 /* Check position of the center of the window */ 996 /* Check position of the center of the window */
834 if (x < x1) /* left half */ 997 if (x < x1) /* left half */
835 dx = 0; 998 dx = 0;
836 else if (x == x1) /* exact center */ 999 else if (x == x1) /* exact center */
837 dx /= 2; 1000 dx /= 2;
838 if (y < y1) /* top half */ 1001 if (y < y1) /* top half */
839 dy = 0; 1002 dy = 0;
840 else if (y == y1) /* exact center */ 1003 else if (y == y1) /* exact center */
841 dy /= 2; 1004 dy /= 2;
842 1005
843 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
844 R->szHint.width, R->szHint.height); 1007 szHint.width, szHint.height);
845#else 1008#else
846 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
847 R->szHint.height); 1010 szHint.height);
848#endif 1011#endif
849 }
850 1012
1013 }
1014
851 fix_screen = (R->TermWin.ncol != R->prev_ncol 1015 fix_screen = (TermWin.ncol != prev_ncol
852 || R->TermWin.nrow != R->prev_nrow); 1016 || TermWin.nrow != prev_nrow);
1017
853 if (fix_screen || width != R->old_width || height != R->old_height) { 1018 if (fix_screen || width != old_width || height != old_height)
1019 {
854 if (scrollbar_visible(R)) { 1020 if (scrollbar_visible ())
1021 {
855 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
856 0, scrollbar_TotalWidth(), R->szHint.height); 1023 0, scrollbar_TotalWidth (), szHint.height);
857 rxvt_Resize_scrollBar(aR); 1024 resize_scrollbar ();
858 } 1025 }
1026
859 if (menubar_visible(R)) 1027 if (menubar_visible ())
860 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
861 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030
862 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
863 R->window_vt_y, TermWin_TotalWidth(), 1032 window_vt_y, TermWin_TotalWidth (),
864 TermWin_TotalHeight()); 1033 TermWin_TotalHeight ());
865#ifdef RXVT_GRAPHICS
866 if (R->old_height)
867 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
868 R->old_height - R->szHint.base_height);
869#endif
870 rxvt_scr_clear(aR); 1034 scr_clear ();
871#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
872 rxvt_resize_pixmap(aR); 1036 resize_pixmap ();
873#endif 1037#endif
874 }
875 1038
1039 }
1040
876 if (fix_screen || R->old_height == 0) { 1041 if (fix_screen || old_height == 0)
1042 {
877 int curr_screen = -1; 1043 int curr_screen = -1;
878 uint16_t old_ncol = R->prev_ncol; 1044 int old_ncol = prev_ncol;
879 1045
880 /* scr_reset only works on the primary screen */ 1046 /* scr_reset only works on the primary screen */
881 if (R->old_height) /* this is not the first time through */ 1047 if (old_height) /* this is not the first time through */
1048 {
1049 unsigned int ncol = TermWin.ncol;
1050 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
882 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1051 curr_screen = scr_change_screen (PRIMARY);
883 rxvt_scr_reset(aR); 1052 TermWin.ncol = ncol;
884 if (curr_screen >= 0) { /* this is not the first time through */
885 rxvt_scr_change_screen(aR_ curr_screen);
886 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
887 } 1053 }
888 }
889 1054
1055 scr_reset ();
1056
1057 if (curr_screen >= 0) /* this is not the first time through */
1058 {
1059 scr_change_screen (curr_screen);
1060 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1061 }
1062 }
1063
890 R->old_width = R->szHint.width; 1064 old_width = szHint.width;
891 R->old_height = R->szHint.height; 1065 old_height = szHint.height;
892 1066
893#ifdef USE_XIM 1067#ifdef USE_XIM
894 rxvt_IMSetStatusPosition(aR); 1068 IMSetStatusPosition ();
895#endif 1069#endif
896} 1070}
897 1071
898/* 1072/*
899 * Set the width/height of the vt window in characters. Units are pixels. 1073 * Set the width/height of the vt window in characters. Units are pixels.
900 * good for toggling 80/132 columns 1074 * good for toggling 80/132 columns
901 */ 1075 */
902/* EXTPROTO */
903void 1076void
904rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1077rxvt_term::set_widthheight (unsigned int width, unsigned int height)
905{ 1078{
906 XWindowAttributes wattr; 1079 XWindowAttributes wattr;
907 1080
908 if (width == 0 || height == 0) { 1081 if (width == 0 || height == 0)
1082 {
909 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1083 XGetWindowAttributes (display->display, display->root, &wattr);
910 if (width == 0) 1084 if (width == 0)
911 width = wattr.width - R->szHint.base_width; 1085 width = wattr.width - szHint.base_width;
912 if (height == 0) 1086 if (height == 0)
913 height = wattr.height - R->szHint.base_height; 1087 height = wattr.height - szHint.base_height;
914 } 1088 }
915 if (width != R->TermWin.width || height != R->TermWin.height) { 1089 if (width != TermWin.width || height != TermWin.height)
1090 {
916 width += R->szHint.base_width; 1091 width += szHint.base_width;
917 height += R->szHint.base_height; 1092 height += szHint.base_height;
918 rxvt_resize_all_windows(aR_ width, height, 0); 1093 resize_all_windows (width, height, 0);
919 } 1094 }
920} 1095}
921 1096
922/* -------------------------------------------------------------------- * 1097/* -------------------------------------------------------------------- *
923 * - X INPUT METHOD ROUTINES - * 1098 * - X INPUT METHOD ROUTINES - *
924 * -------------------------------------------------------------------- */ 1099 * -------------------------------------------------------------------- */
925#ifdef USE_XIM 1100#ifdef USE_XIM
926/* INTPROTO */ 1101
927void 1102void
928rxvt_setSize(pR_ XRectangle * size) 1103rxvt_term::im_set_size (XRectangle *size)
929{ 1104{
930 size->x = R->TermWin.int_bwidth; 1105 size->x = TermWin.int_bwidth;
931 size->y = R->TermWin.int_bwidth; 1106 size->y = TermWin.int_bwidth;
932 size->width = Width2Pixel(R->TermWin.ncol); 1107 size->width = Width2Pixel (TermWin.ncol);
933 size->height = Height2Pixel(R->TermWin.nrow); 1108 size->height = Height2Pixel (TermWin.nrow);
934} 1109}
935 1110
936/* INTPROTO */
937void 1111void
938rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1112rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
939{ 1113{
940 *fg = R->PixColors[Color_fg]; 1114 *fg = PixColors[Color_fg];
941 *bg = R->PixColors[Color_bg]; 1115 *bg = PixColors[Color_bg];
942} 1116}
943 1117
944/* Checking whether input method is running. */ 1118/* Checking whether input method is running. */
945/* INTPROTO */
946Bool 1119bool
947rxvt_IMisRunning(pR) 1120rxvt_term::IMisRunning ()
948{ 1121{
949 char *p; 1122 char *p;
950 Atom atom; 1123 Atom atom;
951 Window win; 1124 Window win;
952 char server[IMBUFSIZ]; 1125 char server[IMBUFSIZ];
953 1126
954/* get current locale modifier */ 1127 /* get current locale modifier */
955 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1128 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1129 {
956 STRCPY(server, "@server="); 1130 STRCPY (server, "@server=");
957 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1131 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
958 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1132 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
959 *p = '\0'; 1133 *p = '\0';
960 1134
961 atom = XInternAtom(R->Xdisplay, server, False); 1135 atom = XInternAtom (display->display, server, False);
962 win = XGetSelectionOwner(R->Xdisplay, atom); 1136 win = XGetSelectionOwner (display->display, atom);
963 if (win != None) 1137 if (win != None)
964 return True; 1138 return True;
965 } 1139 }
966 return False; 1140 return False;
967} 1141}
968 1142
969/* EXTPROTO */
970void 1143void
971rxvt_IMSendSpot(pR) 1144rxvt_term::IMSendSpot ()
972{ 1145{
973 XPoint spot; 1146 XPoint spot;
974 XVaNestedList preedit_attr; 1147 XVaNestedList preedit_attr;
975 1148
976 if (R->Input_Context == NULL 1149 if (Input_Context == NULL
977 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1150 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
978 || !(R->event_type == KeyPress 1151 || ! (event_type == KeyPress
979 || R->event_type == Expose 1152 || event_type == Expose
980 || R->event_type == NoExpose 1153 || event_type == NoExpose
981 || R->event_type == SelectionNotify 1154 || event_type == SelectionNotify
982 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1155 || event_type == ButtonRelease || event_type == FocusIn)
983 || !rxvt_IMisRunning(aR)) 1156 || !IMisRunning ())
984 return; 1157 return;
985 1158
986 rxvt_setPosition(aR_ & spot); 1159 im_set_position (&spot);
987 1160
988 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1161 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
989 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1162 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
990 XFree(preedit_attr); 1163 XFree (preedit_attr);
991} 1164}
992 1165
993/* EXTPROTO */
994void 1166void
995rxvt_setTermFontSet(pR_ int idx)
996{
997 char *string;
998 long length;
999 int success = 0;
1000
1001 if (idx < 0 || idx >= MAX_NFONTS)
1002 return;
1003}
1004
1005/* INTPROTO */
1006void
1007rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1167rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1008 XRectangle * needed_rect) 1168 XRectangle * needed_rect)
1009{ 1169{
1010 int mbh, vtx = 0; 1170 int mbh, vtx = 0;
1011 1171
1012 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1172 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1013 vtx = scrollbar_TotalWidth(); 1173 vtx = scrollbar_TotalWidth ();
1174
1014 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1175 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1015 mbh -= R->TermWin.lineSpace; 1176 mbh -= TermWin.lineSpace;
1016 1177
1017 preedit_rect->x = needed_rect->width + vtx; 1178 preedit_rect->x = needed_rect->width + vtx;
1018 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1179 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1019 1180
1020 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1181 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1021 + vtx;
1022 preedit_rect->height = Height2Pixel(1); 1182 preedit_rect->height = Height2Pixel (1);
1023 1183
1024 status_rect->x = vtx; 1184 status_rect->x = vtx;
1025 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1185 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1026 1186
1027 status_rect->width = needed_rect->width ? needed_rect->width 1187 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1028 : Width2Pixel(R->TermWin.ncol + 1);
1029 status_rect->height = Height2Pixel(1); 1188 status_rect->height = Height2Pixel (1);
1030} 1189}
1031 1190
1032/* ARGSUSED */
1033/* INTPROTO */
1034void 1191void
1035rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1192rxvt_term::im_destroy ()
1036 __attribute__ ((unused)), XPointer call_data
1037 __attribute__ ((unused)))
1038{ 1193{
1039 dR; 1194 if (Input_Context)
1040 1195 {
1196 XDestroyIC (Input_Context);
1041 R->Input_Context = NULL; 1197 Input_Context = NULL;
1042/* To avoid Segmentation Fault in C locale: Solaris only? */ 1198 }
1043 if (STRCMP(R->locale, "C"))
1044 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1045 rxvt_IMInstantiateCallback, NULL);
1046}
1047 1199
1048/* 1200 if (input_method)
1049 * X manual pages and include files don't match on some systems:
1050 * some think this is an XIDProc and others an XIMProc so we can't
1051 * use the first argument - need to update this to be nice for
1052 * both types via some sort of configure detection
1053 */
1054/* ARGSUSED */
1055/* EXTPROTO */
1056void
1057rxvt_IMInstantiateCallback(Display * unused
1058 __attribute__ ((unused)), XPointer client_data
1059 __attribute__ ((unused)), XPointer call_data
1060 __attribute__ ((unused)))
1061{
1062 dR;
1063 int i, found, had_im;
1064 const char *p;
1065 char **s;
1066 char buf[IMBUFSIZ];
1067
1068 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1069 if (R->Input_Context)
1070 return;
1071
1072 found = had_im = 0;
1073 p = R->rs[Rs_inputMethod];
1074 if (p && *p) {
1075 had_im = 1;
1076 s = rxvt_splitcommastring(p);
1077 for (i = 0; s[i]; i++) {
1078 if (*s[i]) {
1079 STRCPY(buf, "@im=");
1080 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1081 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1082 && (rxvt_IM_get_IC(aR) == True)) {
1083 found = 1;
1084 break;
1085 }
1086 }
1087 }
1088 for (i = 0; s[i]; i++)
1089 free(s[i]);
1090 free(s);
1091 } 1201 {
1092 if (found) 1202 display->put_xim (input_method);
1093 return; 1203 input_method = 0;
1094
1095/* try with XMODIFIERS env. var. */
1096 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1097 rxvt_IM_get_IC(aR);
1098 return;
1099 } 1204 }
1100
1101/* try with no modifiers base IF the user didn't specify an IM */
1102 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1103 && rxvt_IM_get_IC(aR) == True)
1104 return;
1105} 1205}
1106 1206
1107/* 1207/*
1108 * Try to open a XIM with the current modifiers, then see if we can 1208 * Try to open a XIM with the current modifiers, then see if we can
1109 * open a suitable preedit type 1209 * open a suitable preedit type
1110 */ 1210 */
1111/* INTPROTO */
1112Bool 1211bool
1113rxvt_IM_get_IC(pR) 1212rxvt_term::IM_get_IC (const char *modifiers)
1114{ 1213{
1115 int i, j, found; 1214 int i, j, found;
1116 XIM xim; 1215 XIM xim;
1117 XPoint spot; 1216 XPoint spot;
1118 XRectangle rect, status_rect, needed_rect; 1217 XRectangle rect, status_rect, needed_rect;
1119 unsigned long fg, bg; 1218 unsigned long fg, bg;
1120 const char *p; 1219 const char *p;
1121 char **s; 1220 char **s;
1122 XIMStyles *xim_styles; 1221 XIMStyles *xim_styles;
1123 XVaNestedList preedit_attr, status_attr; 1222 XVaNestedList preedit_attr, status_attr;
1124 XIMCallback ximcallback;
1125 1223
1224 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1225 return false;
1226
1126 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1227 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1127 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1228 input_method = display->get_xim (locale, modifiers);
1128 if (xim == NULL) 1229 if (input_method == NULL)
1129 return False; 1230 return false;
1130 1231
1232 xim = input_method->xim;
1233
1131 xim_styles = NULL; 1234 xim_styles = NULL;
1132 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1235 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1133 || !xim_styles || !xim_styles->count_styles) { 1236 || !xim_styles || !xim_styles->count_styles)
1134 XCloseIM(xim); 1237 {
1238 display->put_xim (input_method);
1135 return False; 1239 return false;
1136 } 1240 }
1137 1241
1138 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1242 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1139 : "OverTheSpot,OffTheSpot,Root";
1140 s = rxvt_splitcommastring(p); 1243 s = rxvt_splitcommastring (p);
1141 for (i = found = 0; !found && s[i]; i++) { 1244 for (i = found = 0; !found && s[i]; i++)
1245 {
1142 if (!STRCMP(s[i], "OverTheSpot")) 1246 if (!STRCMP (s[i], "OverTheSpot"))
1143 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1247 input_style = (XIMPreeditPosition | XIMStatusNothing);
1144 else if (!STRCMP(s[i], "OffTheSpot")) 1248 else if (!STRCMP (s[i], "OffTheSpot"))
1145 R->input_style = (XIMPreeditArea | XIMStatusArea); 1249 input_style = (XIMPreeditArea | XIMStatusArea);
1146 else if (!STRCMP(s[i], "Root")) 1250 else if (!STRCMP (s[i], "Root"))
1147 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1251 input_style = (XIMPreeditNothing | XIMStatusNothing);
1148 1252
1149 for (j = 0; j < xim_styles->count_styles; j++) 1253 for (j = 0; j < xim_styles->count_styles; j++)
1150 if (R->input_style == xim_styles->supported_styles[j]) { 1254 if (input_style == xim_styles->supported_styles[j])
1255 {
1151 found = 1; 1256 found = 1;
1257 break;
1258 }
1259 }
1260
1261 for (i = 0; s[i]; i++)
1262 free (s[i]);
1263
1264 free (s);
1265 XFree (xim_styles);
1266
1267 if (!found)
1268 {
1269 display->put_xim (input_method);
1270 return false;
1271 }
1272
1273 preedit_attr = status_attr = NULL;
1274
1275 if (input_style & XIMPreeditPosition)
1276 {
1277 im_set_size (&rect);
1278 im_set_position (&spot);
1279 im_set_color (&fg, &bg);
1280
1281 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1282 XNSpotLocation, &spot,
1283 XNForeground, fg, XNBackground, bg,
1284 //XNFontSet, TermWin.fontset,
1285 NULL);
1286 }
1287 else if (input_style & XIMPreeditArea)
1288 {
1289 im_set_color (&fg, &bg);
1290
1291 /*
1292 * The necessary width of preedit area is unknown
1293 * until create input context.
1294 */
1295 needed_rect.width = 0;
1296
1297 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1298
1299 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1300 XNForeground, fg, XNBackground, bg,
1301 //XNFontSet, TermWin.fontset,
1302 NULL);
1303 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1304 XNForeground, fg, XNBackground, bg,
1305 //XNFontSet, TermWin.fontset,
1306 NULL);
1307 }
1308
1309 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1310 XNClientWindow, TermWin.parent[0],
1311 XNFocusWindow, TermWin.parent[0],
1312 preedit_attr ? XNPreeditAttributes : NULL,
1313 preedit_attr,
1314 status_attr ? XNStatusAttributes : NULL,
1315 status_attr, NULL);
1316 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr);
1318
1319 if (Input_Context == NULL)
1320 {
1321 rxvt_print_error ("failed to create input context");
1322 display->put_xim (input_method);
1323 return false;
1324 }
1325
1326 if (input_style & XIMPreeditArea)
1327 IMSetStatusPosition ();
1328
1329 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1330 return true;
1331}
1332
1333void
1334rxvt_term::im_cb ()
1335{
1336 int i, found, had_im;
1337 const char *p;
1338 char **s;
1339 char buf[IMBUFSIZ];
1340
1341 im_destroy ();
1342
1343 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1344 if (Input_Context)
1345 return;
1346
1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1348 if (rs[Rs_imLocale])
1349 SET_LOCALE (rs[Rs_imLocale]);
1350#endif
1351
1352 p = rs[Rs_inputMethod];
1353 if (p && *p)
1354 {
1355 bool found = false;
1356
1357 s = rxvt_splitcommastring (p);
1358 for (i = 0; s[i]; i++)
1359 {
1360 if (*s[i])
1361 {
1362 STRCPY (buf, "@im=");
1363 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1364 if (IM_get_IC (buf))
1365 {
1366 found = true;
1152 break; 1367 break;
1368 }
1153 } 1369 }
1154 } 1370 }
1155 for (i = 0; s[i]; i++) 1371 for (i = 0; s[i]; i++)
1156 free(s[i]); 1372 free (s[i]);
1157 free(s); 1373 free (s);
1158 XFree(xim_styles);
1159 1374
1160 if (!found) { 1375 if (found)
1161 XCloseIM(xim); 1376 goto done;
1162 return False;
1163 } 1377 }
1164 1378
1165 ximcallback.callback = rxvt_IMDestroyCallback; 1379 /* try with XMODIFIERS env. var. */
1380 if (IM_get_IC (""))
1381 goto done;
1166 1382
1167/* XXX: not sure why we need this (as well as IC one below) */ 1383 /* try with no modifiers base IF the user didn't specify an IM */
1168 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1384 if (IM_get_IC ("@im=none"))
1385 goto done;
1169 1386
1170 preedit_attr = status_attr = NULL; 1387done:
1171 1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1172 if (R->input_style & XIMPreeditPosition) { 1389 if (rs[Rs_imLocale])
1173 rxvt_setSize(aR_ & rect); 1390 SET_LOCALE (locale);
1174 rxvt_setPosition(aR_ & spot); 1391#endif
1175 rxvt_setColor(aR_ & fg, &bg);
1176
1177 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1178 XNSpotLocation, &spot,
1179 XNForeground, fg, XNBackground, bg,
1180 //XNFontSet, R->TermWin.fontset,
1181 NULL);
1182 } else if (R->input_style & XIMPreeditArea) {
1183 rxvt_setColor(aR_ & fg, &bg);
1184
1185 /*
1186 * The necessary width of preedit area is unknown
1187 * until create input context.
1188 */
1189 needed_rect.width = 0;
1190
1191 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1192
1193 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1194 XNForeground, fg, XNBackground, bg,
1195 //XNFontSet, R->TermWin.fontset,
1196 NULL);
1197 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1198 XNForeground, fg, XNBackground, bg,
1199 //XNFontSet, R->TermWin.fontset,
1200 NULL);
1201 }
1202 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1203 XNClientWindow, R->TermWin.parent[0],
1204 XNFocusWindow, R->TermWin.parent[0],
1205 XNDestroyCallback, &ximcallback,
1206 preedit_attr ? XNPreeditAttributes : NULL,
1207 preedit_attr,
1208 status_attr ? XNStatusAttributes : NULL,
1209 status_attr, NULL);
1210 if (preedit_attr)
1211 XFree(preedit_attr);
1212 if (status_attr)
1213 XFree(status_attr);
1214 if (R->Input_Context == NULL) {
1215 rxvt_print_error("failed to create input context");
1216 XCloseIM(xim);
1217 return False;
1218 }
1219 if (R->input_style & XIMPreeditArea)
1220 rxvt_IMSetStatusPosition(aR);
1221 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1222 return True;
1223} 1392}
1224 1393
1225/* EXTPROTO */
1226void 1394void
1227rxvt_IMSetStatusPosition(pR) 1395rxvt_term::IMSetStatusPosition ()
1228{ 1396{
1229 XRectangle preedit_rect, status_rect, *needed_rect; 1397 XRectangle preedit_rect, status_rect, *needed_rect;
1230 XVaNestedList preedit_attr, status_attr; 1398 XVaNestedList preedit_attr, status_attr;
1231 1399
1232 if (R->Input_Context == NULL 1400 if (Input_Context == NULL
1233 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1401 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1234 || !rxvt_IMisRunning(aR)) 1402 || !IMisRunning ())
1235 return; 1403 return;
1236 1404
1237/* Getting the necessary width of preedit area */ 1405 /* Getting the necessary width of preedit area */
1238 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1239 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1407 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1240 XFree(status_attr); 1408 XFree (status_attr);
1241 1409
1242 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1410 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1243 1411
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1412 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1245 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1246 1414
1247 XSetICValues(R->Input_Context, 1415 XSetICValues (Input_Context,
1248 XNPreeditAttributes, preedit_attr, 1416 XNPreeditAttributes, preedit_attr,
1249 XNStatusAttributes, status_attr, NULL); 1417 XNStatusAttributes, status_attr, NULL);
1250 1418
1251 XFree(preedit_attr); 1419 XFree (preedit_attr);
1252 XFree(status_attr); 1420 XFree (status_attr);
1253} 1421}
1254#endif /* USE_XIM */ 1422#endif /* USE_XIM */
1255 1423
1256/*----------------------------------------------------------------------*/ 1424/*----------------------------------------------------------------------*/
1257rxvt_t rxvt_current_term; 1425rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines