[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
		61	int size = strlen (locale) + 1;
		62
		63	if (size > sizeof (curlocale))
		64	rxvt_fatal ("locale string too long, aborting.\n");
		65
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	66	if (!locale \|\| !memcmp (locale, curlocale, size))
59	return false;	67	return false;
60		68
61	strncpy (curlocale, locale, 128);	69	memcpy (curlocale, locale, size);
62	setlocale (LC_CTYPE, curlocale);	70	setlocale (LC_CTYPE, curlocale);
63	return true;	71	return true;
64	}	72	}
65		73
66	void	74	void
67	rxvt_push_locale (const char *locale)	75	rxvt_push_locale (const char *locale) NOTHROW
68	{	76	{
69	strcpy (savelocale, curlocale);	77	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	78	rxvt_set_locale (locale);
71	}	79	}
72		80
73	void	81	void
74	rxvt_pop_locale ()	82	rxvt_pop_locale () NOTHROW
75	{	83	{
76	rxvt_set_locale (savelocale);	84	rxvt_set_locale (savelocale);
77	}	85	}
78		86
79	#if ENABLE_COMBINING	87	#if ENABLE_COMBINING
…		…
140	}	148	}
141	#endif	149	#endif
142		150
143	rxvt_term::rxvt_term ()	151	rxvt_term::rxvt_term ()
144	:	152	:
145	#if TRANSPARENT	153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	154	rootwin_ev (this, &rxvt_term::rootwin_cb),
		155	#endif
		156	#if ENABLE_TRANSPARENCY
		157	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
147	#endif	158	#endif
148	#ifdef HAVE_SCROLLBARS	159	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	160	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	161	#endif
151	#ifdef CURSOR_BLINK	162	#ifdef CURSOR_BLINK
…		…
167	pointer_ev (this, &rxvt_term::pointer_cb),	178	pointer_ev (this, &rxvt_term::pointer_cb),
168	#endif	179	#endif
169	#ifdef USE_XIM	180	#ifdef USE_XIM
170	im_ev (this, &rxvt_term::im_cb),	181	im_ev (this, &rxvt_term::im_cb),
171	#endif	182	#endif
		183	#ifndef NO_BELL
		184	bell_ev (this, &rxvt_term::bell_cb),
		185	#endif
172	termwin_ev (this, &rxvt_term::x_cb),	186	termwin_ev (this, &rxvt_term::x_cb),
173	vt_ev (this, &rxvt_term::x_cb),	187	vt_ev (this, &rxvt_term::x_cb),
		188	child_ev (this, &rxvt_term::child_cb),
174	check_ev (this, &rxvt_term::check_cb),	189	check_ev (this, &rxvt_term::check_cb),
175	flush_ev (this, &rxvt_term::flush_cb),	190	flush_ev (this, &rxvt_term::flush_cb),
176	destroy_ev (this, &rxvt_term::destroy_cb),	191	destroy_ev (this, &rxvt_term::destroy_cb),
177	pty_ev (this, &rxvt_term::pty_cb),	192	pty_ev (this, &rxvt_term::pty_cb),
178	incr_ev (this, &rxvt_term::incr_cb)	193	incr_ev (this, &rxvt_term::incr_cb)
…		…
181		196
182	termlist.push_back (this);	197	termlist.push_back (this);
183		198
184	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
185	keyboard = new keyboard_manager;	200	keyboard = new keyboard_manager;
186
187	if (!keyboard)
188	rxvt_fatal ("out of memory, aborting.\n");
189	#endif	201	#endif
190	}	202	}
191		203
192	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
193	// for use before an emergency exit	205	// for use before an emergency exit
194	void rxvt_term::emergency_cleanup ()	206	void rxvt_term::emergency_cleanup ()
195	{	207	{
196	if (cmd_pid)	208	if (cmd_pid)
197	kill (-cmd_pid, SIGHUP);	209	kill (-cmd_pid, SIGHUP);
198		210
		211	pty_ev.stop ();
199	delete pty; pty = 0;	212	delete pty; pty = 0;
200	}	213	}
201		214
202	rxvt_term::~rxvt_term ()	215	rxvt_term::~rxvt_term ()
203	{	216	{
204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206	termlist.erase (find (termlist.begin (), termlist.end(), this));	217	termlist.erase (find (termlist.begin (), termlist.end(), this));
207		218
208	emergency_cleanup ();	219	emergency_cleanup ();
209		220
210	#if ENABLE_STYLES	221	#if ENABLE_STYLES
…		…
214	#endif	225	#endif
215	delete fontset[0];	226	delete fontset[0];
216		227
217	if (display)	228	if (display)
218	{	229	{
219	dDisp;
220
221	selection_clear ();	230	selection_clear ();
222		231
223	#ifdef USE_XIM	232	#ifdef USE_XIM
224	im_destroy ();	233	im_destroy ();
225	#endif	234	#endif
226	#ifdef XTERM_SCROLLBAR	235	#ifdef XTERM_SCROLLBAR
227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	236	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228	if (ShadowGC) XFreeGC (disp, ShadowGC);	237	if (ShadowGC) XFreeGC (dpy, ShadowGC);
229	#endif	238	#endif
230	#ifdef PLAIN_SCROLLBAR	239	#ifdef PLAIN_SCROLLBAR
231	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	240	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232	#endif	241	#endif
233	#ifdef NEXT_SCROLLBAR	242	#ifdef NEXT_SCROLLBAR
234	if (blackGC) XFreeGC (disp, blackGC);	243	if (blackGC) XFreeGC (dpy, blackGC);
235	if (whiteGC) XFreeGC (disp, whiteGC);	244	if (whiteGC) XFreeGC (dpy, whiteGC);
236	if (grayGC) XFreeGC (disp, grayGC);	245	if (grayGC) XFreeGC (dpy, grayGC);
237	if (darkGC) XFreeGC (disp, darkGC);	246	if (darkGC) XFreeGC (dpy, darkGC);
238	if (stippleGC) XFreeGC (disp, stippleGC);	247	if (stippleGC) XFreeGC (dpy, stippleGC);
239	if (dimple) XFreePixmap (disp, dimple);	248	if (dimple) XFreePixmap (dpy, dimple);
240	if (upArrow) XFreePixmap (disp, upArrow);	249	if (upArrow) XFreePixmap (dpy, upArrow);
241	if (downArrow) XFreePixmap (disp, downArrow);	250	if (downArrow) XFreePixmap (dpy, downArrow);
242	if (upArrowHi) XFreePixmap (disp, upArrowHi);	251	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243	if (downArrowHi) XFreePixmap (disp, downArrowHi);	252	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244	#endif	253	#endif
245	#ifdef RXVT_SCROLLBAR	254	#ifdef RXVT_SCROLLBAR
246	if (topShadowGC) XFreeGC (disp, topShadowGC);	255	if (topShadowGC) XFreeGC (dpy, topShadowGC);
247	if (botShadowGC) XFreeGC (disp, botShadowGC);	256	if (botShadowGC) XFreeGC (dpy, botShadowGC);
248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	257	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249	#endif	258	#endif
250	if (gc) XFreeGC (disp, gc);	259	if (gc) XFreeGC (dpy, gc);
251		260
252	delete drawable;	261	delete drawable;
253	// destroy all windows	262	// destroy all windows
254	if (parent[0])	263	if (parent[0])
255	XDestroyWindow (disp, parent[0]);	264	XDestroyWindow (dpy, parent[0]);
256	}
257		265
258	// TODO: free pixcolours, colours should become part of rxvt_display	266	for (int i = 0; i < TOTAL_COLORS; i++)
259	delete pix_colors_focused;	267	if (ISSET_PIXCOLOR (i))
		268	{
		269	pix_colors_focused [i].free (this);
260	#if OFF_FOCUS_FADING	270	#if OFF_FOCUS_FADING
		271	pix_colors_unfocused [i].free (this);
		272	#endif
		273	}
		274
		275	clear ();
		276	}
		277
		278	delete [] pix_colors_focused;
		279	#if OFF_FOCUS_FADING
261	delete pix_colors_unfocused;	280	delete [] pix_colors_unfocused;
262	#endif	281	#endif
263		282
264	displays.put (display);	283	displays.put (display);
265		284
266	scr_release ();	285	scr_release ();
…		…
269	for (int i = 0; i < allocated.size (); i++)	288	for (int i = 0; i < allocated.size (); i++)
270	free (allocated [i]);	289	free (allocated [i]);
271		290
272	free (selection.text);	291	free (selection.text);
273	// TODO: manage env vars in child only(!)	292	// TODO: manage env vars in child only(!)
274	free (env_windowid);
275	free (env_display);	293	free (env_display);
276	free (env_term);	294	free (env_term);
277	free (env_colorfgbg);
278	free (locale);	295	free (locale);
279	free (v_buffer);	296	free (v_buffer);
280	free (incr_buf);	297	free (incr_buf);
281		298
282	delete envv;	299	delete envv;
…		…
285	#ifdef KEYSYM_RESOURCE	302	#ifdef KEYSYM_RESOURCE
286	delete keyboard;	303	delete keyboard;
287	#endif	304	#endif
288	}	305	}
289		306
		307	// child has exited, usually destroys
290	void	308	void
291	rxvt_term::child_exit ()	309	rxvt_term::child_cb (child_watcher &w, int status)
292	{	310	{
		311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		312
293	cmd_pid = 0;	313	cmd_pid = 0;
294		314
295	if (!OPTION (Opt_hold))	315	if (!option (Opt_hold))
296	destroy ();	316	destroy ();
297	}	317	}
298		318
299	void	319	void
300	rxvt_term::destroy ()	320	rxvt_term::destroy ()
301	{	321	{
302	if (destroy_ev.active)	322	if (destroy_ev.active)
303	return;	323	return;
304		324
		325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		326
305	#if ENABLE_OVERLAY	327	#if ENABLE_OVERLAY
306	scr_overlay_off ();	328	scr_overlay_off ();
307	#endif	329	#endif
308		330
309	if (display)	331	if (display)
…		…
312	im_ev.stop (display);	334	im_ev.stop (display);
313	#endif	335	#endif
314	#if HAVE_SCROLLBARS	336	#if HAVE_SCROLLBARS
315	scrollbar_ev.stop (display);	337	scrollbar_ev.stop (display);
316	#endif	338	#endif
317	#if TRANSPARENT	339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
318	rootwin_ev.stop (display);	340	rootwin_ev.stop (display);
319	#endif	341	#endif
320	incr_ev.stop ();	342	incr_ev.stop ();
321	termwin_ev.stop (display);	343	termwin_ev.stop (display);
322	vt_ev.stop (display);	344	vt_ev.stop (display);
…		…
363	{	385	{
364	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	386	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365	(*t)->emergency_cleanup ();	387	(*t)->emergency_cleanup ();
366	}	388	}
367		389
368	#if ENABLE_FRILLS	390	#if !ENABLE_MINIMAL
369	static void	391	static void
370	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
371	{	393	{
372	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
373	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
…		…
421	GET_R->allowedxerror = event->error_code;	443	GET_R->allowedxerror = event->error_code;
422	else	444	else
423	{	445	{
424	// GET_R is most likely not the terminal which caused the error,	446	// GET_R is most likely not the terminal which caused the error,
425	// so just output the error and continue	447	// so just output the error and continue
426	#if ENABLE_FRILLS	448	#if ENABLE_MINIMAL
		449	old_xerror_handler (display, event);
		450	#else
427	print_x_error (display, event);	451	print_x_error (display, event);
428	#else
429	old_xerror_handler (display, event);
430	#endif	452	#endif
431	}	453	}
432		454
433	return 0;	455	return 0;
434	}	456	}
…		…
442	_exit (EXIT_FAILURE);	464	_exit (EXIT_FAILURE);
443	}	465	}
444		466
445	/----------------------------------------------------------------------/	467	/----------------------------------------------------------------------/
446	bool	468	bool
447	rxvt_term::init (int argc, const char const argv)	469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
448	{	470	{
		471	this->envv = envv;
		472
449	SET_R (this);	473	SET_R (this);
450	set_locale ("");	474	set_locale ("");
451	set_environ (envv); // few things in X do not call setlocale :(	475	set_environ (envv); // few things in X do not call setlocale :(
452		476
453	if (!init_vars ())	477	if (!init_vars ())
…		…
460	#ifdef KEYSYM_RESOURCE	484	#ifdef KEYSYM_RESOURCE
461	keyboard->register_done ();	485	keyboard->register_done ();
462	#endif	486	#endif
463		487
464	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
465	if (OPTION (Opt_scrollBar))	489	if (option (Opt_scrollBar))
466	scrollBar.setIdle (); /* set existence for size calculations */	490	scrollBar.setIdle (); /* set existence for size calculations */
467	#endif	491	#endif
468		492
		493	pty = ptytty::create ();
		494
		495	create_windows (argc, argv);
		496
		497	init_xlocale ();
		498
		499	scr_reset (); // initialize screen
		500
		501	#if 0
		502	XSynchronize (dpy, True);
		503	#endif
		504
		505	#ifdef HAVE_SCROLLBARS
		506	if (option (Opt_scrollBar))
		507	resize_scrollbar (); /* create and map scrollbar */
		508	#endif
		509	#ifdef HAVE_BG_PIXMAP
		510	{
		511	bool changed = false;
		512	bgPixmap.set_target (this);
		513
		514	#ifdef ENABLE_TRANSPARENCY
		515	if (option (Opt_transparent))
		516	{
		517	bgPixmap.set_transparent ();
		518	#ifdef HAVE_AFTERIMAGE
		519	if (rs [Rs_blurradius])
		520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		521	#endif
		522	if (ISSET_PIXCOLOR (Color_tint))
		523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		524	if (rs [Rs_shade])
		525	bgPixmap.set_shade (rs [Rs_shade]);
		526	changed = true;
		527
		528	bgPixmap.set_root_pixmap ();
		529	XSelectInput (dpy, display->root, PropertyChangeMask);
		530	rootwin_ev.start (display, display->root);
		531	}
		532	#endif
		533
		534	#ifdef XPM_BACKGROUND
		535	if (rs[Rs_backgroundPixmap] != NULL)
		536	{
		537	const char *p = rs[Rs_backgroundPixmap];
		538
		539	if ((p = strchr (p, ';')) != NULL)
		540	{
		541	p++;
		542	bgPixmap.set_geometry (p);
		543	}
		544	else
		545	bgPixmap.set_defaultGeometry ();
		546
		547	changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
		548	}
		549	#endif
		550	if (changed)
		551	{
		552	bgPixmap.render ();
		553	scr_touch (true);
		554	}
		555	}
		556	#endif
		557
469	#if ENABLE_PERL	558	#if ENABLE_PERL
470	if (!rs[Rs_perl_ext_1])
471	rs[Rs_perl_ext_1] = "default";
472
473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476	{
477	rxvt_perl.init (this);
478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479	}
480	#endif
481
482	pty = rxvt_new_ptytty ();
483
484	create_windows (argc, argv);
485
486	dDisp;
487
488	init_xlocale ();
489
490	scr_reset (); // initialize screen
491
492	#if 0
493	XSynchronize (disp, True);
494	#endif
495
496	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */
499	#endif
500	#ifdef TRANSPARENT
501	if (OPTION (Opt_transparent))
502	{
503	XSelectInput (disp, display->root, PropertyChangeMask);
504	check_our_parents ();
505	rootwin_ev.start (display, display->root);	559	rootwin_ev.start (display, display->root);
506	}
507	#endif	560	#endif
508
509	XMapWindow (disp, vt);
510	XMapWindow (disp, parent[0]);
511		561
512	set_colorfgbg ();	562	set_colorfgbg ();
513		563
514	init_command (cmd_argv);	564	init_command (cmd_argv);
515		565
…		…
520		570
521	check_ev.start ();	571	check_ev.start ();
522		572
523	HOOK_INVOKE ((this, HOOK_START, DT_END));	573	HOOK_INVOKE ((this, HOOK_START, DT_END));
524		574
		575	#if ENABLE_XEMBED
		576	if (rs[Rs_embed])
		577	{
		578	long info[2] = { 0, XEMBED_MAPPED };
		579
		580	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		581	32, PropModeReplace, (unsigned char *)&info, 2);
		582	}
		583	#endif
		584
		585	XMapWindow (dpy, vt);
		586	XMapWindow (dpy, parent[0]);
		587
525	return true;	588	return true;
526	}	589	}
527		590
528	static struct sig_handlers	591	static struct sig_handlers
529	{	592	{
530	sig_watcher sw_chld, sw_term, sw_int;	593	sig_watcher sw_term, sw_int;
531		594
532	void sig_chld (sig_watcher &w)
533	{
534	// we are being called for every SIGCHLD, find the corresponding term
535	int pid;
536
537	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539	if (pid == (*t)->cmd_pid)
540	{
541	(*t)->child_exit ();
542	break;
543	}
544	}
545
546	/*	595	/*
547	* Catch a fatal signal and tidy up before quitting	596	* Catch a fatal signal and tidy up before quitting
548	*/	597	*/
549	void	598	void
550	sig_term (sig_watcher &w)	599	sig_term (sig_watcher &w)
551	{	600	{
552	#ifdef DEBUG_CMD
553	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554	#endif
555	rxvt_emergency_cleanup ();	601	rxvt_emergency_cleanup ();
556	signal (w.signum, SIG_DFL);	602	signal (w.signum, SIG_DFL);
557	kill (getpid (), w.signum);	603	kill (getpid (), w.signum);
558	}	604	}
559		605
560	sig_handlers ()	606	sig_handlers ()
561	: sw_chld (this, &sig_handlers::sig_chld),
562	sw_term (this, &sig_handlers::sig_term),	607	: sw_term (this, &sig_handlers::sig_term),
563	sw_int (this, &sig_handlers::sig_term)	608	sw_int (this, &sig_handlers::sig_term)
564	{	609	{
565	}	610	}
566	} sig_handlers;	611	} sig_handlers;
567		612
568	char **rxvt_environ; // startup environment	613	char **rxvt_environ; // startup environment
569		614
570	void	615	void
571	rxvt_init ()	616	rxvt_init ()
572	{	617	{
573	uid_t uid = getuid ();	618	ptytty::init ();
574	gid_t gid = getgid ();
575
576	// before doing anything else, check for setuid/setgid operation,
577	// start the helper process and drop privileges
578	if (uid != geteuid ()
579	\|\| 1 //D
580	\|\| gid != getegid ())
581	{
582	#if PTYTTY_HELPER
583	rxvt_ptytty_server ();
584	#else
585	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586	#endif
587
588	// drop privileges
589	#if HAVE_SETRESUID
590	setresgid (gid, gid, gid);
591	setresuid (uid, uid, uid);
592	#elif HAVE_SETREUID
593	setregid (gid, gid);
594	setreuid (uid, uid);
595	#elif HAVE_SETUID
596	setgid (gid);
597	setuid (uid);
598	#endif
599
600	if (uid != geteuid ()
601	\|\| gid != getegid ())
602	rxvt_fatal ("unable to drop privileges, aborting.\n");
603	}
604		619
605	rxvt_environ = environ;	620	rxvt_environ = environ;
606		621
607	signal (SIGHUP, SIG_IGN);	622	signal (SIGHUP, SIG_IGN);
608	signal (SIGPIPE, SIG_IGN);	623	signal (SIGPIPE, SIG_IGN);
609		624
610	sig_handlers.sw_chld.start (SIGCHLD);
611	sig_handlers.sw_term.start (SIGTERM);	625	sig_handlers.sw_term.start (SIGTERM);
612	sig_handlers.sw_int.start (SIGINT);	626	sig_handlers.sw_int.start (SIGINT);
613		627
614	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	628	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
615	/* signal (SIGURG, SIG_DFL); */	629	/* signal (SIGURG, SIG_DFL); */
…		…
644	rxvt_fatal ("memory allocation failure. aborting.\n");	658	rxvt_fatal ("memory allocation failure. aborting.\n");
645		659
646	return p;	660	return p;
647	}	661	}
648		662
649	void *	663	void *
650	rxvt_realloc (void *ptr, size_t size)	664	rxvt_realloc (void *ptr, size_t size)
651	{	665	{
652	void *p = realloc (ptr, size);	666	void *p = realloc (ptr, size);
653		667
654	if (!p)	668	if (!p)
…		…
657	return p;	671	return p;
658	}	672	}
659		673
660	/----------------------------------------------------------------------/	674	/----------------------------------------------------------------------/
661	/*	675	/*
662	* window size/position calculcations for XSizeHint and other storage.	676	* window size/position calculations for XSizeHint and other storage.
663	* if width/height are non-zero then override calculated width/height	677	* if width/height are non-zero then override calculated width/height
664	*/	678	*/
665	void	679	void
666	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	680	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
667	{	681	{
668	short recalc_x, recalc_y;	682	short recalc_x, recalc_y;
669	int x, y, sb_w, flags;	683	int x, y, sb_w, flags;
670	unsigned int w, h;	684	unsigned int w, h;
671	unsigned int max_width, max_height;	685	unsigned int max_width, max_height;
672	dDisp;
673
674	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
675	ncol, nrow, szHint.width, szHint.height));
676		686
677	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	687	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
678	szHint.win_gravity = NorthWestGravity;	688	szHint.win_gravity = NorthWestGravity;
679	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	689	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
680		690
…		…
742		752
743	if (scrollBar.state)	753	if (scrollBar.state)
744	{	754	{
745	sb_w = scrollbar_TotalWidth ();	755	sb_w = scrollbar_TotalWidth ();
746	szHint.base_width += sb_w;	756	szHint.base_width += sb_w;
		757
747	if (!OPTION (Opt_scrollBar_right))	758	if (!option (Opt_scrollBar_right))
748	window_vt_x += sb_w;	759	window_vt_x += sb_w;
749	}	760	}
750		761
751	szHint.width_inc = fwidth;	762	szHint.width_inc = fwidth;
752	szHint.height_inc = fheight;	763	szHint.height_inc = fheight;
753	szHint.min_width = szHint.base_width + szHint.width_inc;	764	szHint.min_width = szHint.base_width + szHint.width_inc;
754	szHint.min_height = szHint.base_height + szHint.height_inc;	765	szHint.min_height = szHint.base_height + szHint.height_inc;
755		766
756	if (newwidth && newwidth - szHint.base_width < max_width)	767	if (newwidth && newwidth - szHint.base_width < max_width)
757	{	768	{
758	szHint.width = newwidth;	769	szHint.width = newwidth;
…		…
773	{	784	{
774	min_it (height, max_height);	785	min_it (height, max_height);
775	szHint.height = szHint.base_height + height;	786	szHint.height = szHint.base_height + height;
776	}	787	}
777		788
778	if (scrollBar.state && OPTION (Opt_scrollBar_right))	789	if (scrollBar.state && option (Opt_scrollBar_right))
779	window_sb_x = szHint.width - sb_w;	790	window_sb_x = szHint.width - sb_w;
780		791
781	if (recalc_x)	792	if (recalc_x)
782	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	793	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		794
783	if (recalc_y)	795	if (recalc_y)
784	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	796	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
785		797
786	ncol = width / fwidth;	798	ncol = width / fwidth;
787	nrow = height / fheight;	799	nrow = height / fheight;
788	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
789	ncol, nrow, szHint.width,
790	szHint.height));
791	return;
792	}	800	}
793		801
794	/----------------------------------------------------------------------/	802	/----------------------------------------------------------------------/
795	/*	803	/*
796	* Tell the teletype handler what size the window is.	804	* Tell the teletype handler what size the window is.
…		…
848	delete fontset[0];	856	delete fontset[0];
849	fontset[0] = fs;	857	fontset[0] = fs;
850		858
851	prop = (*fs)[1]->properties ();	859	prop = (*fs)[1]->properties ();
852	prop.height += lineSpace;	860	prop.height += lineSpace;
		861
853	fs->set_prop (prop);	862	fs->set_prop (prop, false);
854		863
855	fwidth = prop.width;	864	fwidth = prop.width;
856	fheight = prop.height;	865	fheight = prop.height;
857	fbase = prop.ascent;	866	fbase = prop.ascent;
858		867
…		…
867	{	876	{
868	fontset[style] = fs = new rxvt_fontset (this);	877	fontset[style] = fs = new rxvt_fontset (this);
869	rxvt_fontprop prop2 = prop;	878	rxvt_fontprop prop2 = prop;
870		879
871	if (res)	880	if (res)
872	prop2.weight = prop2.slant = rxvt_fontprop::unset;	881	{
		882	fs->populate (res);
		883	fs->set_prop (prop2, false);
		884	}
873	else	885	else
874	{	886	{
875	res = fontset[0]->fontdesc;	887	fs->populate (fontset[0]->fontdesc);
876		888
877	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	889	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
878	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	890	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		891
		892	fs->set_prop (prop2, true);
879	}	893	}
880		894
881	fs->populate (res);
882	fs->set_prop (prop2);
883	}	895	}
884	#else	896	#else
885	fontset[style] = fontset[0];	897	fontset[style] = fontset[0];
886	#endif	898	#endif
887	}	899	}
…		…
896	return true;	908	return true;
897	}	909	}
898		910
899	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	911	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
900	{	912	{
901	XChangeProperty (display->display, parent[0],	913	XChangeProperty (dpy, parent[0],
902	prop, XA_STRING, 8, PropModeReplace,	914	prop, XA_STRING, 8, PropModeReplace,
903	(const unsigned char *)str, len >= 0 ? len : strlen (str));	915	(const unsigned char *)str, len >= 0 ? len : strlen (str));
904	}	916	}
905		917
906	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	918	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
907	{	919	{
908	wchar_t *ws = rxvt_mbstowcs (str, len);	920	wchar_t *ws = rxvt_mbstowcs (str, len);
909	char *s = rxvt_wcstoutf8 (ws);	921	char *s = rxvt_wcstoutf8 (ws);
910		922
911	XChangeProperty (display->display, parent[0],	923	XChangeProperty (dpy, parent[0],
912	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	924	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
913	(const unsigned char *)s, strlen (s));	925	(const unsigned char *)s, strlen (s));
914		926
915	free (s);	927	free (s);
916	free (ws);	928	free (ws);
…		…
941	void	953	void
942	rxvt_term::set_window_color (int idx, const char *color)	954	rxvt_term::set_window_color (int idx, const char *color)
943	{	955	{
944	rxvt_color xcol;	956	rxvt_color xcol;
945	int i;	957	int i;
946		958
947	if (color == NULL \|\| *color == '\0')	959	if (color == NULL \|\| *color == '\0')
948	return;	960	return;
		961
		962	color = strdup (color);
		963	allocated.push_back ((void *)color);
		964	rs[Rs_color + idx] = color;
949		965
950	/* handle color aliases */	966	/* handle color aliases */
951	if (isdigit (*color))	967	if (isdigit (*color))
952	{	968	{
953	i = atoi (color);	969	i = atoi (color);
954		970
955	if (i >= 8 && i <= 15)	971	if (i >= 8 && i <= 15)
956	{ /* bright colors */	972	{ /* bright colors */
957	i -= 8;	973	i -= 8;
958	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	974	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
959	SET_PIXCOLOR (idx);
960	goto done;	975	goto done;
961	}	976	}
962		977
963	if (i >= 0 && i <= 7)	978	if (i >= 0 && i <= 7)
964	{ /* normal colors */	979	{ /* normal colors */
965	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	980	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
966	SET_PIXCOLOR (idx);
967	goto done;	981	goto done;
968	}	982	}
969	}	983	}
970		984
971	if (!rXParseAllocColor (&xcol, color))	985	set_color (xcol, color);
972	return;
973
974	/* XStoreColor (display->display, display->cmap, XColor); /
975		986
976	/*	987	/*
977	* FIXME: should free colors here, but no idea how to do it so instead,	988	* FIXME: should free colors here, but no idea how to do it so instead,
978	* so just keep gobbling up the colormap	989	* so just keep gobbling up the colormap
979	*/	990	*/
980	# if 0
981	for (i = Color_Black; i <= Color_White; i++)
982	if (pix_colors[idx] == pix_colors[i])
983	break;
984	if (i > Color_White)
985	{
986	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
987	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
988	DisplayPlanes (display->display, display->screen));
989	}
990	# endif
991		991
992	pix_colors_focused[idx] = xcol;	992	pix_colors_focused[idx] = xcol;
993	SET_PIXCOLOR (idx);
994		993
995	/* XSetWindowAttributes attr; */	994	/* XSetWindowAttributes attr; */
996	/* Cursor cursor; */	995	/* Cursor cursor; */
997	done:	996	done:
998
999	#if OFF_FOCUS_FADING
1000	if (rs[Rs_fade])
1001	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1002	#endif
1003
1004	/TODO: handle Color_BD, scrollbar background, etc. /	997	/TODO: handle Color_BD, scrollbar background, etc. /
1005		998
		999	update_fade_color (idx);
1006	recolour_cursor ();	1000	recolour_cursor ();
1007	scr_recolour ();	1001	scr_recolour ();
1008	}	1002	}
1009		1003
1010	#else	1004	#else
…		…
1012	#endif /* XTERM_COLOR_CHANGE */	1006	#endif /* XTERM_COLOR_CHANGE */
1013		1007
1014	void	1008	void
1015	rxvt_term::recolour_cursor ()	1009	rxvt_term::recolour_cursor ()
1016	{	1010	{
1017	XColor xcol[2];	1011	XColor fg, bg;
1018		1012
1019	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	1013	(ISSET_PIXCOLOR (Color_pointer_fg)
1020	? pix_colors_focused[Color_pointer_fg]	1014	? pix_colors_focused[Color_pointer_fg]
1021	: pix_colors_focused[Color_fg];	1015	: pix_colors_focused[Color_fg]).get (fg);
		1016
1022	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	1017	(ISSET_PIXCOLOR (Color_pointer_bg)
1023	? pix_colors_focused[Color_pointer_bg]	1018	? pix_colors_focused[Color_pointer_bg]
1024	: pix_colors_focused[Color_bg];	1019	: pix_colors_focused[Color_bg]).get (bg);
1025		1020
1026	XQueryColors (display->display, display->cmap, xcol, 2);	1021	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1027	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1028	}	1022	}
1029		1023
1030	/----------------------------------------------------------------------/	1024	/----------------------------------------------------------------------/
1031	/*	1025	/*
1032	* find if fg/bg matches any of the normal (low-intensity) colors	1026	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1036	{	1030	{
1037	unsigned int i;	1031	unsigned int i;
1038	const char *xpmb = "\0";	1032	const char *xpmb = "\0";
1039	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040		1034
1041	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1042	strcpy (fstr, "default");	1035	strcpy (fstr, "default");
1043	strcpy (bstr, "default");	1036	strcpy (bstr, "default");
1044	for (i = Color_Black; i <= Color_White; i++)	1037	for (i = Color_Black; i <= Color_White; i++)
1045	if (pix_colors[Color_fg] == pix_colors[i])	1038	if (pix_colors[Color_fg] == pix_colors[i])
1046	{	1039	{
…		…
1061	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1054	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1062	}	1055	}
1063		1056
1064	/----------------------------------------------------------------------/	1057	/----------------------------------------------------------------------/
1065		1058
1066	int	1059	bool
1067	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1060	rxvt_term::set_color (rxvt_color &color, const char *name)
1068	{	1061	{
1069	if (!screen_in_out->set (display, colour))	1062	if (color.set (this, name))
1070	{
1071	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1072	return false;
1073	}
1074
1075	return true;	1063	return true;
		1064
		1065	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1066	return false;
		1067	}
		1068
		1069	void
		1070	rxvt_term::alias_color (int dst, int src)
		1071	{
		1072	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1076	}	1073	}
1077		1074
1078	/* -------------------------------------------------------------------- *	1075	/* -------------------------------------------------------------------- *
1079	* - WINDOW RESIZING - *	1076	* - WINDOW RESIZING - *
1080	* -------------------------------------------------------------------- */	1077	* -------------------------------------------------------------------- */
1081	void	1078	void
1082	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1079	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1083	{	1080	{
1084	int fix_screen;	1081	int fix_screen;
1085	int old_width = szHint.width, old_height = szHint.height;	1082	int old_width = szHint.width;
1086	dDisp;	1083	int old_height = szHint.height;
1087		1084
1088	window_calc (newwidth, newheight);	1085	window_calc (newwidth, newheight);
		1086
		1087	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1089	XSetWMNormalHints (disp, parent[0], &szHint);	1088	XSetWMNormalHints (dpy, parent[0], &szHint);
1090		1089
1091	if (!ignoreparent)	1090	if (!ignoreparent)
1092	{	1091	{
1093	#ifdef SMART_RESIZE	1092	#ifdef SMART_RESIZE
1094	/*	1093	/*
…		…
1098	int x, y, x1, y1;	1097	int x, y, x1, y1;
1099	int dx, dy;	1098	int dx, dy;
1100	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1099	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1101	Window unused_cr;	1100	Window unused_cr;
1102		1101
1103	XTranslateCoordinates (disp, parent[0], display->root,	1102	XTranslateCoordinates (dpy, parent[0], display->root,
1104	0, 0, &x, &y, &unused_cr);	1103	0, 0, &x, &y, &unused_cr);
1105	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1104	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1106	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1105	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1107	/*	1106	/*
1108	* if display->root isn't the parent window, a WM will probably have offset	1107	* if display->root isn't the parent window, a WM will probably have offset
1109	* our position for handles and decorations. Counter it	1108	* our position for handles and decorations. Counter it
1110	*/	1109	*/
…		…
1112	{	1111	{
1113	x -= x1;	1112	x -= x1;
1114	y -= y1;	1113	y -= y1;
1115	}	1114	}
1116		1115
1117	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1116	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1118	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1117	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1119	dx = old_width - szHint.width;	1118	dx = old_width - szHint.width;
1120	dy = old_height - szHint.height;	1119	dy = old_height - szHint.height;
1121		1120
1122	/* Check position of the center of the window */	1121	/* Check position of the center of the window */
1123	if (x < x1) /* left half */	1122	if (x < x1) /* left half */
1124	dx = 0;	1123	dx = 0;
…		…
1127	if (y < y1) /* top half */	1126	if (y < y1) /* top half */
1128	dy = 0;	1127	dy = 0;
1129	else if (y == y1) /* exact center */	1128	else if (y == y1) /* exact center */
1130	dy /= 2;	1129	dy /= 2;
1131		1130
1132	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1131	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1133	szHint.width, szHint.height);	1132	szHint.width, szHint.height);
1134	#else	1133	#else
1135	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1134	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1136	#endif	1135	#endif
1137	}	1136	}
1138		1137
1139	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1138	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1140		1139
1141	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1140	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1142	{	1141	{
1143	if (scrollBar.state)	1142	if (scrollBar.state)
1144	{	1143	{
1145	XMoveResizeWindow (disp, scrollBar.win,	1144	XMoveResizeWindow (dpy, scrollBar.win,
1146	window_sb_x, 0,	1145	window_sb_x, 0,
1147	scrollbar_TotalWidth (), szHint.height);	1146	scrollbar_TotalWidth (), szHint.height);
1148	resize_scrollbar ();	1147	resize_scrollbar ();
1149	}	1148	}
1150		1149
1151	XMoveResizeWindow (disp, vt,	1150	XMoveResizeWindow (dpy, vt,
1152	window_vt_x, window_vt_y,	1151	window_vt_x, window_vt_y,
1153	width, height);	1152	width, height);
1154		1153
		1154	#ifdef XPM_BACKGROUND
		1155	/* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
		1156	if (bgPixmap.window_size_sensitive ())
		1157	bgPixmap.render ();
		1158	#endif
		1159
1155	scr_clear ();	1160	scr_clear ();
1156	#ifdef XPM_BACKGROUND
1157	resize_pixmap ();
1158	#endif
1159	}	1161	}
1160		1162
1161	if (fix_screen \|\| old_height == 0)	1163	if (fix_screen \|\| old_height == 0)
1162	{
1163	int curr_screen = -1;
1164	int old_ncol = prev_ncol;
1165
1166	/* scr_reset only works on the primary screen */
1167	if (old_height) /* this is not the first time through */
1168	{
1169	unsigned int ocol = ncol;
1170	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1171	curr_screen = scr_change_screen (PRIMARY);
1172	ncol = ocol;
1173	}
1174
1175	scr_reset ();	1164	scr_reset ();
1176		1165
1177	if (curr_screen >= 0) /* this is not the first time through */	1166	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1178	{	1167	//scr_touch (false);
1179	scr_change_screen (curr_screen);
1180	selection_check (old_ncol != ncol ? 4 : 0);
1181	}
1182	}
1183		1168
1184	old_width = szHint.width;	1169	#ifdef HAVE_BG_PIXMAP
1185	old_height = szHint.height;	1170	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1186		1171	// if (bgPixmap.pixmap)
1187	#ifdef XPM_BACKGROUND
1188	if (pixmap)
1189	scr_touch (false);	1172	// scr_touch (false);
1190	#endif	1173	#endif
1191		1174
1192	#ifdef USE_XIM	1175	#ifdef USE_XIM
1193	IMSetStatusPosition ();	1176	IMSetPosition ();
1194	#endif	1177	#endif
1195	}	1178	}
1196		1179
1197	/*	1180	/*
1198	* Set the width/height of the vt window in characters. Units are pixels.	1181	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1203	{	1186	{
1204	XWindowAttributes wattr;	1187	XWindowAttributes wattr;
1205		1188
1206	if (newwidth == 0 \|\| newheight == 0)	1189	if (newwidth == 0 \|\| newheight == 0)
1207	{	1190	{
1208	XGetWindowAttributes (display->display, display->root, &wattr);	1191	XGetWindowAttributes (dpy, display->root, &wattr);
1209		1192
1210	if (newwidth == 0)	1193	if (newwidth == 0)
1211	newwidth = wattr.width - szHint.base_width;	1194	newwidth = wattr.width - szHint.base_width;
1212	if (newheight == 0)	1195	if (newheight == 0)
1213	newheight = wattr.height - szHint.base_height;	1196	newheight = wattr.height - szHint.base_height;
…		…
1227	#ifdef USE_XIM	1210	#ifdef USE_XIM
1228		1211
1229	void	1212	void
1230	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1213	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1231	{	1214	{
1232	fg = pix_colors[Color_fg];	1215	fg = pix_colors [Color_fg];
1233	bg = pix_colors[Color_bg];	1216	bg = pix_colors [Color_bg];
1234	}	1217	}
1235		1218
1236	void	1219	void
1237	rxvt_term::im_set_size (XRectangle &size)	1220	rxvt_term::im_set_size (XRectangle &size)
1238	{	1221	{
…		…
1275	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1258	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1276		1259
1277	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1260	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1278	*p = '\0';	1261	*p = '\0';
1279		1262
1280	atom = XInternAtom (display->display, server, False);	1263	atom = XInternAtom (dpy, server, False);
1281	win = XGetSelectionOwner (display->display, atom);	1264	win = XGetSelectionOwner (dpy, atom);
1282		1265
1283	if (win != None)	1266	if (win != None)
1284	return True;	1267	return True;
1285	}	1268	}
1286		1269
…		…
1293	XPoint nspot;	1276	XPoint nspot;
1294	XVaNestedList preedit_attr;	1277	XVaNestedList preedit_attr;
1295		1278
1296	if (!Input_Context	1279	if (!Input_Context
1297	\|\| !focus	1280	\|\| !focus
1298	\|\| !(input_style & XIMPreeditPosition))	1281	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1299	return;	1282	return;
1300		1283
1301	im_set_position (nspot);	1284	im_set_position (nspot);
1302		1285
1303	if (nspot.x == spot.x && nspot.y == spot.y)	1286	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1322	input_method = 0;	1305	input_method = 0;
1323	}	1306	}
1324		1307
1325	Input_Context = 0;	1308	Input_Context = 0;
1326	}	1309	}
		1310
		1311	#ifdef ENABLE_XIM_ONTHESPOT
		1312
		1313	static void
		1314	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1315	{
		1316	((rxvt_term *)client_data)->make_current ();
		1317	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1318	}
		1319
		1320	static void
		1321	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1322	{
		1323	((rxvt_term *)client_data)->make_current ();
		1324	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1325	}
		1326
		1327	static void
		1328	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1329	{
		1330	rxvt_term term = (rxvt_term )client_data;
		1331	XIMText *text = call_data->text;
		1332
		1333	term->make_current ();
		1334
		1335	if (text)
		1336	{
		1337	void *str;
		1338
		1339	if (!text->encoding_is_wchar && text->string.multi_byte)
		1340	{
		1341	// of course, X makes it ugly again
		1342	if (term->rs[Rs_imLocale])
		1343	SET_LOCALE (term->rs[Rs_imLocale]);
		1344
		1345	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1346	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1347
		1348	if (term->rs[Rs_imLocale])
		1349	SET_LOCALE (term->locale);
		1350	}
		1351	else
		1352	str = (void *)text->string.wide_char;
		1353
		1354	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1355	DT_INT, call_data->caret,
		1356	DT_INT, call_data->chg_first,
		1357	DT_INT, call_data->chg_length,
		1358	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1359	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1360	DT_END));
		1361	}
		1362	else
		1363	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1364	DT_INT, call_data->caret,
		1365	DT_INT, call_data->chg_first,
		1366	DT_INT, call_data->chg_length,
		1367	DT_END));
		1368	}
		1369
		1370	#if 0
		1371	static void
		1372	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1373	{
		1374	((rxvt_term *)client_data)->make_current ();
		1375	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1376	DT_INT, call_data->position,
		1377	DT_INT, call_data->direction,
		1378	DT_INT, call_data->style,
		1379	DT_END));
		1380	}
		1381	#endif
		1382
		1383	#endif
1327		1384
1328	/*	1385	/*
1329	* Try to open a XIM with the current modifiers, then see if we can	1386	* Try to open a XIM with the current modifiers, then see if we can
1330	* open a suitable preedit type	1387	* open a suitable preedit type
1331	*/	1388	*/
…		…
1338	XRectangle rect, status_rect, needed_rect;	1395	XRectangle rect, status_rect, needed_rect;
1339	unsigned long fg, bg;	1396	unsigned long fg, bg;
1340	const char *p;	1397	const char *p;
1341	char **s;	1398	char **s;
1342	XIMStyles *xim_styles;	1399	XIMStyles *xim_styles;
		1400	#ifdef ENABLE_XIM_ONTHESPOT
		1401	XIMCallback xcb[4];
		1402	#endif
1343		1403
1344	set_environ (envv);	1404	set_environ (envv);
1345		1405
1346	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1406	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1347	return false;	1407	return false;
1348		1408
1349	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1350	input_method = display->get_xim (locale, modifiers);	1409	input_method = display->get_xim (locale, modifiers);
1351	if (input_method == NULL)	1410	if (input_method == NULL)
1352	return false;	1411	return false;
1353		1412
1354	xim = input_method->xim;	1413	xim = input_method->xim;
…		…
1374	s = rxvt_splitcommastring (p);	1433	s = rxvt_splitcommastring (p);
1375		1434
1376	for (i = found = 0; !found && s[i]; i++)	1435	for (i = found = 0; !found && s[i]; i++)
1377	{	1436	{
1378	if (!strcmp (s[i], "OverTheSpot"))	1437	if (!strcmp (s[i], "OverTheSpot"))
1379	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1438	input_style = XIMPreeditPosition \| XIMStatusNothing;
1380	else if (!strcmp (s[i], "OffTheSpot"))	1439	else if (!strcmp (s[i], "OffTheSpot"))
1381	input_style = (XIMPreeditArea \| XIMStatusArea);	1440	input_style = XIMPreeditArea \| XIMStatusArea;
1382	else if (!strcmp (s[i], "Root"))	1441	else if (!strcmp (s[i], "Root"))
1383	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1442	input_style = XIMPreeditNothing \| XIMStatusNothing;
1384	else if (!strcmp (s[i], "None"))	1443	else if (!strcmp (s[i], "None"))
1385	input_style = (XIMPreeditNone \| XIMStatusNone);	1444	input_style = XIMPreeditNone \| XIMStatusNone;
		1445	#ifdef ENABLE_XIM_ONTHESPOT
		1446	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1447	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1448	#endif
		1449	else
		1450	input_style = XIMPreeditNothing \| XIMStatusNothing;
1386		1451
1387	for (j = 0; j < xim_styles->count_styles; j++)	1452	for (j = 0; j < xim_styles->count_styles; j++)
1388	if (input_style == xim_styles->supported_styles[j])	1453	if (input_style == xim_styles->supported_styles[j])
1389	{	1454	{
1390	rxvt_freecommastring (s);	1455	rxvt_freecommastring (s);
…		…
1428	"*",	1493	"*",
1429	fheight,	1494	fheight,
1430	fheight + 1, fheight - 1,	1495	fheight + 1, fheight - 1,
1431	fheight - 2, fheight + 2);	1496	fheight - 2, fheight + 2);
1432		1497
1433	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1498	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434	&missing_charset_list, &missing_charset_count, &def_string);	1499	&missing_charset_list, &missing_charset_count, &def_string);
1435		1500
1436	if (missing_charset_list)	1501	if (missing_charset_list)
1437	XFreeStringList (missing_charset_list);	1502	XFreeStringList (missing_charset_list);
1438		1503
…		…
1479	XNBackground, bg,	1544	XNBackground, bg,
1480	XNArea, &status_rect,	1545	XNArea, &status_rect,
1481	XNFontSet, fs,	1546	XNFontSet, fs,
1482	NULL);	1547	NULL);
1483	}	1548	}
		1549	#if ENABLE_XIM_ONTHESPOT
		1550	else if (input_style & XIMPreeditCallbacks)
		1551	{
		1552	im_set_position (spot);
		1553
		1554	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1555	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1556	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1557	# if 0
		1558	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1559	# endif
		1560
		1561	preedit_attr = XVaCreateNestedList (0,
		1562	XNSpotLocation, &spot,
		1563	XNPreeditStartCallback, &xcb[0],
		1564	XNPreeditDoneCallback , &xcb[1],
		1565	XNPreeditDrawCallback , &xcb[2],
		1566	# if 0
		1567	XNPreeditCaretCallback, &xcb[3],
		1568	# endif
		1569	NULL);
		1570	}
		1571	#endif
1484		1572
1485	Input_Context = XCreateIC (xim,	1573	Input_Context = XCreateIC (xim,
1486	XNInputStyle, input_style,	1574	XNInputStyle, input_style,
1487	XNClientWindow, vt,	1575	XNClientWindow, vt,
1488	XNFocusWindow, parent[0],	1576	XNFocusWindow, parent[0],
…		…
1490	preedit_attr,	1578	preedit_attr,
1491	status_attr ? XNStatusAttributes : NULL,	1579	status_attr ? XNStatusAttributes : NULL,
1492	status_attr, NULL);	1580	status_attr, NULL);
1493		1581
1494	if (preedit_attr) XFree (preedit_attr);	1582	if (preedit_attr) XFree (preedit_attr);
1495	if (status_attr) XFree (status_attr);	1583	if (status_attr) XFree (status_attr);
1496	if (fs) XFreeFontSet (display->display, fs);	1584	if (fs) XFreeFontSet (dpy, fs);
1497		1585
1498	if (Input_Context == NULL)	1586	if (Input_Context == NULL)
1499	{	1587	{
1500	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1588	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1501	im_destroy ();	1589	im_destroy ();
1502	return false;	1590	return false;
1503	}	1591	}
1504		1592
1505	if (input_style & XIMPreeditArea)	1593	#if 0
		1594	// unfortunately, only the focus window is used by XIM, hard to fix
		1595	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1596	vt_select_input ();
		1597	#endif
		1598
