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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	183	}
156
157	$widget->reconfigure;
158	}	184	}
		185
		186	reconfigure_widgets;
159	}	187	}
160		188
161	#############################################################################	189	#############################################################################
162		190
163	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
176	can_events => 1,	204	can_events => 1,
177	@_	205	@_
178	}, $class;	206	}, $class;
179		207
180	for (keys %$self) {	208	for (keys %$self) {
181	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
183	}	211	}
184	}	212	}
185		213
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
188	$self	223	$self
189	}	224	}
190		225
191	sub destroy {	226	sub destroy {
192	my ($self) = @_;	227	my ($self) = @_;
…		…
201	return if $self->{parent};	236	return if $self->{parent};
202		237
203	$CFClient::UI::ROOT->add ($self);	238	$CFClient::UI::ROOT->add ($self);
204	}	239	}
205		240
206	sub hide {	241	sub center {
207	my ($self) = @_;	242	my ($self) = @_;
		243
		244	$CFClient::UI::ROOT->on_post_alloc (
		245	"center_$self" => sub {
		246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		247	},
		248	);
		249
		250	$self->update;
		251	}
		252
		253	sub set_visible {
		254	my ($self) = @_;
		255
		256	return if $self->{visible};
		257
		258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
		260
		261	$self->emit (visibility_change => 1);
		262	}
		263
		264	sub set_invisible {
		265	my ($self) = @_;
		266
		267	return unless $self->{visible};
		268
		269	# broken show/hide model
		270
		271	delete $self->{root};
		272	delete $self->{visible};
208		273
209	undef $GRAB if $GRAB == $self;	274	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	275	undef $HOVER if $HOVER == $self;
		276
		277	CFClient::UI::check_tooltip
		278	if $CFClient::UI::TOOLTIP->{owner} == $self;
		279
		280	$self->focus_out;
		281
		282	$self->emit (visibility_change => 0);
		283	}
		284
		285	sub set_visibility {
		286	my ($self, $visible) = @_;
		287
		288	return if $self->{visible} == $visible;
		289
		290	$visible ? $self->hide
		291	: $self->show;
		292	}
		293
		294	sub toggle_visibility {
		295	my ($self) = @_;
		296
		297	$self->{visible}
		298	? $self->hide
		299	: $self->show;
		300	}
		301
		302	sub hide {
		303	my ($self) = @_;
		304
		305	$self->set_invisible;
211		306
212	$self->{parent}->remove ($self)	307	$self->{parent}->remove ($self)
213	if $self->{parent};	308	if $self->{parent};
214	}	309	}
215		310
…		…
224	}	319	}
225		320
226	sub set_size {	321	sub set_size {
227	my ($self, $w, $h) = @_;	322	my ($self, $w, $h) = @_;
228		323
229	$self->{user_w} = $w;	324	$self->{def_w} = $w;
230	$self->{user_h} = $h;	325	$self->{def_h} = $h;
231		326
232	$self->check_size;	327	$self->check_size;
233	}	328	}
234		329
235	sub size_request {	330	sub size_request {
…		…
257	$self->{y} = $y;	352	$self->{y} = $y;
258	$self->update;	353	$self->update;
259	}	354	}
260		355
261	if ($self->{w} != $w || $self->{h} != $h) {	356	if ($self->{w} != $w || $self->{h} != $h) {
262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
263	}	358	}
264	}	359	}
265		360
266	sub size_allocate {	361	sub size_allocate {
267	# nothing to be done	362	# nothing to be done
…		…
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	379	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	380	}
286		381
287	sub set_tooltip {	382	sub set_tooltip {
288	my ($self, $tooltip) = @_;	383	my ($self, $tooltip) = @_;
		384
		385	$tooltip =~ s/^\s+//;
		386	$tooltip =~ s/\s+$//;
		387
		388	return if $self->{tooltip} eq $tooltip;
289		389
290	$self->{tooltip} = $tooltip;	390	$self->{tooltip} = $tooltip;
291		391
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	392	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	393	delete $CFClient::UI::TOOLTIP->{owner};
…		…
315	return if $FOCUS == $self;	415	return if $FOCUS == $self;
316	return unless $self->{can_focus};	416	return unless $self->{can_focus};
317		417
318	my $focus = $FOCUS; $FOCUS = $self;	418	my $focus = $FOCUS; $FOCUS = $self;
319		419
320	$self->emit (focus_in => $focus);	420	$self->_emit (focus_in => $focus);
321		421
322	$focus->update if $focus;	422	$focus->update if $focus;
323	$FOCUS->update;	423	$FOCUS->update;
324	}	424	}
325		425
…		…
328		428
329	return unless $FOCUS == $self;	429	return unless $FOCUS == $self;
330		430
331	my $focus = $FOCUS; undef $FOCUS;	431	my $focus = $FOCUS; undef $FOCUS;
332		432
333	$self->emit (focus_out => $focus);	433	$self->_emit (focus_out => $focus);
334		434
335	$focus->update if $focus; #?	435	$focus->update if $focus; #?
		436
		437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		438	unless $FOCUS;
336	}	439	}
337		440
338	sub mouse_motion { }	441	sub mouse_motion { }
339	sub button_up { }	442	sub button_up { }
340	sub key_down { }	443	sub key_down { }
341	sub key_up { }	444	sub key_up { }
342		445
343	sub button_down {	446	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	447	my ($self, $ev, $x, $y) = @_;
345		448
346	$self->focus_in;	449	$self->focus_in;
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	483	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	484	glPushMatrix;
382	glColor 1, 1, 0, 1;	485	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	487	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	488	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	489	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	490	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	491	glVertex 0 , $self->{h} - 1;
389	glEnd;	492	glEnd;
390	glPopMatrix;	493	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	494	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	495	}
393	}	496	}
…		…
413	sub set_parent {	516	sub set_parent {
414	my ($self, $parent) = @_;	517	my ($self, $parent) = @_;
415		518
416	Scalar::Util::weaken ($self->{parent} = $parent);	519	Scalar::Util::weaken ($self->{parent} = $parent);
417		520
418	# TODO: req_w _does_change after ->reconfigure	521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		522
419	$self->check_size	523	$self->check_size;
420	unless exists $self->{req_w};
421	}	524	}
422		525
423	sub check_size {	526	sub check_size {
424	my ($self, $forced) = @_;	527	my ($self, $forced) = @_;
425		528
…		…
438	my ($self, $signal, $cb) = @_;	541	my ($self, $signal, $cb) = @_;
439		542
440	push @{ $self->{signal_cb}{$signal} }, $cb;	543	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}	544	}
442		545
		546	sub _emit {
		547	my ($self, $signal, @args) = @_;
		548
		549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		550	}
		551
443	sub emit {	552	sub emit {
444	my ($self, $signal, @args) = @_;	553	my ($self, $signal, @args) = @_;
445		554
446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	555	$self->_emit ($signal, @args)
		556	|| $self->$signal (@args);
		557	}
		558
		559	sub visibility_change {
		560	#my ($self, $visible) = @_;
447	}	561	}
448		562
449	sub DESTROY {	563	sub DESTROY {
450	my ($self) = @_;	564	my ($self) = @_;
451		565
…		…
564	delete $child->{parent};	678	delete $child->{parent};
565	$child->hide;	679	$child->hide;
566		680
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		682
569	$self->check_size;	683	$self->check_size (1);
570	$self->update;	684	$self->update;
571	}	685	}
572		686
573	sub clear {	687	sub clear {
574	my ($self) = @_;	688	my ($self) = @_;
…		…
688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689	glClearColor 0, 0, 0, 0;	803	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	804	glClear GL_COLOR_BUFFER_BIT;
691		805
692	$self->_render;	806	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	807	};
701	}	808	}
702		809
703	sub _draw {	810	sub _draw {
704	my ($self) = @_;	811	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	815	my $tex = $self->{texture}
709	or return;	816	or return;
710		817
711	glEnable GL_TEXTURE_2D;	818	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	820	glColor 1, 1, 1, 1;
714		821
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		823
717	glDisable GL_TEXTURE_2D;	824	glDisable GL_TEXTURE_2D;
718	}	825	}
…		…
721		828
722	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
723		830
724	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
725		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
726	sub size_request {	843	sub size_request {
727	my ($self) = @_;	844	my ($self) = @_;
728		845
729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		847
732	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
733	}	852	}
734		853
735	sub size_allocate {	854	sub size_allocate {
736	my ($self, $w, $h) = @_;	855	my ($self, $w, $h) = @_;
737		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
738	$self->update;	861	$self->update;
739	}	862	}
740		863
741	sub set_offset {	864	sub set_offset {
742	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
793	my $class = shift;	916	my $class = shift;
794		917
795	my $self;	918	my $self;
796		919
797	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
798	vertical => 1,	921	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	923	on_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
802	},	925	},
803	;	926	;
804		927
805	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	929	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	930	slider => $slider,
808	@_,	931	@_,
809	);	932	);
810		933
811	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	935	$self->add ($self->{vp});
813	$self->add ($self->{slider});	936	$self->add ($self->{slider});
814		937
815	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816	}	958	}
817		959
818	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	961	# update viewport offset on scroll
820		962
…		…
871	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872		1014
873	sub new {	1015	sub new {
874	my $class = shift;	1016	my $class = shift;
875		1017
876	# TODO: user_x, user_y, overwrite moveto?
877
878	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
881	border => 0.6,	1021	border => 0.6,
882	toplevel => 1,	1022	is_toplevel => 1,
883	can_events => 1,	1023	can_events => 1,
884	@_	1024	@_
885	);	1025	);
886		1026
887	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	1028	align => 0,
…		…
941	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
942		1082
943	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
944	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
945		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
949	$self->check_size;	1091	$self->check_size;
950	};	1092	};
951		1093
952	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
953	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
956	$self->{motion} = sub {	1098	$self->{motion} = sub {
957	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
958		1100
959	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
960		1102
961	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
962	$self->update;	1107	$self->update;
963	};	1108	};
964	}	1109	}
965	}	1110	}
966		1111
…		…
1028	sub new {	1173	sub new {
1029	my $class = shift;	1174	my $class = shift;
1030		1175
1031	$class->SUPER::new (	1176	$class->SUPER::new (
1032	col_expand => [],	1177	col_expand => [],
1033	@_	1178	@_,
1034	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1184	}
1036		1185
1037	sub add {	1186	sub add {
1038	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1039		1188
1040	$child->set_parent ($self);	1189	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1042		1191
1043	$child->check_size;	1192	$self->check_size (1);
1044	}	1193	}
1045		1194
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1196	sub clear {
1052	my ($self) = @_;	1197	my ($self) = @_;
1053		1198
1054	my @children = $self->children;	1199	my @children = $self->children;
1055	delete $self->{children};	1200	delete $self->{children};
…		…
1057	for (@children) {	1202	for (@children) {
1058	delete $_->{parent};	1203	delete $_->{parent};
1059	$_->hide;	1204	$_->hide;
1060	}	1205	}
1061		1206
		1207	$self->check_size (1);
1062	$self->update;	1208	$self->update;
1063	}	1209	}
1064		1210
1065	sub get_wh {	1211	sub get_wh {
1066	my ($self) = @_;	1212	my ($self) = @_;
…		…
1098	sub size_allocate {	1244	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h) = @_;
1100		1246
1101	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1102		1248
1103	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1105		1251
1106	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1163	}	1309	}
1164	}	1310	}
1165		1311
1166	#############################################################################	1312	#############################################################################
1167		1313
1168	package CFClient::UI::HBox;	1314	package CFClient::UI::Box;
1169
1170	# TODO: wrap into common Box base class
1171		1315
1172	our @ISA = CFClient::UI::Container::;	1316	our @ISA = CFClient::UI::Container::;
1173		1317
1174	sub size_request {	1318	sub size_request {
1175	my ($self) = @_;	1319	my ($self) = @_;
1176		1320
1177	my @alloc = map [$_->size_request], @{$self->{children}};	1321	$self->{vertical}
1178		1322	? (
1179	(	1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1180	(List::Util::sum map $_->[0], @alloc),	1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181	(List::Util::max map $_->[1], @alloc),	1325	)
1182	)	1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
1183	}	1330	}
1184		1331
1185	sub size_allocate {	1332	sub size_allocate {
1186	my ($self, $w, $h) = @_;	1333	my ($self, $w, $h) = @_;
1187		1334
1188	($h, $w) = ($w, $h);	1335	my $space = $self->{vertical} ? $h : $w;
1189
1190	my $children = $self->{children};	1336	my $children = $self->{children};
1191		1337
1192	my @h = map $_->{req_w}, @$children;	1338	my @req;
1193		1339
1194	my $req_h = List::Util::sum @h;	1340	if ($self->{homogeneous}) {
1195		1341	@req = ($space / (@$children || 1)) x @$children;
1196	if ($req_h > $h) {
1197	# ah well, not enough space
1198	$_ *= $h / $req_h for @h;
1199	} else {	1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
1200	my $exp = List::Util::sum map $_->{expand}, @$children;	1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201	$exp ||= 1;
1202		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
1203	for (0 .. $#$children) {	1355	for 0 .. $#$children;
1204	my $child = $children->[$_];
1205
1206	my $alloc_h = $h[$_];
1207	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208	$h[$_] = $alloc_h;
1209	}	1356	}
1210	}	1357	}
1211		1358
1212	CFClient::UI::harmonize \@h;	1359	CFClient::UI::harmonize \@req;
1213		1360
1214	my $y = 0;	1361	my $pos = 0;
1215	for (0 .. $#$children) {	1362	for (0 .. $#$children) {
1216	my $child = $children->[$_];
1217	my $h = $h[$_];	1363	my $alloc = $req[$_];
1218	$child->configure ($y, 0, $h, $w);	1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219		1365
1220	$y += $h;	1366	$pos += $alloc;
1221	}	1367	}
1222		1368
1223	1	1369	1
1224	}	1370	}
1225		1371
1226	#############################################################################	1372	#############################################################################
1227		1373
		1374	package CFClient::UI::HBox;
		1375
		1376	our @ISA = CFClient::UI::Box::;
		1377
		1378	sub new {
		1379	my $class = shift;
		1380
		1381	$class->SUPER::new (
		1382	vertical => 0,
		1383	@_,
		1384	)
		1385	}
		1386
		1387	#############################################################################
		1388
1228	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1229		1390
1230	# TODO: wrap into common Box base class
1231
1232	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1233		1392
1234	sub size_request {	1393	sub new {
1235	my ($self) = @_;	1394	my $class = shift;
1236		1395
1237	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1238		1397	vertical => 1,
1239	(	1398	@_,
1240	(List::Util::max map $_->[0], @alloc),
1241	(List::Util::sum map $_->[1], @alloc),
1242	)	1399	)
1243	}
1244
1245	sub size_allocate {
1246	my ($self, $w, $h) = @_;
1247
1248	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250	my $children = $self->{children};
1251
1252	my @h = map $_->{req_h}, @$children;
1253
1254	my $req_h = List::Util::sum @h;
1255
1256	if ($req_h > $h) {
1257	# ah well, not enough space
1258	$_ *= $h / $req_h for @h;
1259	} else {
1260	my $exp = List::Util::sum map $_->{expand}, @$children;
1261	$exp ||= 1;
1262
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265
1266	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267	}
1268	}
1269
1270	CFClient::UI::harmonize \@h;
1271
1272	my $y = 0;
1273	for (0 .. $#$children) {
1274	my $child = $children->[$_];
1275	my $h = $h[$_];
1276	$child->configure (0, $y, $w, $h);
1277
1278	$y += $h;
1279	}
1280
1281	1
1282	}	1400	}
1283		1401
1284	#############################################################################	1402	#############################################################################
1285		1403
1286	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1297	#bg => none	1415	#bg => none
1298	#active_bg => none	1416	#active_bg => none
1299	#font => default_font	1417	#font => default_font
1300	#text => initial text	1418	#text => initial text
1301	#markup => initial narkup	1419	#markup => initial narkup
		1420	#max_w => maximum pixel width
		1421	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1422	layout => (new CFClient::Layout),
1303	fontsize => 1,	1423	fontsize => 1,
1304	align => -1,	1424	align => -1,
1305	valign => -1,	1425	valign => -1,
1306	padding => 2,	1426	padding => 2,
…		…
1371	sub size_request {	1491	sub size_request {
1372	my ($self) = @_;	1492	my ($self) = @_;
1373		1493
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1494	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1495	$self->{layout}->set_width ($self->{max_w} || -1);
		1496	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1497	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1499
1378	my ($w, $h) = $self->{layout}->size;	1500	my ($w, $h) = $self->{layout}->size;
1379		1501
1380	if (exists $self->{template}) {	1502	if (exists $self->{template}) {
…		…
1416		1538
1417	my $tex = $self->{texture} ||= do {	1539	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1540	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1541	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1542	$self->{layout}->set_width ($self->{w});
		1543	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1546
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1547	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1548
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1465	can_hover => 1,	1589	can_hover => 1,
1466	can_focus => 1,	1590	can_focus => 1,
1467	valign => 0,	1591	valign => 0,
1468	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1469	@_	1594	@_
1470	)	1595	)
1471	}	1596	}
1472		1597
1473	sub _set_text {	1598	sub _set_text {
…		…
1483	$self->{text} = $text;	1608	$self->{text} = $text;
1484		1609
1485	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1487		1612
1488	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1489	}	1614	}
1490		1615
1491	sub set_text {	1616	sub set_text {
1492	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1493		1618
…		…
1505	my ($self) = @_;	1630	my ($self) = @_;
1506		1631
1507	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1508		1633
1509	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1635	}
1517		1636
1518	sub key_down {	1637	sub key_down {
1519	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1520		1639
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1659	$self->_emit ('escape');
1541	} elsif ($uni) {	1660	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1662	}
1544		1663
1545	$self->_set_text ($text);	1664	$self->_set_text ($text);
…		…
1632	if ($sym == 13) {	1751	if ($sym == 13) {
1633	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1638	$self->update;	1757	$self->update;
1639		1758
1640	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1809	can_events => 1,
1691	@_	1810	@_
1692	)	1811	)
1693	}	1812	}
1694		1813
		1814	sub activate { }
		1815
1695	sub button_up {	1816	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1697		1818
		1819	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1822	}
1703		1823
1704	sub _draw {	1824	sub _draw {
1705	my ($self) = @_;	1825	my ($self) = @_;
1706		1826
…		…
1758	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1759		1879
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1764	}	1884	}
1765	}	1885	}
1766		1886
1767	sub _draw {	1887	sub _draw {
1768	my ($self) = @_;	1888	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2051	vertical => 0,	2171	vertical => 0,
2052	can_hover => 1,	2172	can_hover => 1,
2053	inner_pad => .05,	2173	inner_pad => 0.02,
2054	@_	2174	@_
2055	);	2175	);
2056		2176
2057	$self->set_value ($self->{range}[0]);	2177	$self->set_value ($self->{range}[0]);
2058	$self->update;	2178	$self->update;
2059		2179
2060	$self	2180	$self
2061	}	2181	}
2062		2182
		2183	sub set_range {
		2184	my ($self, $range) = @_;
		2185
		2186	($range, $self->{range}) = ($self->{range}, $range);
		2187
		2188	$self->update
		2189	if "@$range" ne "@{$self->{range}}";
		2190	}
		2191
2063	sub set_value {	2192	sub set_value {
2064	my ($self, $value) = @_;	2193	my ($self, $value) = @_;
2065		2194
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2195	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2196
2068	$hi = $lo + 1 if $hi <= $lo;	2197	$hi = $lo + 1 if $hi <= $lo;
2069		2198
		2199	$page = $hi - $lo if $page > $hi - $lo;
		2200
2070	$value = $lo if $value < $lo;	2201	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2202	$value = $hi - $page if $value > $hi - $page;
2072		2203
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2204	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2205	if $unit;
2075		2206
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2207	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2208
2080	if ($value != $old_value) {	2209	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2210	$self->_emit (changed => $value);
2082	$self->update;	2211	$self->update;
2083	}	2212	}
2084	}	2213	}
2085		2214
2086	sub size_request {	2215	sub size_request {
…		…
2094		2223
2095	sub button_down {	2224	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2225	my ($self, $ev, $x, $y) = @_;
2097		2226
2098	$self->SUPER::button_down ($ev, $x, $y);	2227	$self->SUPER::button_down ($ev, $x, $y);
		2228
		2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2230
2099	$self->mouse_motion ($ev, $x, $y);	2231	$self->mouse_motion ($ev, $x, $y);
2100	}	2232	}
2101		2233
2102	sub mouse_motion {	2234	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2237	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2238	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2239
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2240	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2241
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2243
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2245	}
2114	}	2246	}
2115		2247
2116	sub update {	2248	sub update {
2117	my ($self) = @_;	2249	my ($self) = @_;
2118		2250
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2252	$self->set_value ($self->{range}[0]);
2121		2253
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2254	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2255	my $range = ($hi - $page - $lo) || 1e-100;
2123		2256
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2257	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2258
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2259	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2260	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2261
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2262	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2263	$value = $value * $self->{scale} + $self->{offset};
2130		2264
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2265	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2266	$self->{knob_w} = $knob_w;
2138	});	2267	});
2139		2268
2140	$self->SUPER::update;	2269	$self->SUPER::update;
2141	}	2270	}
2142		2271
…		…
2148	glScale $self->{w}, $self->{h};	2277	glScale $self->{w}, $self->{h};
2149		2278
2150	if ($self->{vertical}) {	2279	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2280	# draw a vertical slider like a rotated horizontal slider
2152		2281
		2282	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2283	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2284	}
2156		2285
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2286	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2287	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2288
…		…
2166	# draw handle	2295	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2296	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2297
2169	glDisable GL_TEXTURE_2D;	2298	glDisable GL_TEXTURE_2D;
2170	}	2299	}
		2300
		2301	#############################################################################
		2302
		2303	package CFClient::UI::ValSlider;
		2304
		2305	our @ISA = CFClient::UI::HBox::;
		2306
		2307	sub new {
		2308	my ($class, %arg) = @_;
		2309
		2310	my $range = delete $arg{range};
		2311
		2312	my $self = $class->SUPER::new (
		2313	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2314	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2315	to_value => sub { shift },
		2316	from_value => sub { shift },
		2317	%arg,
		2318	);
		2319
		2320	$self->{slider}->connect (changed => sub {
		2321	my ($self, $value) = @_;
		2322	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2323	$self->{parent}->emit (changed => $value);
		2324	});
		2325
		2326	# $self->{entry}->connect (changed => sub {
		2327	# my ($self, $value) = @_;
		2328	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2329	# $self->{parent}->emit (changed => $value);
		2330	# });
		2331
		2332	$self->add ($self->{slider}, $self->{entry});
		2333
		2334	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2335
		2336	$self
		2337	}
		2338
		2339	sub set_range { shift->{slider}->set_range (@_) }
		2340	sub set_value { shift->{slider}->set_value (@_) }
2171		2341
2172	#############################################################################	2342	#############################################################################
2173		2343
2174	package CFClient::UI::TextView;	2344	package CFClient::UI::TextView;
2175		2345
…		…
2205		2375
2206	$self->{fontsize} = $fontsize;	2376	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2377	$self->reflow;
2208	}	2378	}
2209		2379
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2380	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2381	my ($self, $w, $h) = @_;
2231		2382
2232	$self->SUPER::size_allocate ($w, $h);	2383	$self->SUPER::size_allocate ($w, $h);
2233		2384
…		…
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2388
2238	$self->reflow;	2389	$self->reflow;
2239	}	2390	}
2240		2391
		2392	sub text_size {
		2393	my ($self, $text, $indent) = @_;
		2394
		2395	my $layout = $self->{layout};
		2396
		2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2398	$layout->set_width ($self->{children}[0]{w} - $indent);
		2399	$layout->set_markup ($text);
		2400
		2401	$layout->size
		2402	}
		2403
		2404	sub reflow {
		2405	my ($self) = @_;
		2406
		2407	$self->{need_reflow}++;
		2408	$self->update;
		2409	}
		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2241	sub add_paragraph {	2426	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2243		2428
2244	#TODO: intelligently "reformat" paragraph	2429	for my $line (split /\n/, $text) {
2245		2430	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2431	$self->{height} += $h;
		2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2433	}
2249		2434
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2436	}
2255		2437
2256	sub update {	2438	sub update {
2257	my ($self) = @_;	2439	my ($self) = @_;
2258		2440
…		…
2261	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2262		2444
2263	delete $self->{texture};	2445	delete $self->{texture};
2264		2446
2265	$ROOT->on_post_alloc ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2266	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2451	my $height = 0;
2268		2452
2269	$height += $_->[0] = $self->text_height ($_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2270	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2271		2468
2272	$self->{height} = $height;	2469	$self->{height} = $height;
2273		2470
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2472
2276	delete $self->{texture};	2473	delete $self->{texture};
2277	}	2474	}
2278		2475
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2282		2479
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2480	my $top = int $self->{children}[1]{range}[0];
2287		2481
2288	my $y0 = $top;	2482	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2290		2484
2291	my $y = 0;	2485	my $y = 0;
2292		2486
2293	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2294		2488
2295	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2296		2490
		2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
		2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2494
2297	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2496	my $h = $par->[1];
2299		2497
2300	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
		2500	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2501	$layout->set_markup ($par->[4]);
2303		2502
2304	my ($W, $H) = $layout->size;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2504
		2505	glRasterPos $par->[3], $y - $y0;
		2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2507	}
2307		2508
2308	$y += $h;	2509	$y += $h;
2309	}	2510	}
2310		2511
2311	glDisable GL_TEXTURE_2D;	2512	glDisable GL_BLEND;
2312	};	2513	};
2313	});	2514	});
2314	}	2515	}
2315		2516
2316	sub _draw {	2517	sub _draw {
2317	my ($self) = @_;	2518	my ($self) = @_;
2318		2519
2319	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2522	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2524	glDisable GL_TEXTURE_2D;
2324		2525
2325	$self->{children}[1]->draw;	2526	$self->{children}[1]->draw;
2326		2527
2327	}	2528	}
…		…
2376		2577
2377	sub new {	2578	sub new {
2378	my $class = shift;	2579	my $class = shift;
2379		2580
2380	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2381	state => 0,	2582	state => 0,
2382	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2383	@_	2584	@_
2384	);	2585	);
2385		2586
2386	if ($self->{state}) {
2387	$self->{state} = 0;
2388	$self->toggle_flopper;
2389	}
2390
2391	$self	2587	$self
2392	}	2588	}
2393		2589
2394	sub toggle_flopper {	2590	sub toggle_flopper {
2395	my ($self) = @_;	2591	my ($self) = @_;
2396		2592
2397	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2398	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");
2402	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");
2405	}
2406
2407	$self->emit (changed => $self->{state});
2408	}	2594	}
2409		2595
2410	#############################################################################	2596	#############################################################################
2411		2597
2412	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2426		2612
2427	sub set_tooltip_from {	2613	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2614	my ($self, $widget) = @_;
2429		2615
2430	$self->add (new CFClient::UI::Label	2616	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2617	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2619	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2620	fg => [0, 0, 0, 1],
		2621	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2622	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2623	);
2437	}	2624	}
2438		2625
2439	sub size_request {	2626	sub size_request {
2440	my ($self) = @_;	2627	my ($self) = @_;
…		…
2486	use CFClient::OpenGL;	2673	use CFClient::OpenGL;
2487		2674
2488	sub new {	2675	sub new {
2489	my $class = shift;	2676	my $class = shift;
2490		2677
2491	$class->SUPER::new (	2678	my $self = $class->SUPER::new (
2492	aspect => 1,	2679	aspect => 1,
		2680	can_events => 0,
2493	@_,	2681	@_,
2494	)	2682	);
		2683
		2684	if ($self->{anim} && $self->{animspeed}) {
		2685	Scalar::Util::weaken (my $widget = $self);
		2686
		2687	$self->{timer} = Event->timer (
		2688	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2689	hard => 1,
		2690	interval => $self->{animspeed},
		2691	cb => sub {
		2692	++$widget->{frame};
		2693	$widget->update;
		2694	},
		2695	);
		2696	}
		2697
		2698	$self
2495	}	2699	}
2496		2700
2497	sub size_request {	2701	sub size_request {
2498	(32, 8)	2702	(32, 8)
2499	}	2703	}
2500		2704
		2705	sub update {
		2706	my ($self) = @_;
		2707
		2708	return unless $self->{visible};
		2709
		2710	$self->SUPER::update;
		2711	}
		2712
2501	sub _draw {	2713	sub _draw {
2502	my ($self) = @_;	2714	my ($self) = @_;
2503		2715
2504	return unless $::CONN;#d# manage and cache textures differently	2716	return unless $::CONN;
		2717
		2718	my $face;
		2719
		2720	if ($self->{frame}) {
		2721	my $anim = $::CONN->{anim}[$self->{anim}];
		2722
		2723	$face = $anim->[ $self->{frame} % @$anim ]
		2724	if $anim && @$anim;
		2725	}
		2726
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2727	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2728
2507	# TODO animation
2508	if ($tex) {	2729	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2730	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2732	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2733	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2734	glDisable GL_TEXTURE_2D;
2514	}	2735	}
2515	}	2736	}
2516		2737
2517	#############################################################################	2738	sub DESTROY {
		2739	my ($self) = @_;
2518		2740
		2741	$self->{timer}->cancel
		2742	if $self->{timer};
		2743
		2744	$self->SUPER::DESTROY;
		2745	}
		2746
		2747	#############################################################################
		2748
2519	package CFClient::UI::InventoryItem;	2749	package CFClient::UI::Inventory;
2520		2750
2521	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFClient::UI::ScrolledWindow::;
2522
2523	sub _item_to_desc {
2524	my ($item) = @_;
2525
2526	my $desc =
2527	$item->{nrof} < 2
2528	? $item->{name}
2529	: "$item->{nrof} $item->{name_pl}";
2530
2531	$item->{flags} & Crossfire::Protocol::F_OPEN
2532	and $desc .= " (open)";
2533	$item->{flags} & Crossfire::Protocol::F_APPLIED
2534	and $desc .= " (applied)";
2535	$item->{flags} & Crossfire::Protocol::F_UNPAID
2536	and $desc .= " (unpaid)";
2537	$item->{flags} & Crossfire::Protocol::F_MAGIC
2538	and $desc .= " (magic)";
2539	$item->{flags} & Crossfire::Protocol::F_CURSED
2540	and $desc .= " (cursed)";
2541	$item->{flags} & Crossfire::Protocol::F_DAMNED
2542	and $desc .= " (damned)";
2543	$item->{flags} & Crossfire::Protocol::F_LOCKED
2544	and $desc .= " *";
2545
2546	$desc
2547	}
2548		2752
2549	sub new {	2753	sub new {
2550	my $class = shift;	2754	my $class = shift;
2551		2755
2552	my %args = @_;
2553
2554	my $item = delete $args{item};
2555
2556	my $desc = _item_to_desc ($item);
2557
2558	my $self = $class->SUPER::new (	2756	my $self = $class->SUPER::new (
2559	can_hover => 1,	2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2560	can_events => 1,
2561	tooltip => ((CFClient::UI::Label::escape $desc)
2562	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563	connect_button_down => sub {
2564	my ($self, $ev, $x, $y) = @_;
2565
2566	# todo: maybe put examine on 1? but should just be a tooltip :(
2567	if ($ev->{button} == 1) {
2568	my $targ = $::CONN->{player}{tag};
2569
2570	if ($item->{container} == $::CONN->{player}{tag}) {
2571	$targ = $main::OPENCONT;
2572	}
2573
2574	$::CONN->send ("move $targ $item->{tag} 0");
2575	} elsif ($ev->{button} == 2) {
2576	$::CONN->send ("apply $item->{tag}");
2577	} elsif ($ev->{button} == 3) {
2578	my @menu_items = (
2579	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583	[
2584	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585	sub { $::CONN->send ("lock $item->{tag}") },
2586	],
2587	);
2588
2589	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590	}
2591
2592	1
2593	},
2594	%args
2595	);
2596
2597
2598	$self->add (new CFClient::UI::Face
2599	can_events => 0,
2600	face => $item->{face},
2601	anim => $item->{anim},
2602	animspeed => $item->{animspeed},
2603	);
2604
2605	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607	$self->{item} = $item;
2608
2609	$self->update_item;
2610
2611	$self
2612	}
2613
2614	sub update_item {
2615	my ($self) = @_;
2616
2617	my $desc = _item_to_desc ($self->{item});
2618
2619	$self->{name_lbl}->set_text ($desc);
2620	}
2621
2622	#############################################################################
2623
2624	package CFClient::UI::Inventory;
2625
2626	our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628	sub new {
2629	my $class = shift;
2630
2631	my $self = $class->SUPER::new (
2632	scrolled => (new CFClient::UI::VBox),
2633	@_,	2758	@_,
2634	);	2759	);
2635		2760
2636	$self	2761	$self
2637	}	2762	}
…		…
2647	or ($a->{name} cmp $b->{name})	2772	or ($a->{name} cmp $b->{name})
2648	} @$items;	2773	} @$items;
2649		2774
2650	$self->{real_items} = \@items;	2775	$self->{real_items} = \@items;
2651		2776
		2777	my $row = 0;
2652	for my $item (@items) {	2778	for my $item (@items) {
2653	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2779	CFClient::Item::update_widgets $item;
2654	$item->update_item ();
2655	}
2656		2780
2657	$self->{scrolled}->add (@items);	2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2658		2784
2659	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2785	$row++;
2660	}	2786	}
2661
2662	sub size_request {
2663	my ($self) = @_;
2664	($self->{req_w}, $self->{req_h});
2665	}	2787	}
2666		2788
2667	#############################################################################	2789	#############################################################################
2668		2790
2669	package CFClient::UI::Menu;	2791	package CFClient::UI::Menu;
…		…
2704		2826
2705	# popup given the event (must be a mouse button down event currently)	2827	# popup given the event (must be a mouse button down event currently)
2706	sub popup {	2828	sub popup {
2707	my ($self, $ev) = @_;	2829	my ($self, $ev) = @_;
2708		2830
2709	$self->emit ("popdown");	2831	$self->_emit ("popdown");
2710		2832
2711	# maybe save $GRAB? must be careful about events...	2833	# maybe save $GRAB? must be careful about events...
2712	$GRAB = $self;	2834	$GRAB = $self;
2713	$self->{button} = $ev->{button};	2835	$self->{button} = $ev->{button};
2714		2836
…		…
2729		2851
2730	if ($ev->{button} == $self->{button}) {	2852	if ($ev->{button} == $self->{button}) {
2731	undef $GRAB;	2853	undef $GRAB;
2732	$self->hide;	2854	$self->hide;
2733		2855
2734	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2735	$self->{hover}[1]->() if $self->{hover};	2857	$self->{hover}[1]->() if $self->{hover};
2736	}	2858	}
2737	}	2859	}
2738		2860
2739	#############################################################################	2861	#############################################################################
…		…
2774	# TODO: doesn't handle markup well (read as: at all)	2896	# TODO: doesn't handle markup well (read as: at all)
2775	my $short = $item->{count} > 1	2897	my $short = $item->{count} > 1
2776	? "<b>$item->{count} ×</b> $item->{text}"	2898	? "<b>$item->{count} ×</b> $item->{text}"
2777	: $item->{text};	2899	: $item->{text};
2778		2900
2779	my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781	for ($short) {	2901	for ($short) {
2782	s/^\s+//;	2902	s/^\s+//;
2783	s/\s+/ /g;	2903	s/\s+/ /g;
2784	my $len = int 40 / $fontsize;
2785	substr $_, $len, length, "…" if $len < length;
2786	}	2904	}
2787		2905
2788	new CFClient::UI::Label	2906	new CFClient::UI::Label
2789	markup => $short,	2907	markup => $short,
2790	tooltip => $item->{tooltip},	2908	tooltip => $item->{tooltip},
2791	tooltip_font => $::FONT_PROP,	2909	tooltip_font => $::FONT_PROP,
2792	tooltip_width => 0.67,	2910	tooltip_width => 0.67,
2793	fontsize => $fontsize,	2911	fontsize => $item->{fontsize} || $self->{fontsize},
		2912	max_w => $::WIDTH * 0.44,
2794	fg => $item->{fg},	2913	fg => $item->{fg},
2795	can_events => 1,	2914	can_events => 1,
2796	can_hover => 1	2915	can_hover => 1
2797	};	2916	};
2798	}	2917	}
…		…
2804	sub add {	2923	sub add {
2805	my ($self, $text, %arg) = @_;	2924	my ($self, $text, %arg) = @_;
2806		2925
2807	$text =~ s/^\s+//;	2926	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	2927	$text =~ s/\s+$//;
		2928
		2929	return unless $text;
2809		2930
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	2931	my $timeout = time + ((delete $arg{timeout}) || 60);
2811		2932
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2933	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		2934
…		…
2835	}	2956	}
2836		2957
2837	$self->reorder;	2958	$self->reorder;
2838	}	2959	}
2839		2960
		2961	sub reconfigure {
		2962	my ($self) = @_;
		2963
		2964	delete $_->{label}
		2965	for values %{ $self->{item} || {} };
		2966
		2967	$self->reorder;
		2968	$self->SUPER::reconfigure;
		2969	}
		2970
2840	#############################################################################	2971	#############################################################################
2841		2972
2842	package CFClient::UI::Root;	2973	package CFClient::UI::Root;
2843		2974
2844	our @ISA = CFClient::UI::Container::;	2975	our @ISA = CFClient::UI::Container::;
…		…
2847		2978
2848	sub new {	2979	sub new {
2849	my $class = shift;	2980	my $class = shift;
2850		2981
2851	$class->SUPER::new (	2982	$class->SUPER::new (
		2983	visible => 1,
2852	@_,	2984	@_,
2853	)	2985	)
2854	}	2986	}
2855		2987
2856	sub configure {	2988	sub configure {
…		…
2874	}	3006	}
2875		3007
2876	sub size_allocate {	3008	sub size_allocate {
2877	my ($self, $w, $h) = @_;	3009	my ($self, $w, $h) = @_;
2878		3010
2879	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885	for my $child ($self->children) {	3011	for my $child ($self->children) {
2886	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887		3013
2888	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889	if exists $child->{req_x};	3015	if exists $child->{req_x};
2890		3016
2891	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892	if exists $child->{req_y};	3018	if exists $child->{req_y};
2893		3019
		3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3021
2894	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896		3024
2897	$child->configure ($X, $Y, $W, $H);	3025	$child->configure ($X, $Y, $W, $H);
2898	}	3026	}
…		…
2919		3047
2920	sub add {	3048	sub add {
2921	my ($self, @children) = @_;	3049	my ($self, @children) = @_;
2922		3050
2923	for my $child (@children) {	3051	for my $child (@children) {
2924	$child->{toplevel} = 1;	3052	$child->{is_toplevel} = 1;
2925		3053
2926	# integerise window positions	3054	# integerise window positions
2927	$child->{x} = int $child->{x};	3055	$child->{x} = int $child->{x};
2928	$child->{y} = int $child->{y};	3056	$child->{y} = int $child->{y};
2929	}	3057	}
2930		3058
2931	$self->SUPER::add (@children);	3059	$self->SUPER::add (@children);
		3060
		3061	for (my @widgets = @children; my $w = pop @widgets; ) {
		3062	push @widgets, $w->children;
		3063	$w->set_visible;
		3064	}
		3065
		3066	}
		3067
		3068	sub remove {
		3069	my ($self, @children) = @_;
		3070
		3071	$self->SUPER::remove (@children);
		3072
		3073	while (@children) {
		3074	my $w = pop @children;
		3075	push @children, $w->children;
		3076	$w->set_invisible;
		3077	}
2932	}	3078	}
2933		3079
2934	sub on_refresh {	3080	sub on_refresh {
2935	my ($self, $id, $cb) = @_;	3081	my ($self, $id, $cb) = @_;
2936		3082
…		…
2950	$_->()	3096	$_->()
2951	for values %{delete $self->{refresh_hook}};	3097	for values %{delete $self->{refresh_hook}};
2952	}	3098	}
2953		3099
2954	if ($self->{check_size}) {	3100	if ($self->{check_size}) {
2955	my @queue = ([], []);	3101	my @queue;
2956		3102
2957	for (;;) {	3103	while () {
2958	if ($self->{check_size}) {	3104	if ($self->{check_size}) {
2959	# heuristic: check containers last	3105	#TODO use array-of-depth approach
2960	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3106
		3107	@queue = sort { $a->{visible} <=> $b->{visible} }
2961	for values %{delete $self->{check_size}}	3108	@queue, values %{delete $self->{check_size}};
2962	}	3109	}
2963		3110
2964	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3111	my $widget = pop @queue || last;
2965		3112
		3113	defined $widget->{visible} or last; # do not resize invisible widgets
		3114
2966	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2967	? @$widget{qw(user_w user_h)}	3116	? @$widget{qw(def_w def_h)}
2968	: $widget->size_request;	3117	: $widget->size_request;
2969		3118
2970	if (delete $widget->{force_alloc}	3119	if (delete $widget->{force_alloc}
2971	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2980	if $widget->{parent};	3129	if $widget->{parent};
2981	}	3130	}
2982	}	3131	}
2983	}	3132	}
2984		3133
2985	while ($self->{size_alloc}) {	3134	while (my $size_alloc = delete $self->{size_alloc}) {
2986	for (values %{delete $self->{size_alloc}}) {	3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2987	my ($widget, $w, $h) = @$_;	3136	values %$size_alloc;
		3137
		3138	while () {
		3139	my ($widget, $w, $h) = @{ pop @queue or last };
2988		3140
2989	$w = 0 if $w < 0;	3141	$w = 0 if $w < 0;
2990	$h = 0 if $h < 0;	3142	$h = 0 if $h < 0;
2991		3143
2992	$widget->{w} = $w;	3144	$widget->{w} = $w;
2993	$widget->{h} = $h;	3145	$widget->{h} = $h;
2994	$widget->size_allocate ($w, $h);
2995	$widget->emit (size_allocate => $w, $h);	3146	$widget->emit (size_allocate => $w, $h);
2996	}	3147	}
2997	}	3148	}
2998		3149
2999	while ($self->{post_alloc_hook}) {	3150	while ($self->{post_alloc_hook}) {
…		…
3005	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006	glClear GL_COLOR_BUFFER_BIT;	3157	glClear GL_COLOR_BUFFER_BIT;
3007		3158
3008	glMatrixMode GL_PROJECTION;	3159	glMatrixMode GL_PROJECTION;
3009	glLoadIdentity;	3160	glLoadIdentity;
3010	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011	glMatrixMode GL_MODELVIEW;	3162	glMatrixMode GL_MODELVIEW;
3012	glLoadIdentity;	3163	glLoadIdentity;
3013		3164
3014	$self->_draw;	3165	$self->_draw;
3015	}	3166	}
…		…
3017	#############################################################################	3168	#############################################################################
3018		3169
3019	package CFClient::UI;	3170	package CFClient::UI;
3020		3171
3021	$ROOT = new CFClient::UI::Root;	3172	$ROOT = new CFClient::UI::Root;
3022	$TOOLTIP = new CFClient::UI::Tooltip;	3173	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023		3174
3024	1	3175	1
3025		3176

Diff Legend

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