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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines