ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.236 by root, Thu May 25 16:54:29 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
40	$TOOLTIP->update;	41	$TOOLTIP->update;
41	}	42	}
…		…
49	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
50	}	51	}
51		52
52	# class methods for events	53	# class methods for events
53	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	56	if $FOCUS;
56	}	57	}
57		58
58	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	61	if $FOCUS;
61	}	62	}
62		63
63	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	65	my ($ev) = @_;
…		…
73	check_tooltip;	74	check_tooltip;
74	}	75	}
75		76
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		78
78	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	81	}
83		82
84	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	84	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
87		86
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		88
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		90
92	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		93
97	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	96	$grab->update if $grab;
100	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		114
118	check_tooltip;	115	check_tooltip;
119	}	116	}
120		117
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	119	if $HOVER;
125	}	120	}
126		121
127	# convert position array to integers	122	# convert position array to integers
128	sub harmonize {	123	sub harmonize {
129	my ($vals) = @_;	124	my ($vals) = @_;
…		…
133	for (@$vals) {	128	for (@$vals) {
134	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
135	$rem += $_ - $i;	130	$rem += $_ - $i;
136	$_ = $i;	131	$_ = $i;
137	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
138	}	169	}
139		170
140	#############################################################################	171	#############################################################################
141		172
142	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
160	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
162	}	193	}
163	}	194	}
164		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
165	$self	198	$self
166	}	199	}
167		200
168	sub destroy {	201	sub destroy {
169	my ($self) = @_;	202	my ($self) = @_;
…		…
172	%$self = ();	205	%$self = ();
173	}	206	}
174		207
175	sub show {	208	sub show {
176	my ($self) = @_;	209	my ($self) = @_;
177
178	return if $self->{parent};	210	return if $self->{parent};
179		211
180	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
181	}	213	}
182		214
183	sub hide {	215	sub show_centered {
184	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
185		234
186	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
188		248
189	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
190	if $self->{parent};	250	if $self->{parent};
191	}	251	}
192		252
…		…
242		302
243	sub size_allocate {	303	sub size_allocate {
244	# nothing to be done	304	# nothing to be done
245	}	305	}
246		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
247	sub children {	314	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}	315	}
261		316
262	sub set_max_size {	317	sub set_max_size {
263	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
264		319
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
267	}	338	}
268		339
269	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
270	sub coord2local {	341	sub coord2local {
271	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	357	return if $FOCUS == $self;
287	return unless $self->{can_focus};	358	return unless $self->{can_focus};
288		359
289	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
290		361
291	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
292		363
293	$focus->update if $focus;	364	$focus->update if $focus;
294	$FOCUS->update;	365	$FOCUS->update;
295	}	366	}
296		367
…		…
299		370
300	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
301		372
302	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
303		374
304	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
305		376
306	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
307	}	381	}
308		382
309	sub mouse_motion { }	383	sub mouse_motion { }
310	sub button_up { }	384	sub button_up { }
311	sub key_down { }	385	sub key_down { }
312	sub key_up { }	386	sub key_up { }
313		387
314	sub button_down {	388	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
316		390
317	$self->focus_in;	391	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	426	glPushMatrix;
353	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	430	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
360	glEnd;	434	glEnd;
361	glPopMatrix;	435	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	437	}
364	}	438	}
365		439
366	sub _draw {	440	sub _draw {
367	my ($self) = @_;	441	my ($self) = @_;
…		…
384	sub set_parent {	458	sub set_parent {
385	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
386		460
387	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
388		462
		463	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	464	$self->check_size
390	unless exists $self->{req_w};	465	unless exists $self->{req_w};
		466
		467	$self->show;
391	}	468	}
392		469
393	sub check_size {	470	sub check_size {
394	my ($self, $forced) = @_;	471	my ($self, $forced) = @_;
395		472
…		…
408	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
409		486
410	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	488	}
412		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
413	sub emit {	496	sub emit {
414	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
415		498
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
417	}	501	}
418		502
419	sub DESTROY {	503	sub DESTROY {
420	my ($self) = @_;	504	my ($self) = @_;
421		505
		506	delete $WIDGET{$self+0};
422	#$self->deactivate;	507	#$self->deactivate;
423	}	508	}
424		509
425	#############################################################################	510	#############################################################################
426		511
…		…
435	my $class = shift;	520	my $class = shift;
436		521
437	# range [value, low, high, page]	522	# range [value, low, high, page]
438		523
439	$class->SUPER::new (	524	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
442	@_	527	@_
443	)	528	)
444	}	529	}
445		530
446	sub _draw {	531	sub _draw {
447	my ($self) = @_;	532	my ($self) = @_;
448		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
450		540
451	glEnable GL_BLEND;	541	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
454		544
455	glBegin GL_QUADS;	545	glBegin GL_QUADS;
456	glVertex 0 , 0;	546	glVertex 0 , 0;
457	glVertex 0 , $h;	547	glVertex 0 , $h;
458	glVertex $w, $h;	548	glVertex $w, $h;
459	glVertex $w, 0;	549	glVertex $w, 0;
460	glEnd;	550	glEnd;
461		551
462	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
463	}	554	}
464		555
465	#############################################################################	556	#############################################################################
466		557
467	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	618	delete $child->{parent};
528	$child->hide;	619	$child->hide;
529		620
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		622
532	$self->check_size;	623	$self->check_size (1);
533	$self->update;	624	$self->update;
534	}	625	}
535		626
536	sub clear {	627	sub clear {
537	my ($self) = @_;	628	my ($self) = @_;
…		…
628	}	719	}
629		720
630	sub update {	721	sub update {
631	my ($self) = @_;	722	my ($self) = @_;
632		723
633	$ROOT->on_refresh ($self => sub { $self->render_child });	724	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	725	$self->SUPER::update;
635	}	726	}
636		727
637	sub size_allocate {	728	sub size_allocate {
638	my ($self, $w, $h) = @_;	729	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
654		745
655	$self->_render;	746	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	747	};
664	}	748	}
665		749
666	sub _draw {	750	sub _draw {
667	my ($self) = @_;	751	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	755	my $tex = $self->{texture}
672	or return;	756	or return;
673		757
674	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
677		761
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		763
680	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
681	}	765	}
…		…
684		768
685	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
686		770
687	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
688		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
689	sub size_request {	783	sub size_request {
690	my ($self) = @_;	784	my ($self) = @_;
691		785
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		787
695	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
696	}	789	}
697		790
698	sub size_allocate {	791	sub size_allocate {
699	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
700		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
701	$self->update;	798	$self->update;
702	}	799	}
703		800
704	sub set_offset {	801	sub set_offset {
705	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
759		856
760	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
761	vertical => 1,	858	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	860	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
765	},	862	},
766	;	863	;
767		864
768	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	867	slider => $slider,
771	@_,	868	@_,
772	);	869	);
773		870
774	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	873	$self->add ($self->{slider});
777		874
778	$self	875	$self
779	}	876	}
780		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		885	}
		886
781	#TODO# update range on size_allocate depeneing on child	887	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	888	# update viewport offset on scroll
783		889
784	#############################################################################	890	#############################################################################
785		891
786	package CFClient::UI::Frame;	892	package CFClient::UI::Frame;
787		893
788	our @ISA = CFClient::UI::Bin::;	894	our @ISA = CFClient::UI::Bin::;
789		895
790	use CFClient::OpenGL;	896	use CFClient::OpenGL;
		897
		898	sub new {
		899	my $class = shift;
		900
		901	$class->SUPER::new (
		902	bg => undef,
		903	@_,
		904	)
		905	}
		906
		907	sub _draw {
		908	my ($self) = @_;
		909
		910	if ($self->{bg}) {
		911	my ($w, $h) = @$self{qw(w h)};
		912
		913	glEnable GL_BLEND;
		914	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		915	glColor @{ $self->{bg} };
		916
		917	glBegin GL_QUADS;
		918	glVertex 0 , 0;
		919	glVertex 0 , $h;
		920	glVertex $w, $h;
		921	glVertex $w, 0;
		922	glEnd;
		923
		924	glDisable GL_BLEND;
		925	}
		926
		927	$self->SUPER::_draw;
		928	}
791		929
792	#############################################################################	930	#############################################################################
793		931
794	package CFClient::UI::FancyFrame;	932	package CFClient::UI::FancyFrame;
795		933
…		…
805	my $class = shift;	943	my $class = shift;
806		944
807	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
808		946
809	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
812	border => 0.6,	950	border => 0.6,
		951	is_toplevel => 1,
813	can_events => 1,	952	can_events => 1,
814	@_	953	@_
815	);	954	);
816		955
817	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	957	align => 0,
…		…
842	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
843		982
844	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
846		985
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	987	if $self->{title};
849		988
850	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	990	}
852		991
…		…
958	sub new {	1097	sub new {
959	my $class = shift;	1098	my $class = shift;
960		1099
961	$class->SUPER::new (	1100	$class->SUPER::new (
962	col_expand => [],	1101	col_expand => [],
963	@_	1102	@_,
964	)	1103	)
		1104	}
		1105
		1106	sub children {
		1107	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1108	}
966		1109
967	sub add {	1110	sub add {
968	my ($self, $x, $y, $child) = @_;	1111	my ($self, $x, $y, $child) = @_;
969		1112
970	$child->set_parent ($self);	1113	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1114	$self->{children}[$y][$x] = $child;
972		1115
973	$child->check_size;	1116	$self->check_size (1);
974	}	1117	}
975		1118
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1119	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1120	sub clear {
982	my ($self) = @_;	1121	my ($self) = @_;
983		1122
984	my @children = $self->children;	1123	my @children = $self->children;
985	delete $self->{children};	1124	delete $self->{children};
…		…
987	for (@children) {	1126	for (@children) {
988	delete $_->{parent};	1127	delete $_->{parent};
989	$_->hide;	1128	$_->hide;
990	}	1129	}
991		1130
		1131	$self->check_size (1);
992	$self->update;	1132	$self->update;
993	}	1133	}
994		1134
995	sub get_wh {	1135	sub get_wh {
996	my ($self) = @_;	1136	my ($self) = @_;
…		…
1213		1353
1214	#############################################################################	1354	#############################################################################
1215		1355
1216	package CFClient::UI::Label;	1356	package CFClient::UI::Label;
1217		1357
1218	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFClient::UI::DrawBG::;
1219		1359
1220	use CFClient::OpenGL;	1360	use CFClient::OpenGL;
1221		1361
1222	sub new {	1362	sub new {
1223	my ($class, %arg) = @_;	1363	my ($class, %arg) = @_;
1224		1364
1225	my $self = $class->SUPER::new (	1365	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1366	fg => [1, 1, 1],
		1367	#bg => none
		1368	#active_bg => none
1227	#font => default_font	1369	#font => default_font
1228	#text => initial text	1370	#text => initial text
1229	#markup => initial narkup	1371	#markup => initial narkup
		1372	#max_w => maximum pixel width
		1373	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1374	layout => (new CFClient::Layout),
1231	fontsize => 1,	1375	fontsize => 1,
1232	align => -1,	1376	align => -1,
1233	valign => -1,	1377	valign => -1,
1234	padding => 2,	1378	padding => 2,
…		…
1249	}	1393	}
1250		1394
1251	$self	1395	$self
1252	}	1396	}
1253		1397
1254	sub escape {	1398	sub escape($) {
1255	local $_ = $_[1];	1399	local $_ = $_[0];
1256		1400
1257	s/&/&amp;/g;	1401	s/&/&amp;/g;
1258	s/>/&gt;/g;	1402	s/>/&gt;/g;
1259	s/</&lt;/g;	1403	s/</&lt;/g;
1260		1404
1261	$_[1]	1405	$_
1262	}	1406	}
1263		1407
1264	sub update {	1408	sub update {
1265	my ($self) = @_;	1409	my ($self) = @_;
1266		1410
…		…
1299	sub size_request {	1443	sub size_request {
1300	my ($self) = @_;	1444	my ($self) = @_;
1301		1445
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1446	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{max_w} || -1);	1447	$self->{layout}->set_width ($self->{max_w} || -1);
		1448	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1449	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1450	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1451
1306	my ($w, $h) = $self->{layout}->size;	1452	my ($w, $h) = $self->{layout}->size;
1307		1453
1308	if (exists $self->{template}) {	1454	if (exists $self->{template}) {
…		…
1338	}	1484	}
1339		1485
1340	sub _draw {	1486	sub _draw {
1341	my ($self) = @_;	1487	my ($self) = @_;
1342		1488
		1489	$self->SUPER::_draw; # draw background, if applicable
		1490
1343	my $tex = $self->{texture} ||= do {	1491	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1492	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1493	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$self->{layout}->set_width ($self->{w});	1494	$self->{layout}->set_width ($self->{w});
		1495	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1498
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1499	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1500
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1501	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1502	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1503	: ($self->{w} - $tex->{w}) * 0.5);
1354		1504
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1505	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1506	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1507	: ($self->{h} - $tex->{h}) * 0.5);
1358		1508
1359	$tex	1509	$tex
1360	};	1510	};
1361		1511
1362	glEnable GL_TEXTURE_2D;	1512	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1540	active_fg => [0, 0, 0],
1391	can_hover => 1,	1541	can_hover => 1,
1392	can_focus => 1,	1542	can_focus => 1,
1393	valign => 0,	1543	valign => 0,
1394	can_events => 1,	1544	can_events => 1,
		1545	#text => ...
1395	@_	1546	@_
1396	)	1547	)
1397	}	1548	}
1398		1549
1399	sub _set_text {	1550	sub _set_text {
…		…
1409	$self->{text} = $text;	1560	$self->{text} = $text;
1410		1561
1411	$text =~ s/./*/g if $self->{hidden};	1562	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1563	$self->{layout}->set_text ("$text ");
1413		1564
1414	$self->emit (changed => $self->{text});	1565	$self->_emit (changed => $self->{text});
1415	}	1566	}
1416		1567
1417	sub set_text {	1568	sub set_text {
1418	my ($self, $text) = @_;	1569	my ($self, $text) = @_;
1419		1570
1420	$self->{cursor} = length $text;	1571	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1572	$self->_set_text ($text);
		1573	$self->update;
1422	$self->check_size;	1574	$self->check_size;
1423	$self->update;
1424	}	1575	}
1425		1576
1426	sub get_text {	1577	sub get_text {
1427	$_[0]{text}	1578	$_[0]{text}
1428	}	1579	}
…		…
1431	my ($self) = @_;	1582	my ($self) = @_;
1432		1583
1433	my ($w, $h) = $self->SUPER::size_request;	1584	my ($w, $h) = $self->SUPER::size_request;
1434		1585
1435	($w + 1, $h) # add 1 for cursor	1586	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1587	}
1443		1588
1444	sub key_down {	1589	sub key_down {
1445	my ($self, $ev) = @_;	1590	my ($self, $ev) = @_;
1446		1591
…		…
1448	my $sym = $ev->{sym};	1593	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1594	my $uni = $ev->{unicode};
1450		1595
1451	my $text = $self->get_text;	1596	my $text = $self->get_text;
1452		1597
1453	if ($sym == 8) {	1598	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1599	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1600	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1601	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1602	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1603	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1604	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1605	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1606	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1607	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1608	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1609	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1610	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1611	$self->_emit ('escape');
1467	} elsif ($uni) {	1612	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1613	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1614	}
1470		1615
1471	$self->_set_text ($text);	1616	$self->_set_text ($text);
1472	$self->update;	1617	$self->update;
		1618	$self->check_size;
1473	}	1619	}
1474		1620
1475	sub focus_in {	1621	sub focus_in {
1476	my ($self) = @_;	1622	my ($self) = @_;
1477		1623
…		…
1557	if ($sym == 13) {	1703	if ($sym == 13) {
1558	unshift @{$self->{history}},	1704	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1705	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1706	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1707	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1708	$self->_emit (activate => $txt);
1563	$self->update;	1709	$self->update;
1564		1710
1565	} elsif ($sym == CFClient::SDLK_UP) {	1711	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1712	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1713	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1752	my $class = shift;
1607		1753
1608	$class->SUPER::new (	1754	$class->SUPER::new (
1609	padding => 4,	1755	padding => 4,
1610	fg => [1, 1, 1],	1756	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1757	active_fg => [0, 0, 1],
1613	can_hover => 1,	1758	can_hover => 1,
1614	align => 0,	1759	align => 0,
1615	valign => 0,	1760	valign => 0,
1616	can_events => 1,	1761	can_events => 1,
1617	@_	1762	@_
1618	)	1763	)
1619	}	1764	}
1620		1765
		1766	sub activate { }
		1767
1621	sub button_up {	1768	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1769	my ($self, $ev, $x, $y) = @_;
1623		1770
		1771	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1772	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1773	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1774	}
1629		1775
1630	sub _draw {	1776	sub _draw {
1631	my ($self) = @_;	1777	my ($self) = @_;
1632		1778
…		…
1664		1810
1665	$class->SUPER::new (	1811	$class->SUPER::new (
1666	padding => 2,	1812	padding => 2,
1667	fg => [1, 1, 1],	1813	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1814	active_fg => [1, 1, 0],
		1815	bg => [0, 0, 0, 0.2],
		1816	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1817	state => 0,
1670	can_hover => 1,	1818	can_hover => 1,
1671	@_	1819	@_
1672	)	1820	)
1673	}	1821	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1830	my ($self, $ev, $x, $y) = @_;
1683		1831
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1832	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1833	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1834	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1835	$self->_emit (changed => $self->{state});
1688	}	1836	}
1689	}	1837	}
1690		1838
1691	sub _draw {	1839	sub _draw {
1692	my ($self) = @_;	1840	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2105	qw(s1_slider.png s1_slider_bg.png);
1958		2106
1959	sub new {	2107	sub new {
1960	my $class = shift;	2108	my $class = shift;
1961		2109
1962	# range [value, low, high, page]	2110	# range [value, low, high, page, unit]
1963		2111
1964	# TODO: 0-width page	2112	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2113	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2114	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2115	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2116	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2117	active_fg => [0, 0, 0],
		2118	bg => [0, 0, 0, 0.2],
		2119	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2120	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2121	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2122	req_h => $::WIDTH / 80,
1973	vertical => 0,	2123	vertical => 0,
1974	can_hover => 1,	2124	can_hover => 1,
1975	inner_pad => 5,	2125	inner_pad => 0.02,
1976	@_	2126	@_
1977	);	2127	);
1978		2128
		2129	$self->set_value ($self->{range}[0]);
		2130	$self->update;
		2131
1979	$self	2132	$self
		2133	}
		2134
		2135	sub set_range {
		2136	my ($self, $range) = @_;
		2137
		2138	$self->{range} = $range;
		2139
		2140	$self->update;
		2141	}
		2142
		2143	sub set_value {
		2144	my ($self, $value) = @_;
		2145
		2146	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2147
		2148	$hi = $lo + 1 if $hi <= $lo;
		2149
		2150	$page = $hi - $lo if $page > $hi - $lo;
		2151
		2152	$value = $lo if $value < $lo;
		2153	$value = $hi - $page if $value > $hi - $page;
		2154
		2155	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2156	if $unit;
		2157
		2158	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2159
		2160	if ($value != $old_value) {
		2161	$self->_emit (changed => $value);
		2162	$self->update;
		2163	}
1980	}	2164	}
1981		2165
1982	sub size_request {	2166	sub size_request {
1983	my ($self) = @_;	2167	my ($self) = @_;
1984		2168
…		…
1990		2174
1991	sub button_down {	2175	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2176	my ($self, $ev, $x, $y) = @_;
1993		2177
1994	$self->SUPER::button_down ($ev, $x, $y);	2178	$self->SUPER::button_down ($ev, $x, $y);
		2179
		2180	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2181
1995	$self->mouse_motion ($ev, $x, $y);	2182	$self->mouse_motion ($ev, $x, $y);
1996	}	2183	}
1997		2184
1998	sub mouse_motion {	2185	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2186	my ($self, $ev, $x, $y) = @_;
2000		2187
2001	if ($GRAB == $self) {	2188	if ($GRAB == $self) {
		2189	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2190
		2191	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2192
		2193	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2194
		2195	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2196	}
		2197	}
		2198
		2199	sub update {
		2200	my ($self) = @_;
		2201
		2202	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2203	$self->set_value ($self->{range}[0]);
		2204
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2205	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2206	my $range = ($hi - $page - $lo) || 1e-100;
2003		2207
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2208	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2209
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2210	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2211	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2212
2009	$x -= $inner_pad_px; # substract the padding	2213	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2214	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2215
2015	$self->emit (changed => $x);	2216	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2217	$self->{knob_w} = $knob_w;
2017	}	2218	});
2018	}
2019		2219
2020	# the inner_* stuff is for generating a padding for the slider handle,	2220	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2221	}
2027		2222
2028	sub _draw {	2223	sub _draw {
2029	my ($self) = @_;	2224	my ($self) = @_;
2030		2225
2031	$self->SUPER::_draw ();	2226	$self->SUPER::_draw ();
2032		2227
2033	my ($w, $h) = @$self{qw(w h)};	2228	glScale $self->{w}, $self->{h};
2034		2229
2035	if ($self->{vertical}) {	2230	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2231	# draw a vertical slider like a rotated horizontal slider
2037		2232
		2233	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2234	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2235	}
2043		2236
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2237	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2238	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2239
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2240	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2242
2068	# draw background	2243	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2244	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2245
2071	# draw handle	2246	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2247	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2248
2074	glDisable GL_TEXTURE_2D;	2249	glDisable GL_TEXTURE_2D;
2075	}	2250	}
		2251
		2252	#############################################################################
		2253
		2254	package CFClient::UI::ValSlider;
		2255
		2256	our @ISA = CFClient::UI::HBox::;
		2257
		2258	sub new {
		2259	my ($class, %arg) = @_;
		2260
		2261	my $range = delete $arg{range};
		2262
		2263	my $self = $class->SUPER::new (
		2264	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2265	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2266	to_value => sub { shift },
		2267	from_value => sub { shift },
		2268	%arg,
		2269	);
		2270
		2271	$self->{slider}->connect (changed => sub {
		2272	my ($self, $value) = @_;
		2273	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2274	$self->{parent}->emit (changed => $value);
		2275	});
		2276
		2277	# $self->{entry}->connect (changed => sub {
		2278	# my ($self, $value) = @_;
		2279	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2280	# $self->{parent}->emit (changed => $value);
		2281	# });
		2282
		2283	$self->add ($self->{slider}, $self->{entry});
		2284
		2285	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2286
		2287	$self
		2288	}
		2289
		2290	sub set_range { shift->{slider}->set_range (@_) }
		2291	sub set_value { shift->{slider}->set_value (@_) }
2076		2292
2077	#############################################################################	2293	#############################################################################
2078		2294
2079	package CFClient::UI::TextView;	2295	package CFClient::UI::TextView;
2080		2296
…		…
2110		2326
2111	$self->{fontsize} = $fontsize;	2327	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2328	$self->reflow;
2113	}	2329	}
2114		2330
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2331	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2332	my ($self, $w, $h) = @_;
2136		2333
2137	$self->SUPER::size_allocate ($w, $h);	2334	$self->SUPER::size_allocate ($w, $h);
2138		2335
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2338	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2339
2143	$self->reflow;	2340	$self->reflow;
2144	}	2341	}
2145		2342
		2343	sub text_size {
		2344	my ($self, $text, $indent) = @_;
		2345
		2346	my $layout = $self->{layout};
		2347
		2348	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2349	$layout->set_width ($self->{children}[0]{w} - $indent);
		2350	$layout->set_markup ($text);
		2351
		2352	$layout->size
		2353	}
		2354
		2355	sub reflow {
		2356	my ($self) = @_;
		2357
		2358	$self->{need_reflow}++;
		2359	$self->update;
		2360	}
		2361
		2362	sub set_offset {
		2363	my ($self, $offset) = @_;
		2364
		2365	# todo: base offset on lines or so, not on pixels
		2366	$self->{children}[1]->set_value ($offset);
		2367	}
		2368
		2369	sub clear {
		2370	my ($self) = @_;
		2371
		2372	$self->{par} = [];
		2373	$self->{height} = 0;
		2374	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2375	}
		2376
2146	sub add_paragraph {	2377	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2378	my ($self, $color, $text, $indent) = @_;
2148		2379
2149	#TODO: intelligently "reformat" paragraph	2380	for my $line (split /\n/, $text) {
2150		2381	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2382	$self->{height} += $h;
		2383	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2384	}
2154		2385
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2386	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2387	}
2160		2388
2161	sub update {	2389	sub update {
2162	my ($self) = @_;	2390	my ($self) = @_;
2163		2391
…		…
2165		2393
2166	return unless $self->{h} > 0;	2394	return unless $self->{h} > 0;
2167		2395
2168	delete $self->{texture};	2396	delete $self->{texture};
2169		2397
2170	$ROOT->on_refresh ($self, sub {	2398	$ROOT->on_post_alloc ($self, sub {
		2399	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2400
2171	if (delete $self->{need_reflow}) {	2401	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2402	my $height = 0;
2173		2403
2174	$height += $_->[0] = $self->text_height ($_->[2])	2404	my $layout = $self->{layout};
		2405
		2406	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2407
2175	for @{$self->{par}};	2408	for (@{$self->{par}}) {
		2409	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2410	$layout->set_width ($W - $_->[3]);
		2411	$layout->set_markup ($_->[4]);
		2412	my ($w, $h) = $layout->size;
		2413	$_->[0] = $w + $_->[3];
		2414	$_->[1] = $h;
		2415	}
		2416
		2417	$height += $_->[1];
		2418	}
2176		2419
2177	$self->{height} = $height;	2420	$self->{height} = $height;
2178		2421
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2422	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2423
2181	delete $self->{texture};	2424	delete $self->{texture};
2182	}	2425	}
2183		2426
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2427	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2428	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2429	glClear GL_COLOR_BUFFER_BIT;
2187		2430
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2431	my $top = int $self->{children}[1]{range}[0];
2192		2432
2193	my $y0 = $top;	2433	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2434	my $y1 = $top + $H;
2195		2435
2196	my $y = 0;	2436	my $y = 0;
2197		2437
2198	my $layout = $self->{layout};	2438	my $layout = $self->{layout};
2199		2439
2200	$layout->set_font ($self->{font}) if $self->{font};	2440	$layout->set_font ($self->{font}) if $self->{font};
2201		2441
		2442	glEnable GL_BLEND;
		2443	#TODO# not correct in windows where rgba is forced off
		2444	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2445
2202	for my $par (@{$self->{par}}) {	2446	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2447	my $h = $par->[1];
2204		2448
2205	if ($y0 < $y + $h && $y < $y1) {	2449	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2450	$layout->set_foreground (@{ $par->[2] });
		2451	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2452	$layout->set_markup ($par->[4]);
2208		2453
2209	my ($W, $H) = $layout->size;	2454	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2455
		2456	glRasterPos $par->[3], $y - $y0;
		2457	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2458	}
2212		2459
2213	$y += $h;	2460	$y += $h;
2214	}	2461	}
2215		2462
2216	glDisable GL_TEXTURE_2D;	2463	glDisable GL_BLEND;
2217	};	2464	};
2218	});	2465	});
2219	}	2466	}
2220		2467
2221	sub _draw {	2468	sub _draw {
2222	my ($self) = @_;	2469	my ($self) = @_;
2223		2470
2224	glEnable GL_TEXTURE_2D;	2471	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2473	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2474	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2475	glDisable GL_TEXTURE_2D;
2229		2476
2230	$self->{children}[1]->draw;	2477	$self->{children}[1]->draw;
2231		2478
2232	}	2479	}
…		…
2301		2548
2302	# TODO: use animation	2549	# TODO: use animation
2303	if ($self->{state} = !$self->{state}) {	2550	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});	2551	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));	2552	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");	2553	$self->_emit ("open");
2307	} else {	2554	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});	2555	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");	2556	$self->_emit ("close");
2310	}	2557	}
2311		2558
2312	$self->emit (changed => $self->{state});	2559	$self->_emit (changed => $self->{state});
2313	}	2560	}
2314		2561
2315	#############################################################################	2562	#############################################################################
2316		2563
2317	package CFClient::UI::Tooltip;	2564	package CFClient::UI::Tooltip;
…		…
2331		2578
2332	sub set_tooltip_from {	2579	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2580	my ($self, $widget) = @_;
2334		2581
2335	$self->add (new CFClient::UI::Label	2582	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2583	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2584	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2585	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2586	fg => [0, 0, 0, 1],
		2587	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2588	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2589	);
2342	}	2590	}
2343		2591
2344	sub size_request {	2592	sub size_request {
2345	my ($self) = @_;	2593	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2639	use CFClient::OpenGL;
2392		2640
2393	sub new {	2641	sub new {
2394	my $class = shift;	2642	my $class = shift;
2395		2643
2396	$class->SUPER::new (	2644	my $self = $class->SUPER::new (
2397	aspect => 1,	2645	aspect => 1,
		2646	can_events => 0,
2398	@_,	2647	@_,
2399	)	2648	);
		2649
		2650	if ($self->{anim} && $self->{animspeed}) {
		2651	Scalar::Util::weaken (my $widget = $self);
		2652
		2653	$self->{timer} = Event->timer (
		2654	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2655	hard => 1,
		2656	interval => $self->{animspeed},
		2657	cb => sub {
		2658	++$widget->{frame};
		2659	$widget->update;
		2660	},
		2661	);
		2662	}
		2663
		2664	$self
2400	}	2665	}
2401		2666
2402	sub size_request {	2667	sub size_request {
2403	(32, 8)	2668	(32, 8)
2404	}	2669	}
2405		2670
		2671	sub update {
		2672	my ($self) = @_;
		2673
		2674	return unless $self->{visible};
		2675
		2676	$self->SUPER::update;
		2677	}
		2678
2406	sub _draw {	2679	sub _draw {
2407	my ($self) = @_;	2680	my ($self) = @_;
2408		2681
2409	return unless $::CONN;#d# manage and cache textures differently	2682	return unless $::CONN;
		2683
		2684	my $face;
		2685
		2686	if ($self->{frame}) {
		2687	my $anim = $::CONN->{anim}[$self->{anim}];
		2688
		2689	$face = $anim->[ $self->{frame} % @$anim ]
		2690	if $anim && @$anim;
		2691	}
		2692
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2693	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2694
2412	# TODO animation
2413	if ($tex) {	2695	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2696	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2698	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2699	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2700	glDisable GL_TEXTURE_2D;
2419	}	2701	}
2420	}	2702	}
2421		2703
		2704	sub DESTROY {
		2705	my ($self) = @_;
		2706
		2707	$self->{timer}->cancel
		2708	if $self->{timer};
		2709
		2710	$self->SUPER::DESTROY;
		2711	}
		2712
2422	#############################################################################	2713	#############################################################################
2423		2714
2424	package CFClient::UI::InventoryItem;	2715	package CFClient::UI::Inventory;
2425		2716
2426	our @ISA = CFClient::UI::HBox::;	2717	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2718
2428	sub new {	2719	sub new {
2429	my $class = shift;	2720	my $class = shift;
2430		2721
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2722	my $self = $class->SUPER::new (
2441	can_hover => 1,	2723	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2724	@_,
2500	);	2725	);
2501		2726
2502	$self	2727	$self
2503	}	2728	}
…		…
2506	my ($self, $items) = @_;	2731	my ($self, $items) = @_;
2507		2732
2508	$self->{scrolled}->clear;	2733	$self->{scrolled}->clear;
2509	return unless $items;	2734	return unless $items;
2510		2735
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2736	my @items = sort {
		2737	($a->{type} <=> $b->{type})
		2738	or ($a->{name} cmp $b->{name})
		2739	} @$items;
2512		2740
2513	$self->{real_items} = \@items;	2741	$self->{real_items} = \@items;
2514		2742
		2743	my $row = 0;
2515	for my $item (@items) {	2744	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2745	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2746
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2747	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2748	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2749	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2750
		2751	$row++;
2521	}	2752	}
2522		2753
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524	}	2755	}
2525		2756
…		…
2568		2799
2569	# popup given the event (must be a mouse button down event currently)	2800	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2801	sub popup {
2571	my ($self, $ev) = @_;	2802	my ($self, $ev) = @_;
2572		2803
2573	$self->emit ("popdown");	2804	$self->_emit ("popdown");
2574		2805
2575	# maybe save $GRAB? must be careful about events...	2806	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2807	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2808	$self->{button} = $ev->{button};
2578		2809
…		…
2593		2824
2594	if ($ev->{button} == $self->{button}) {	2825	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2826	undef $GRAB;
2596	$self->hide;	2827	$self->hide;
2597		2828
2598	$self->emit ("popdown");	2829	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2830	$self->{hover}[1]->() if $self->{hover};
2600	}	2831	}
2601	}	2832	}
2602		2833
2603	#############################################################################	2834	#############################################################################
2604		2835
2605	package CFClient::UI::Statusbox;	2836	package CFClient::UI::Statusbox;
2606		2837
2607	our @ISA = CFClient::UI::VBox::;	2838	our @ISA = CFClient::UI::VBox::;
		2839
		2840	sub new {
		2841	my $class = shift;
		2842
		2843	$class->SUPER::new (
		2844	fontsize => 0.8,
		2845	@_,
		2846	)
		2847	}
2608		2848
2609	sub reorder {	2849	sub reorder {
2610	my ($self) = @_;	2850	my ($self) = @_;
2611	my $NOW = time;	2851	my $NOW = time;
2612		2852
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2871	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2872	: $item->{text};
2633		2873
2634	for ($short) {	2874	for ($short) {
2635	s/^\s+//;	2875	s/^\s+//;
2636	s/\012.*/…/s;	2876	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2877	}
2640		2878
2641	new CFClient::UI::Label	2879	new CFClient::UI::Label
2642	markup => $short,	2880	markup => $short,
2643	tooltip => $item->{tooltip},	2881	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2882	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2883	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2884	fontsize => $item->{fontsize} || $self->{fontsize},
		2885	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2886	fg => $item->{fg},
2648	can_events => 1,	2887	can_events => 1,
2649	can_hover => 1	2888	can_hover => 1
2650	};	2889	};
2651	}	2890	}
2652		2891
…		…
2654	$self->SUPER::add (reverse @widgets);	2893	$self->SUPER::add (reverse @widgets);
2655	}	2894	}
2656		2895
2657	sub add {	2896	sub add {
2658	my ($self, $text, %arg) = @_;	2897	my ($self, $text, %arg) = @_;
		2898
		2899	$text =~ s/^\s+//;
		2900	$text =~ s/\s+$//;
		2901
		2902	return unless $text;
2659		2903
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2904	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2905
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2906	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2907
…		…
2666	$item->{count}++;	2910	$item->{count}++;
2667	} else {	2911	} else {
2668	$item->{count} = 1;	2912	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2913	$item->{text} = $item->{tooltip} = $text;
2670	}	2914	}
		2915	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2916	$item->{timeout} = $timeout;
2672	delete $item->{label};	2917	delete $item->{label};
2673	} else {	2918	} else {
2674	$self->{item}{$group} = {	2919	$self->{item}{$group} = {
2675	id => ++$self->{id},	2920	id => ++$self->{id},
2676	text => $text,	2921	text => $text,
2677	timeout => $timeout,	2922	timeout => $timeout,
2678	tooltip => $text,	2923	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2924	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2925	pri => 0,
2682	count => 1,	2926	count => 1,
2683	%arg,	2927	%arg,
2684	};	2928	};
2685	}	2929	}
2686		2930
2687	$self->reorder;	2931	$self->reorder;
2688	}	2932	}
2689		2933
		2934	sub reconfigure {
		2935	my ($self) = @_;
		2936
		2937	delete $_->{label}
		2938	for values %{ $self->{item} || {} };
		2939
		2940	$self->reorder;
		2941	$self->SUPER::reconfigure;
		2942	}
		2943
2690	#############################################################################	2944	#############################################################################
2691		2945
2692	package CFClient::UI::Root;	2946	package CFClient::UI::Root;
2693		2947
2694	our @ISA = CFClient::UI::Container::;	2948	our @ISA = CFClient::UI::Container::;
…		…
2724	}	2978	}
2725		2979
2726	sub size_allocate {	2980	sub size_allocate {
2727	my ($self, $w, $h) = @_;	2981	my ($self, $w, $h) = @_;
2728		2982
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744
2745	for my $child ($self->children) {	2983	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2984	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		2985
		2986	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2987	if exists $child->{req_x};
		2988
		2989	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2990	if exists $child->{req_y};
		2991
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2992	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2993	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2994
2750	$child->configure ($X, $Y, $W, $H);	2995	$child->configure ($X, $Y, $W, $H);
2751	}	2996	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	2997	}
2756		2998
2757	sub coord2local {	2999	sub coord2local {
2758	my ($self, $x, $y) = @_;	3000	my ($self, $x, $y) = @_;
2759		3001
…		…
2772	$self->check_size;	3014	$self->check_size;
2773	$::WANT_REFRESH++;	3015	$::WANT_REFRESH++;
2774	}	3016	}
2775		3017
2776	sub add {	3018	sub add {
2777	my ($self, $child) = @_;	3019	my ($self, @children) = @_;
2778		3020
		3021	for (my @widgets = @children; my $w = pop @widgets; ) {
		3022	push @widgets, $w->children;
		3023	$w->{root} = $self;
		3024	$w->{visible} = 1;
		3025	}
		3026
		3027	for my $child (@children) {
		3028	$child->{is_toplevel} = 1;
		3029
2779	# integerise window positions	3030	# integerise window positions
2780	$child->{x} = int $child->{x};	3031	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3032	$child->{y} = int $child->{y};
		3033	}
2782		3034
2783	$self->SUPER::add ($child);	3035	$self->SUPER::add (@children);
		3036	}
		3037
		3038	sub remove {
		3039	my ($self, @children) = @_;
		3040
		3041	$self->SUPER::remove (@children);
		3042
		3043	while (@children) {
		3044	my $w = pop @children;
		3045	push @children, $w->children;
		3046	$w->set_invisible;
		3047	}
2784	}	3048	}
2785		3049
2786	sub on_refresh {	3050	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3051	my ($self, $id, $cb) = @_;
2788		3052
2789	$self->{refresh_hook}{$id} = $cb;	3053	$self->{refresh_hook}{$id} = $cb;
2790	}	3054	}
2791		3055
		3056	sub on_post_alloc {
		3057	my ($self, $id, $cb) = @_;
		3058
		3059	$self->{post_alloc_hook}{$id} = $cb;
		3060	}
		3061
2792	sub draw {	3062	sub draw {
2793	my ($self) = @_;	3063	my ($self) = @_;
		3064
		3065	while ($self->{refresh_hook}) {
		3066	$_->()
		3067	for values %{delete $self->{refresh_hook}};
		3068	}
2794		3069
2795	if ($self->{check_size}) {	3070	if ($self->{check_size}) {
2796	my @queue = ([], []);	3071	my @queue = ([], []);
2797		3072
2798	for (;;) {	3073	for (;;) {
…		…
2830	$w = 0 if $w < 0;	3105	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3106	$h = 0 if $h < 0;
2832		3107
2833	$widget->{w} = $w;	3108	$widget->{w} = $w;
2834	$widget->{h} = $h;	3109	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3110	$widget->emit (size_allocate => $w, $h);
2837	}	3111	}
2838	}	3112	}
2839		3113
2840	while ($self->{refresh_hook}) {	3114	while ($self->{post_alloc_hook}) {
2841	$_->()	3115	$_->()
2842	for values %{delete $self->{refresh_hook}};	3116	for values %{delete $self->{post_alloc_hook}};
2843	}	3117	}
2844		3118
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3119	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3120	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3121	glClear GL_COLOR_BUFFER_BIT;
2848		3122
2849	glMatrixMode GL_PROJECTION;	3123	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3124	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3125	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3126	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3127	glLoadIdentity;
2854		3128
2855	$self->_draw;	3129	$self->_draw;
2856	}	3130	}
…		…
2858	#############################################################################	3132	#############################################################################
2859		3133
2860	package CFClient::UI;	3134	package CFClient::UI;
2861		3135
2862	$ROOT = new CFClient::UI::Root;	3136	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3137	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3138
2865	1	3139	1
2866		3140

Diff Legend

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