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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.30 by pcg, Thu Feb 12 01:53:25 2004 UTC

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

Diff Legend

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