1506	IMSetStatusPosition ();	1599	IMSetPosition ();
1507		1600
1508	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1509	return true;	1601	return true;
1510	}	1602	}
1511		1603
1512	void	1604	void
1513	rxvt_term::im_cb ()	1605	rxvt_term::im_cb ()
…		…
1519		1611
1520	make_current ();	1612	make_current ();
1521		1613
1522	im_destroy ();	1614	im_destroy ();
1523		1615
1524	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1525	if (Input_Context)	1616	if (Input_Context)
1526	return;	1617	return;
1527		1618
1528	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1619	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1529	if (rs[Rs_imLocale])	1620	if (rs[Rs_imLocale])
…		…
1571	SET_LOCALE (locale);	1662	SET_LOCALE (locale);
1572	#endif	1663	#endif
1573	}	1664	}
1574		1665
1575	void	1666	void
1576	rxvt_term::IMSetStatusPosition ()	1667	rxvt_term::IMSetPosition ()
1577	{	1668	{
1578	XRectangle preedit_rect, status_rect, *needed_rect;	1669	XRectangle preedit_rect, status_rect, *needed_rect;
1579	XVaNestedList preedit_attr, status_attr;	1670	XVaNestedList preedit_attr, status_attr;
1580		1671
1581	if (!Input_Context	1672	if (!Input_Context
1582	\|\| !focus	1673	\|\| !focus
1583	\|\| !(input_style & XIMPreeditArea)	1674	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1584	\|\| !IMisRunning ())	1675	\|\| !IMisRunning ())
1585	return;	1676	return;
1586		1677
		1678	if (input_style & XIMPreeditPosition)
		1679	{
		1680	im_set_size (preedit_rect);
		1681	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1682
		1683	XSetICValues (Input_Context,
		1684	XNPreeditAttributes, preedit_attr, NULL);
		1685	}
		1686	else
		1687	{
1587	/* Getting the necessary width of preedit area */	1688	/* Getting the necessary width of preedit area */
1588	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1689	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1589	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1690	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1590	XFree (status_attr);	1691	XFree (status_attr);
1591		1692
1592	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1693	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1593	XFree (needed_rect);	1694	XFree (needed_rect);
1594		1695
1595	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1696	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1596	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1697	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1597		1698
1598	XSetICValues (Input_Context,	1699	XSetICValues (Input_Context,
1599	XNPreeditAttributes, preedit_attr,	1700	XNPreeditAttributes, preedit_attr,
1600	XNStatusAttributes, status_attr, NULL);	1701	XNStatusAttributes, status_attr,
		1702	NULL);
1601		1703
		1704	XFree (status_attr);
		1705	}
		1706
1602	XFree (preedit_attr);	1707	XFree (preedit_attr);
1603	XFree (status_attr);
1604	}	1708	}
1605	#endif /* USE_XIM */	1709	#endif /* USE_XIM */
1606		1710
1607	/----------------------------------------------------------------------/
1608	rxvt_t rxvt_current_term;
1609
1610	/----------------------- end-of-file (C source) -----------------------/	1711	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC vs. Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC