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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167
168	$widget->reconfigure;
169	}	190	}
		191
		192	reconfigure_widgets;
170	}	193	}
171		194
172	#############################################################################	195	#############################################################################
173		196
174	package CFClient::UI::Base;	197	package CFClient::UI::Base;
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub show_centered {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
218	return if $self->{parent};	257	return if $self->{visible};
219		258
220	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
221		261
222	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
223	"centered $self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225	},
226	);
227	}
228		263
229	sub hide {	264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
230	my ($self) = @_;	270	my ($self) = @_;
		271
		272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
		277	delete $self->{visible};
231		278
232	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
234		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
		285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
		305	}
		306
		307	sub hide {
		308	my ($self) = @_;
		309
		310	$self->set_invisible;
		311
235	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
236	if $self->{parent};	313	if $self->{parent};
237	}	314	}
238		315
239	sub move {	316	sub move_abs {
240	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
241		318
242	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
243	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
244	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
245		322
246	$self->update;	323	$self->update;
247	}	324	}
248		325
249	sub set_size {	326	sub set_size {
250	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
251		328
252	$self->{user_w} = $w;	329	$self->{force_w} = $w;
253	$self->{user_h} = $h;	330	$self->{force_h} = $h;
254		331
255	$self->check_size;	332	$self->realloc;
256	}	333	}
257		334
258	sub size_request {	335	sub size_request {
259	require Carp;	336	require Carp;
260	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
262		339
263	sub configure {	340	sub configure {
264	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
265		342
266	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
267	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
268	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
269		348
270	# use alignment to adjust x, y	349	# use alignment to adjust x, y
271		350
272	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
273	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
274
275	($w, $h) = ($w2, $h2);
276	}	353	}
277		354
278	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
279	$self->{x} = $x;	356	$self->{x} = $x;
280	$self->{y} = $y;	357	$self->{y} = $y;
281	$self->update;	358	$self->update;
282	}	359	}
283		360
284	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
286	}	368	}
287	}	369	}
288		370
289	sub size_allocate {	371	sub size_allocate {
290	# nothing to be done	372	# nothing to be done
291	}	373	}
292		374
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
301	}	381	}
302		382
303	sub set_max_size {	383	sub set_max_size {
304	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
305		385
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	388	}
309		389
310	sub set_tooltip {	390	sub set_tooltip {
311	my ($self, $tooltip) = @_;	391	my ($self, $tooltip) = @_;
		392
		393	$tooltip =~ s/^\s+//;
		394	$tooltip =~ s/\s+$//;
		395
		396	return if $self->{tooltip} eq $tooltip;
312		397
313	$self->{tooltip} = $tooltip;	398	$self->{tooltip} = $tooltip;
314		399
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	401	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	423	return if $FOCUS == $self;
339	return unless $self->{can_focus};	424	return unless $self->{can_focus};
340		425
341	my $focus = $FOCUS; $FOCUS = $self;	426	my $focus = $FOCUS; $FOCUS = $self;
342		427
343	$self->emit (focus_in => $focus);	428	$self->_emit (focus_in => $focus);
344		429
345	$focus->update if $focus;	430	$focus->update if $focus;
346	$FOCUS->update;	431	$FOCUS->update;
347	}	432	}
348		433
…		…
351		436
352	return unless $FOCUS == $self;	437	return unless $FOCUS == $self;
353		438
354	my $focus = $FOCUS; undef $FOCUS;	439	my $focus = $FOCUS; undef $FOCUS;
355		440
356	$self->emit (focus_out => $focus);	441	$self->_emit (focus_out => $focus);
357		442
358	$focus->update if $focus; #?	443	$focus->update if $focus; #?
359	}
360		444
		445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		446	unless $FOCUS;
		447	}
		448
361	sub mouse_motion { }	449	sub mouse_motion { 0 }
362	sub button_up { }	450	sub button_up { 0 }
363	sub key_down { }	451	sub key_down { 0 }
364	sub key_up { }	452	sub key_up { 0 }
365		453
366	sub button_down {	454	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
368		456
369	$self->focus_in;	457	$self->focus_in;
370	}
371		458
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377		535
378	sub draw {	536	sub draw {
379	my ($self) = @_;	537	my ($self) = @_;
380		538
381	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382		550
383	glPushMatrix;	551	glPushMatrix;
384	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
385	$self->_draw;	553	$self->_draw;
386	glPopMatrix;	554	glPopMatrix;
…		…
398	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
399	glEnd;	567	glEnd;
400	glDisable GL_BLEND;	568	glDisable GL_BLEND;
401	}	569	}
402		570
403	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
404	glPushMatrix;	572	glPushMatrix;
405	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	576	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	577	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	578	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	579	glVertex 0 , $self->{h} - 1;
412	glEnd;	580	glEnd;
413	glPopMatrix;	581	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	583	}
416	}	584	}
417		585
418	sub _draw {	586	sub _draw {
419	my ($self) = @_;	587	my ($self) = @_;
420		588
421	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	590	}
473		591
474	sub DESTROY {	592	sub DESTROY {
475	my ($self) = @_;	593	my ($self) = @_;
476		594
…		…
534	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
536	}	654	}
537		655
538	sub size_request {	656	sub size_request {
539	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
540	}	660	}
541		661
542	sub draw { }	662	sub draw { }
543		663
544	#############################################################################	664	#############################################################################
…		…
548	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
549		669
550	sub new {	670	sub new {
551	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
552		672
553	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
554		674
555	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
556	children => [],	676	children => [],
557	can_events => 0,	677	can_events => 0,
558	%arg,	678	%arg,
559	);	679	);
		680
560	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
561		683
562	$self	684	$self
563	}	685	}
564		686
565	sub add {	687	sub add {
…		…
573	$self->{children} = [	695	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
576	];	698	];
577		699
578	$self->check_size (1);	700	$self->realloc;
579	$self->update;
580	}	701	}
581		702
582	sub children {	703	sub children {
583	@{ $_[0]{children} }	704	@{ $_[0]{children} }
584	}	705	}
…		…
589	delete $child->{parent};	710	delete $child->{parent};
590	$child->hide;	711	$child->hide;
591		712
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		714
594	$self->check_size;	715	$self->realloc;
595	$self->update;
596	}	716	}
597		717
598	sub clear {	718	sub clear {
599	my ($self) = @_;	719	my ($self) = @_;
600		720
…		…
604	for (@$children) {	724	for (@$children) {
605	delete $_->{parent};	725	delete $_->{parent};
606	$_->hide;	726	$_->hide;
607	}	727	}
608		728
609	$self->check_size;	729	$self->realloc;
610	$self->update;
611	}	730	}
612		731
613	sub find_widget {	732	sub find_widget {
614	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
615		734
616	$x -= $self->{x};	735	$x -= $self->{x};
617	$y -= $self->{y};	736	$y -= $self->{y};
618		737
619	my $res;	738	my $res;
620		739
621	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
622	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
623	and return $res;	742	and return $res;
624	}	743	}
625		744
626	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
702	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
703	$self->update;	822	$self->update;
704	}	823	}
705		824
706	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
707	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
708	}	829	}
709		830
710	sub render_child {	831	sub render_child {
711	my ($self) = @_;	832	my ($self) = @_;
712		833
713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
715	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
716		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
717	$self->_render;	845	$self->_render;
718	};	846	};
719	}	847	}
720		848
721	sub _draw {	849	sub _draw {
722	my ($self) = @_;	850	my ($self) = @_;
723		851
724	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
725		853
726	my $tex = $self->{texture}	854	my $tex = $self->{texture}
727	or return;	855	or return;
728		856
729	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
739		867
740	package CFClient::UI::ViewPort;	868	package CFClient::UI::ViewPort;
741		869
742	our @ISA = CFClient::UI::Window::;	870	our @ISA = CFClient::UI::Window::;
743		871
		872	sub new {
		873	my $class = shift;
		874
		875	$class->SUPER::new (
		876	scroll_x => 0,
		877	scroll_y => 1,
		878	@_,
		879	)
		880	}
		881
744	sub size_request {	882	sub size_request {
745	my ($self) = @_;	883	my ($self) = @_;
746		884
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
749		886
750	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
751	}	891	}
752		892
753	sub size_allocate {	893	sub size_allocate {
754	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
755		895
		896	my $child = $self->child;
		897
		898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		900
		901	$self->child->configure (0, 0, $w, $h);
756	$self->update;	902	$self->update;
757	}	903	}
758		904
759	sub set_offset {	905	sub set_offset {
760	my ($self, $x, $y) = @_;	906	my ($self, $x, $y) = @_;
…		…
794	}	940	}
795		941
796	sub _render {	942	sub _render {
797	my ($self) = @_;	943	my ($self) = @_;
798		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		947
799	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800		949
801	$self->SUPER::_render;	950	$self->SUPER::_render;
802	}	951	}
803		952
…		…
806	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
807		956
808	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
809		958
810	sub new {	959	sub new {
811	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
812		963
813	my $self;	964	my $self;
814		965
815	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
816	vertical => 1,	967	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	968	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	969	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	970	$self->{vp}->set_offset (0, $_[1]);
820	},	971	},
821	;	972	;
822		973
823	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
825	slider => $slider,	976	slider => $slider,
826	@_,	977	%arg,
827	);	978	);
828		979
829	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});
831	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
832		982
833	$self	983	$self
		984	}
		985
		986	sub add {
		987	my ($self, $widget) = @_;
		988
		989	$self->{vp}->add ($self->{child} = $widget);
		990	}
		991
		992	sub update {
		993	my ($self) = @_;
		994
		995	$self->SUPER::update;
		996
		997	# todo: overwrite size_allocate of child
		998	my $child = $self->{vp}->child;
		999	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1000	}
		1001
		1002	sub size_allocate {
		1003	my ($self, $w, $h) = @_;
		1004
		1005	$self->SUPER::size_allocate ($w, $h);
		1006
		1007	my $child = $self->{vp}->child;
		1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834	}	1009	}
835		1010
836	#TODO# update range on size_allocate depending on child	1011	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	1012	# update viewport offset on scroll
838		1013
…		…
882		1057
883	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
884		1059
885	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
886		1061
887	my @tex =	1062	my $bg =
		1063	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1064	mipmap => 1, wrap => 1;
		1065
		1066	my @border =
888	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1068	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890		1069
891	sub new {	1070	sub new {
892	my $class = shift;	1071	my ($class, %arg) = @_;
893		1072
894	# TODO: user_x, user_y, overwrite moveto?	1073	my $title = delete $arg{title};
895		1074
896	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1078	border => 0.6,
900	toplevel => 1,
901	can_events => 1,	1079	can_events => 1,
902	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
903	);	1083	);
904		1084
905	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
906	align => 0,	1086	align => 0,
907	valign => 1,	1087	valign => 1,
908	text => $self->{title},	1088	text => $title,
909	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
910		1091
911	$self	1092	$self
		1093	}
		1094
		1095	sub add {
		1096	my ($self, @widgets) = @_;
		1097
		1098	$self->SUPER::add (@widgets);
		1099	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
912	}	1100	}
913		1101
914	sub border {	1102	sub border {
915	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
916	}	1104	}
917		1105
918	sub size_request {	1106	sub size_request {
919	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
920		1111
921	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
922		1113
923	(	1114	(
924	$w + $self->border * 2,	1115	$w + $self->border * 2,
…		…
927	}	1118	}
928		1119
929	sub size_allocate {	1120	sub size_allocate {
930	my ($self, $w, $h) = @_;	1121	my ($self, $w, $h) = @_;
931		1122
		1123	if ($self->{title}) {
		1124	$self->{title}{w} = $w;
		1125	$self->{title}{h} = $h;
		1126	$self->{title}->size_allocate ($w, $h);
		1127	}
		1128
		1129	my $border = $self->border;
		1130
932	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
933	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
934		1133
935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936	if $self->{title};
937
938	$self->child->configure ($self->border, $self->border, $w, $h);	1134	$self->child->configure ($border, $border, $w, $h);
939	}	1135	}
940		1136
941	sub button_down {	1137	sub button_down {
942	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
943		1139
…		…
959	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
960		1156
961	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
963		1159
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1162
		1163	$self->realloc;
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967	$self->check_size;
968	};	1165	};
969		1166
970	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
972	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
974	$self->{motion} = sub {	1171	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
976		1173
977	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
978		1175
979	$self->move ($bx + $x - $ox, $by + $y - $oy);	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980	$self->update;
981	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
982	}	1182	1
983	}	1183	}
984		1184
985	sub button_up {	1185	sub button_up {
986	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
987		1187
988	delete $self->{motion};	1188	!!delete $self->{motion}
989	}	1189	}
990		1190
991	sub mouse_motion {	1191	sub mouse_motion {
992	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
993		1193
994	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
995	}	1197	}
996		1198
997	sub _draw {	1199	sub _draw {
998	my ($self) = @_;	1200	my ($self) = @_;
999		1201
		1202	my $child = $self->{children}[0];
		1203
1000	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1002		1206
1003	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005		1209
1006	my $border = $self->border;	1210	my $border = $self->border;
1007		1211
1008	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013		1217
1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1016		1220
1017	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1018	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1019	my $rep_y = $ch / $bg->{h};	1224	$bg->{t} = $ch / $bg->{h};
1020
1021	glColor @{ $self->{bg} };
1022
1023	$bg->{s} = $rep_x;
1024	$bg->{t} = $rep_y;
1025	$bg->{wrap_mode} = 1;
1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027	}	1226	}
1028		1227
1029	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1030		1229
1031	$self->{title}->draw if $self->{title};
1032
1033	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1034	}	1236	}
1035		1237
1036	#############################################################################	1238	#############################################################################
1037		1239
1038	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1046	sub new {	1248	sub new {
1047	my $class = shift;	1249	my $class = shift;
1048		1250
1049	$class->SUPER::new (	1251	$class->SUPER::new (
1050	col_expand => [],	1252	col_expand => [],
1051	@_	1253	@_,
1052	)	1254	)
		1255	}
		1256
		1257	sub children {
		1258	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1259	}
1054		1260
1055	sub add {	1261	sub add {
1056	my ($self, $x, $y, $child) = @_;	1262	my ($self, $x, $y, $child) = @_;
1057		1263
1058	$child->set_parent ($self);	1264	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1265	$self->{children}[$y][$x] = $child;
1060		1266
1061	$child->check_size;	1267	$self->realloc;
1062	}	1268	}
1063		1269
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# TODO: move to container class maybe? send childs a signal on removal?	1270	# TODO: move to container class maybe? send children a signal on removal?
1069	sub clear {	1271	sub clear {
1070	my ($self) = @_;	1272	my ($self) = @_;
1071		1273
1072	my @children = $self->children;	1274	my @children = $self->children;
1073	delete $self->{children};	1275	delete $self->{children};
…		…
1075	for (@children) {	1277	for (@children) {
1076	delete $_->{parent};	1278	delete $_->{parent};
1077	$_->hide;	1279	$_->hide;
1078	}	1280	}
1079		1281
1080	$self->update;	1282	$self->realloc;
1081	}	1283	}
1082		1284
1083	sub get_wh {	1285	sub get_wh {
1084	my ($self) = @_;	1286	my ($self) = @_;
1085		1287
…		…
1116	sub size_allocate {	1318	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1319	my ($self, $w, $h) = @_;
1118		1320
1119	my ($ws, $hs) = $self->get_wh;	1321	my ($ws, $hs) = $self->get_wh;
1120		1322
1121	my $req_w = sum @$ws;	1323	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1324	my $req_h = (sum @$hs) || 1;
1123		1325
1124	# TODO: nicer code && do row_expand	1326	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1327	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1328	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1329	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1383	}
1182	}	1384	}
1183		1385
1184	#############################################################################	1386	#############################################################################
1185		1387
1186	package CFClient::UI::HBox;	1388	package CFClient::UI::Box;
1187
1188	# TODO: wrap into common Box base class
1189		1389
1190	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Container::;
1191		1391
1192	sub size_request {	1392	sub size_request {
1193	my ($self) = @_;	1393	my ($self) = @_;
1194		1394
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$self->{vertical}
1196		1396	? (
1197	(	1397	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1198	(List::Util::sum map $_->[0], @alloc),	1398	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199	(List::Util::max map $_->[1], @alloc),	1399	)
1200	)	1400	: (
		1401	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1402	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1403	)
1201	}	1404	}
1202		1405
1203	sub size_allocate {	1406	sub size_allocate {
1204	my ($self, $w, $h) = @_;	1407	my ($self, $w, $h) = @_;
1205		1408
1206	($h, $w) = ($w, $h);	1409	my $space = $self->{vertical} ? $h : $w;
1207
1208	my $children = $self->{children};	1410	my $children = $self->{children};
1209		1411
1210	my @h = map $_->{req_w}, @$children;	1412	my @req;
1211		1413
1212	my $req_h = List::Util::sum @h;	1414	if ($self->{homogeneous}) {
1213		1415	@req = ($space / (@$children || 1)) x @$children;
1214	if ($req_h > $h) {
1215	# ah well, not enough space
1216	$_ *= $h / $req_h for @h;
1217	} else {	1416	} else {
		1417	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1418	my $req = List::Util::sum @req;
		1419
		1420	if ($req > $space) {
		1421	# ah well, not enough space
		1422	$_ *= $space / $req for @req;
		1423	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;	1424	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219	$exp ||= 1;
1220		1425
		1426	$space = ($space - $req) / $expand; # remaining space to give away
		1427
		1428	$req[$_] += $space * $children->[$_]{expand}
1221	for (0 .. $#$children) {	1429	for 0 .. $#$children;
1222	my $child = $children->[$_];
1223
1224	my $alloc_h = $h[$_];
1225	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226	$h[$_] = $alloc_h;
1227	}	1430	}
1228	}	1431	}
1229		1432
1230	CFClient::UI::harmonize \@h;	1433	CFClient::UI::harmonize \@req;
1231		1434
1232	my $y = 0;	1435	my $pos = 0;
1233	for (0 .. $#$children) {	1436	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];	1437	my $alloc = $req[$_];
1236	$child->configure ($y, 0, $h, $w);	1438	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237		1439
1238	$y += $h;	1440	$pos += $alloc;
1239	}	1441	}
1240		1442
1241	1	1443	1
1242	}	1444	}
1243		1445
1244	#############################################################################	1446	#############################################################################
1245		1447
		1448	package CFClient::UI::HBox;
		1449
		1450	our @ISA = CFClient::UI::Box::;
		1451
		1452	sub new {
		1453	my $class = shift;
		1454
		1455	$class->SUPER::new (
		1456	vertical => 0,
		1457	@_,
		1458	)
		1459	}
		1460
		1461	#############################################################################
		1462
1246	package CFClient::UI::VBox;	1463	package CFClient::UI::VBox;
1247		1464
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1465	our @ISA = CFClient::UI::Box::;
1251		1466
1252	sub size_request {	1467	sub new {
1253	my ($self) = @_;	1468	my $class = shift;
1254		1469
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1470	$class->SUPER::new (
1256		1471	vertical => 1,
1257	(	1472	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1473	)
1261	}
1262
1263	sub size_allocate {
1264	my ($self, $w, $h) = @_;
1265
1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268	my $children = $self->{children};
1269
1270	my @h = map $_->{req_h}, @$children;
1271
1272	my $req_h = List::Util::sum @h;
1273
1274	if ($req_h > $h) {
1275	# ah well, not enough space
1276	$_ *= $h / $req_h for @h;
1277	} else {
1278	my $exp = List::Util::sum map $_->{expand}, @$children;
1279	$exp ||= 1;
1280
1281	for (0 .. $#$children) {
1282	my $child = $children->[$_];
1283
1284	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285	}
1286	}
1287
1288	CFClient::UI::harmonize \@h;
1289
1290	my $y = 0;
1291	for (0 .. $#$children) {
1292	my $child = $children->[$_];
1293	my $h = $h[$_];
1294	$child->configure (0, $y, $w, $h);
1295
1296	$y += $h;
1297	}
1298
1299	1
1300	}	1474	}
1301		1475
1302	#############################################################################	1476	#############################################################################
1303		1477
1304	package CFClient::UI::Label;	1478	package CFClient::UI::Label;
…		…
1321	ellipsise => 3, # end	1495	ellipsise => 3, # end
1322	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1323	fontsize => 1,	1497	fontsize => 1,
1324	align => -1,	1498	align => -1,
1325	valign => -1,	1499	valign => -1,
1326	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1327	can_events => 0,	1502	can_events => 0,
1328	%arg	1503	%arg
1329	);	1504	);
1330		1505
1331	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1367	$self->{text} = "T$text";	1542	$self->{text} = "T$text";
1368		1543
1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370	$self->{layout}->set_text ($text);	1545	$self->{layout}->set_text ($text);
1371		1546
		1547	$self->realloc;
1372	$self->update;	1548	$self->update;
1373	$self->check_size;
1374	}	1549	}
1375		1550
1376	sub set_markup {	1551	sub set_markup {
1377	my ($self, $markup) = @_;	1552	my ($self, $markup) = @_;
1378		1553
…		…
1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1557	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383		1558
1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1559	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385	$self->{layout}->set_markup ($markup);	1560	$self->{layout}->set_markup ($markup);
1386		1561
		1562	$self->realloc;
1387	$self->update;	1563	$self->update;
1388	$self->check_size;
1389	}	1564	}
1390		1565
1391	sub size_request {	1566	sub size_request {
1392	my ($self) = @_;	1567	my ($self) = @_;
1393		1568
…		…
1407		1582
1408	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1409	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1410	}	1585	}
1411		1586
1412	(	1587	($w, $h)
1413	$w + $self->{padding} * 2,
1414	$h + $self->{padding} * 2,
1415	)
1416	}	1588	}
1417		1589
1418	sub size_allocate {	1590	sub size_allocate {
1419	my ($self, $w, $h) = @_;	1591	my ($self, $w, $h) = @_;
1420		1592
		1593	delete $self->{ox};
		1594
1421	delete $self->{texture};	1595	delete $self->{texture}
		1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422	}	1597	}
1423		1598
1424	sub set_fontsize {	1599	sub set_fontsize {
1425	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1426		1601
1427	$self->{fontsize} = $fontsize;	1602	$self->{fontsize} = $fontsize;
1428	delete $self->{texture};	1603	delete $self->{texture};
1429		1604
1430	$self->update;	1605	$self->realloc;
1431	$self->check_size;
1432	}	1606	}
1433		1607
1434	sub _draw {	1608	sub _draw {
1435	my ($self) = @_;	1609	my ($self) = @_;
1436		1610
…		…
1442	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1443	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446		1620
1447	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1448		1623
		1624	unless (exists $self->{ox}) {
1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1452		1628
1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1456
1457	$tex
1458	};	1632	};
1459		1633
1460	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462		1636
…		…
1488	active_fg => [0, 0, 0],	1662	active_fg => [0, 0, 0],
1489	can_hover => 1,	1663	can_hover => 1,
1490	can_focus => 1,	1664	can_focus => 1,
1491	valign => 0,	1665	valign => 0,
1492	can_events => 1,	1666	can_events => 1,
		1667	#text => ...
1493	@_	1668	@_
1494	)	1669	)
1495	}	1670	}
1496		1671
1497	sub _set_text {	1672	sub _set_text {
…		…
1507	$self->{text} = $text;	1682	$self->{text} = $text;
1508		1683
1509	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1511		1686
1512	$self->emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
1513	}	1688	}
1514		1689
1515	sub set_text {	1690	sub set_text {
1516	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1517		1692
1518	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1519	$self->_set_text ($text);	1694	$self->_set_text ($text);
1520	$self->update;	1695
1521	$self->check_size;	1696	$self->realloc;
1522	}	1697	}
1523		1698
1524	sub get_text {	1699	sub get_text {
1525	$_[0]{text}	1700	$_[0]{text}
1526	}	1701	}
…		…
1529	my ($self) = @_;	1704	my ($self) = @_;
1530		1705
1531	my ($w, $h) = $self->SUPER::size_request;	1706	my ($w, $h) = $self->SUPER::size_request;
1532		1707
1533	($w + 1, $h) # add 1 for cursor	1708	($w + 1, $h) # add 1 for cursor
1534	}
1535
1536	sub size_allocate {
1537	my ($self, $w, $h) = @_;
1538
1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540	}	1709	}
1541		1710
1542	sub key_down {	1711	sub key_down {
1543	my ($self, $ev) = @_;	1712	my ($self, $ev) = @_;
1544		1713
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1728	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1729	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1730	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1733	$self->_emit ('escape');
1565	} elsif ($uni) {	1734	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1567	}	1738	}
1568		1739
1569	$self->_set_text ($text);	1740	$self->_set_text ($text);
1570	$self->update;	1741
1571	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1572	}	1745	}
1573		1746
1574	sub focus_in {	1747	sub focus_in {
1575	my ($self) = @_;	1748	my ($self) = @_;
1576		1749
…		…
1591	utf8::encode $text;	1764	utf8::encode $text;
1592	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1593		1766
1594	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1595	$self->update;	1768	$self->update;
		1769
		1770	1
1596	}	1771	}
1597		1772
1598	sub mouse_motion {	1773	sub mouse_motion {
1599	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1600	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1775	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1776
		1777	0
1601	}	1778	}
1602		1779
1603	sub _draw {	1780	sub _draw {
1604	my ($self) = @_;	1781	my ($self) = @_;
1605		1782
…		…
1656	if ($sym == 13) {	1833	if ($sym == 13) {
1657	unshift @{$self->{history}},	1834	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1835	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1836	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1837	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1838	$self->_emit (activate => $txt);
1662	$self->update;	1839	$self->update;
1663		1840
1664	} elsif ($sym == CFClient::SDLK_UP) {	1841	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1842	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1843	$self->{history_saveback} = $self->get_text;
…		…
1682	} else {	1859	} else {
1683	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1684	}	1861	}
1685		1862
1686	} else {	1863	} else {
1687	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1688	}	1867	1
1689
1690	}	1868	}
1691		1869
1692	#############################################################################	1870	#############################################################################
1693		1871
1694	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1703		1881
1704	sub new {	1882	sub new {
1705	my $class = shift;	1883	my $class = shift;
1706		1884
1707	$class->SUPER::new (	1885	$class->SUPER::new (
1708	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1709	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1710	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1711	can_hover => 1,	1890	can_hover => 1,
1712	align => 0,	1891	align => 0,
1713	valign => 0,	1892	valign => 0,
1714	can_events => 1,	1893	can_events => 1,
1715	@_	1894	@_
1716	)	1895	)
1717	}	1896	}
1718		1897
		1898	sub activate { }
		1899
1719	sub button_up {	1900	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1721		1902
		1903	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1905	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");	1906
1725	}	1907	1
1726	}	1908	}
1727		1909
1728	sub _draw {	1910	sub _draw {
1729	my ($self) = @_;	1911	my ($self) = @_;
1730		1912
…		…
1759		1941
1760	sub new {	1942	sub new {
1761	my $class = shift;	1943	my $class = shift;
1762		1944
1763	$class->SUPER::new (	1945	$class->SUPER::new (
1764	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1765	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1766	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1767	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1768	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1769	state => 0,	1952	state => 0,
…		…
1773	}	1956	}
1774		1957
1775	sub size_request {	1958	sub size_request {
1776	my ($self) = @_;	1959	my ($self) = @_;
1777		1960
1778	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1779	}	1962	}
1780		1963
1781	sub button_down {	1964	sub button_down {
1782	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1783		1966
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1788	}	1975	1
1789	}	1976	}
1790		1977
1791	sub _draw {	1978	sub _draw {
1792	my ($self) = @_;	1979	my ($self) = @_;
1793		1980
1794	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1795		1982
1796	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797		1984
1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1985	my ($w, $h) = @$self{qw(w h)};
		1986
		1987	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799		1988
1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801		1990
1802	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1803		1992
…		…
2067	my $self = $class->SUPER::new (	2256	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2261	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2075	vertical => 0,	2264	vertical => 0,
2076	can_hover => 1,	2265	can_hover => 1,
2077	inner_pad => 0.02,	2266	inner_pad => 0.02,
2078	@_	2267	@_
2079	);	2268	);
…		…
2082	$self->update;	2271	$self->update;
2083		2272
2084	$self	2273	$self
2085	}	2274	}
2086		2275
		2276	sub changed { }
		2277
		2278	sub set_range {
		2279	my ($self, $range) = @_;
		2280
		2281	($range, $self->{range}) = ($self->{range}, $range);
		2282
		2283	$self->update
		2284	if "@$range" ne "@{$self->{range}}";
		2285	}
		2286
2087	sub set_value {	2287	sub set_value {
2088	my ($self, $value) = @_;	2288	my ($self, $value) = @_;
2089		2289
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2290	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2291
2092	$hi = $lo + 1 if $hi <= $lo;	2292	$hi = $lo + 1 if $hi <= $lo;
2093		2293
		2294	$page = $hi - $lo if $page > $hi - $lo;
		2295
2094	$value = $lo if $value < $lo;	2296	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2297	$value = $hi - $page if $value > $hi - $page;
2096		2298
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2299	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2300	if $unit;
2099		2301
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2302	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2303
2104	if ($value != $old_value) {	2304	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2305	$self->_emit (changed => $value);
2106	$self->update;	2306	$self->update;
2107	}	2307	}
2108	}	2308	}
2109		2309
2110	sub size_request {	2310	sub size_request {
2111	my ($self) = @_;	2311	my ($self) = @_;
2112		2312
2113	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2114	my $h = $self->{req_h};
2115
2116	$self->{vertical} ? ($h, $w) : ($w, $h)
2117	}	2314	}
2118		2315
2119	sub button_down {	2316	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2121		2318
2122	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
		2320
		2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2322
2123	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2124	}	2324	}
2125		2325
2126	sub mouse_motion {	2326	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2128		2328
2129	if ($GRAB == $self) {	2329	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2330	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2331
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2333
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2335
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2336	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2337	} else {
		2338	return 0;
		2339	}
		2340
2137	}	2341	1
2138	}	2342	}
2139		2343
2140	sub update {	2344	sub update {
2141	my ($self) = @_;	2345	my ($self) = @_;
2142		2346
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2347	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2348	$self->set_value ($self->{range}[0]);
2145		2349
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2350	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2351	my $range = ($hi - $page - $lo) || 1e-100;
2147		2352
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2353	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2354
2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2355	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2356	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151		2357
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2358	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2359	$value = $value * $self->{scale} + $self->{offset};
2154		2360
2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157	$value = 0 if $value < 0;
2158	$page = 1 - $value if $value + $page > 1;
2159
2160	$self->{knob_x} = $value;	2361	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2362	$self->{knob_w} = $knob_w;
2162	});	2363	});
2163		2364
2164	$self->SUPER::update;	2365	$self->SUPER::update;
2165	}	2366	}
2166		2367
…		…
2190	# draw handle	2391	# draw handle
2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2392	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192		2393
2193	glDisable GL_TEXTURE_2D;	2394	glDisable GL_TEXTURE_2D;
2194	}	2395	}
		2396
		2397	#############################################################################
		2398
		2399	package CFClient::UI::ValSlider;
		2400
		2401	our @ISA = CFClient::UI::HBox::;
		2402
		2403	sub new {
		2404	my ($class, %arg) = @_;
		2405
		2406	my $range = delete $arg{range};
		2407
		2408	my $self = $class->SUPER::new (
		2409	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2410	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2411	to_value => sub { shift },
		2412	from_value => sub { shift },
		2413	%arg,
		2414	);
		2415
		2416	$self->{slider}->connect (changed => sub {
		2417	my ($self, $value) = @_;
		2418	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2419	$self->{parent}->emit (changed => $value);
		2420	});
		2421
		2422	# $self->{entry}->connect (changed => sub {
		2423	# my ($self, $value) = @_;
		2424	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2425	# $self->{parent}->emit (changed => $value);
		2426	# });
		2427
		2428	$self->add ($self->{slider}, $self->{entry});
		2429
		2430	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2431
		2432	$self
		2433	}
		2434
		2435	sub set_range { shift->{slider}->set_range (@_) }
		2436	sub set_value { shift->{slider}->set_value (@_) }
2195		2437
2196	#############################################################################	2438	#############################################################################
2197		2439
2198	package CFClient::UI::TextView;	2440	package CFClient::UI::TextView;
2199		2441
…		…
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2483	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2484
2243	$self->reflow;	2485	$self->reflow;
2244	}	2486	}
2245		2487
2246	sub text_height {	2488	sub text_size {
2247	my ($self, $text, $indent) = @_;	2489	my ($self, $text, $indent) = @_;
2248		2490
2249	my $layout = $self->{layout};	2491	my $layout = $self->{layout};
2250		2492
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2493	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2494	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2495	$layout->set_markup ($text);
2254		2496
2255	($layout->size)[1]	2497	$layout->size
2256	}	2498	}
2257		2499
2258	sub reflow {	2500	sub reflow {
2259	my ($self) = @_;	2501	my ($self) = @_;
2260		2502
2261	$self->{need_reflow}++;	2503	$self->{need_reflow}++;
2262	$self->update;	2504	$self->update;
2263	}	2505	}
2264		2506
		2507	sub set_offset {
		2508	my ($self, $offset) = @_;
		2509
		2510	# todo: base offset on lines or so, not on pixels
		2511	$self->{children}[1]->set_value ($offset);
		2512	}
		2513
		2514	sub clear {
		2515	my ($self) = @_;
		2516
		2517	$self->{par} = [];
		2518	$self->{height} = 0;
		2519	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2520	}
		2521
2265	sub add_paragraph {	2522	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2523	my ($self, $color, $text, $indent) = @_;
2267		2524
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2525	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2526	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2527	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2528	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2529	}
2275		2530
2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2531	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277	$self->{children}[1]->update;
2278	}	2532	}
2279		2533
2280	sub update {	2534	sub update {
2281	my ($self) = @_;	2535	my ($self) = @_;
2282		2536
…		…
2285	return unless $self->{h} > 0;	2539	return unless $self->{h} > 0;
2286		2540
2287	delete $self->{texture};	2541	delete $self->{texture};
2288		2542
2289	$ROOT->on_post_alloc ($self, sub {	2543	$ROOT->on_post_alloc ($self, sub {
		2544	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2545
2290	if (delete $self->{need_reflow}) {	2546	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2547	my $height = 0;
2292		2548
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2549	my $layout = $self->{layout};
		2550
		2551	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2552
2294	for @{$self->{par}};	2553	for (@{$self->{par}}) {
		2554	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2555	$layout->set_width ($W - $_->[3]);
		2556	$layout->set_markup ($_->[4]);
		2557	my ($w, $h) = $layout->size;
		2558	$_->[0] = $w + $_->[3];
		2559	$_->[1] = $h;
		2560	}
		2561
		2562	$height += $_->[1];
		2563	}
2295		2564
2296	$self->{height} = $height;	2565	$self->{height} = $height;
2297		2566
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2567	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2568
2301	delete $self->{texture};	2569	delete $self->{texture};
2302	}	2570	}
2303		2571
2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2307		2575
2308	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2309		2577
2310	my $y0 = $top;	2578	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2579	my $y1 = $top + $H;
2312		2580
2313	my $y = 0;	2581	my $y = 0;
2314		2582
2315	my $layout = $self->{layout};	2583	my $layout = $self->{layout};
2316		2584
2317	$layout->set_font ($self->{font}) if $self->{font};	2585	$layout->set_font ($self->{font}) if $self->{font};
2318		2586
2319	glEnable GL_BLEND;	2587	glEnable GL_BLEND;
		2588	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2589	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2590
2322	for my $par (@{$self->{par}}) {	2591	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2592	my $h = $par->[1];
2324		2593
2325	if ($y0 < $y + $h && $y < $y1) {	2594	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2595	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2596	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2597	$layout->set_markup ($par->[4]);
2329		2598
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2599	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2600
2332	glRasterPos $par->[2], $y - $y0;	2601	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2602	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2603	}
2335		2604
2336	$y += $h;	2605	$y += $h;
2337	}	2606	}
…		…
2404		2673
2405	sub new {	2674	sub new {
2406	my $class = shift;	2675	my $class = shift;
2407		2676
2408	my $self = $class->SUPER::new (	2677	my $self = $class->SUPER::new (
2409	state => 0,	2678	state => 0,
2410	connect_activate => \&toggle_flopper,	2679	on_activate => \&toggle_flopper,
2411	@_	2680	@_
2412	);	2681	);
2413		2682
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2683	$self
2420	}	2684	}
2421		2685
2422	sub toggle_flopper {	2686	sub toggle_flopper {
2423	my ($self) = @_;	2687	my ($self) = @_;
2424		2688
2425	# TODO: use animation	2689	$self->{other}->toggle_visibility;
2426	if ($self->{state} = !$self->{state}) {
2427	$CFClient::UI::ROOT->add ($self->{other});
2428	$self->{other}->move ($self->coord2global (0, $self->{h}));
2429	$self->emit ("open");
2430	} else {
2431	$CFClient::UI::ROOT->remove ($self->{other});
2432	$self->emit ("close");
2433	}
2434
2435	$self->emit (changed => $self->{state});
2436	}	2690	}
2437		2691
2438	#############################################################################	2692	#############################################################################
2439		2693
2440	package CFClient::UI::Tooltip;	2694	package CFClient::UI::Tooltip;
…		…
2453	}	2707	}
2454		2708
2455	sub set_tooltip_from {	2709	sub set_tooltip_from {
2456	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2457		2711
		2712	my $tooltip = $widget->{tooltip};
		2713
		2714	if ($ENV{CFPLUS_DEBUG} & 2) {
		2715	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2717	. "req $widget->{req_w} $widget->{req_h}\n"
		2718	. "visible $widget->{visible}";
		2719	}
		2720
2458	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2459	markup => $widget->{tooltip},	2722	markup => $tooltip,
2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461	fontsize => 0.8,	2724	fontsize => 0.8,
2462	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2463	ellipsise => 0,	2726	ellipsise => 0,
2464	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2475		2738
2476	sub size_allocate {	2739	sub size_allocate {
2477	my ($self, $w, $h) = @_;	2740	my ($self, $w, $h) = @_;
2478		2741
2479	$self->SUPER::size_allocate ($w - 4, $h - 4);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2743	}
		2744
		2745	sub visibility_change {
		2746	my ($self, $visible) = @_;
		2747
		2748	return unless $visible;
		2749
		2750	$self->{root}->on_post_alloc ("move_$self" => sub {
		2751	my $widget = $self->{owner}
		2752	or return;
		2753
		2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2755
		2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2757	if $x + $self->{w} > $::WIDTH;
		2758
		2759	$self->move_abs ($x, $y);
		2760	});
2480	}	2761	}
2481		2762
2482	sub _draw {	2763	sub _draw {
2483	my ($self) = @_;	2764	my ($self) = @_;
2484		2765
…		…
2501	glVertex $w, $h;	2782	glVertex $w, $h;
2502	glVertex $w, 0;	2783	glVertex $w, 0;
2503	glEnd;	2784	glEnd;
2504		2785
2505	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2506	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2507	}	2789	}
2508		2790
2509	#############################################################################	2791	#############################################################################
2510		2792
…		…
2516		2798
2517	sub new {	2799	sub new {
2518	my $class = shift;	2800	my $class = shift;
2519		2801
2520	my $self = $class->SUPER::new (	2802	my $self = $class->SUPER::new (
2521	aspect => 1,	2803	aspect => 1,
		2804	can_events => 0,
2522	@_,	2805	@_,
2523	);	2806	);
2524		2807
2525	if ($self->{anim} && $self->{animspeed}) {	2808	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2809	Scalar::Util::weaken (my $widget = $self);
…		…
2552	}	2835	}
2553		2836
2554	sub _draw {	2837	sub _draw {
2555	my ($self) = @_;	2838	my ($self) = @_;
2556		2839
2557	return unless $::CONN;#d# manage and cache textures differently	2840	return unless $::CONN;
2558		2841
2559	my $face;	2842	my $face;
2560		2843
2561	if ($self->{frame}) {	2844	if ($self->{frame}) {
2562	my $anim = $::CONN->{anim}[$self->{anim}];	2845	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2585	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2586	}	2869	}
2587		2870
2588	#############################################################################	2871	#############################################################################
2589		2872
2590	package CFClient::UI::InventoryItem;	2873	package CFClient::UI::Buttonbar;
2591		2874
2592	our @ISA = CFClient::UI::HBox::;	2875	our @ISA = CFClient::UI::HBox::;
2593		2876
2594	sub _item_to_desc {	2877	# TODO: should actualyl wrap buttons and other goodies.
2595	my ($item) = @_;
2596
2597	my $desc =
2598	$item->{nrof} < 2
2599	? $item->{name}
2600	: "$item->{nrof} × $item->{name_pl}";
2601
2602	$item->{flags} & Crossfire::Protocol::F_OPEN
2603	and $desc .= " (open)";
2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
2605	and $desc .= " (applied)";
2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
2607	and $desc .= " (unpaid)";
2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
2609	and $desc .= " (magic)";
2610	$item->{flags} & Crossfire::Protocol::F_CURSED
2611	and $desc .= " (cursed)";
2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
2613	and $desc .= " (damned)";
2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
2615	and $desc .= " *";
2616
2617	$desc
2618	}
2619
2620	sub new {
2621	my $class = shift;
2622
2623	my %args = @_;
2624
2625	my $item = delete $args{item};
2626
2627	my $desc = _item_to_desc ($item);
2628
2629	my $self = $class->SUPER::new (
2630	can_hover => 1,
2631	can_events => 1,
2632	tooltip => ((CFClient::UI::Label::escape $desc)
2633	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634	connect_button_down => sub {
2635	my ($self, $ev, $x, $y) = @_;
2636
2637	# todo: maybe put examine on 1? but should just be a tooltip :(
2638	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639	my $targ = $::CONN->{player}{tag};
2640
2641	if ($item->{container} == $::CONN->{player}{tag}) {
2642	$targ = $main::OPENCONT;
2643	}
2644
2645	$::CONN->send ("move $targ $item->{tag} 0");
2646	} elsif ($ev->{button} == 1) {
2647	$::CONN->send ("examine $item->{tag}");
2648	} elsif ($ev->{button} == 2) {
2649	$::CONN->send ("apply $item->{tag}");
2650	} elsif ($ev->{button} == 3) {
2651	my @menu_items = (
2652	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655	(
2656	$item->{flags} & Crossfire::Protocol::F_LOCKED
2657	? (
2658	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659	)
2660	: (
2661	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663	)
2664	),
2665	);
2666
2667	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668	}
2669
2670	1
2671	},
2672	%args
2673	);
2674
2675
2676	$self->add (new CFClient::UI::Face
2677	can_events => 0,
2678	face => $item->{face},
2679	anim => $item->{anim},
2680	animspeed => $item->{animspeed},
2681	);
2682
2683	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685	$self->{item} = $item;
2686
2687	$self->update_item;
2688
2689	$self
2690	}
2691
2692	sub update_item {
2693	my ($self) = @_;
2694
2695	my $desc = _item_to_desc ($self->{item});
2696
2697	$self->{name_lbl}->set_text ($desc);
2698	}
2699
2700	#############################################################################
2701
2702	package CFClient::UI::Inventory;
2703
2704	our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706	sub new {
2707	my $class = shift;
2708
2709	my $self = $class->SUPER::new (
2710	scrolled => (new CFClient::UI::Table),
2711	@_,
2712	);
2713
2714	$self
2715	}
2716
2717	sub set_items {
2718	my ($self, $items) = @_;
2719
2720	$self->{scrolled}->clear;
2721	return unless $items;
2722
2723	my @items = sort {
2724	($a->{type} <=> $b->{type})
2725	or ($a->{name} cmp $b->{name})
2726	} @$items;
2727
2728	$self->{real_items} = \@items;
2729
2730	for my $item (@items) {
2731	$item->{item} = $item;
2732	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733	$item->update_item ();
2734	}
2735
2736	my $i = 0;
2737	for (@items) {
2738	$self->{scrolled}->add (0, $i, $_);
2739	my $nrof = $_->{item}->{nrof} || 1;
2740	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741	}
2742
2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744	}
2745
2746	sub size_request {
2747	my ($self) = @_;
2748	($self->{req_w}, $self->{req_h});
2749	}
2750		2878
2751	#############################################################################	2879	#############################################################################
2752		2880
2753	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2754		2882
…		…
2788		2916
2789	# popup given the event (must be a mouse button down event currently)	2917	# popup given the event (must be a mouse button down event currently)
2790	sub popup {	2918	sub popup {
2791	my ($self, $ev) = @_;	2919	my ($self, $ev) = @_;
2792		2920
2793	$self->emit ("popdown");	2921	$self->_emit ("popdown");
2794		2922
2795	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2796	$GRAB = $self;	2924	$GRAB = $self;
2797	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2798		2926
2799	$self->show;	2927	$self->show;
2800	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2928	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801	}	2929	}
2802		2930
2803	sub mouse_motion {	2931	sub mouse_motion {
2804	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2805		2933
2806	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2807	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2809	}	2939	}
2810		2940
2811	sub button_up {	2941	sub button_up {
2812	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2813		2943
2814	if ($ev->{button} == $self->{button}) {	2944	if ($ev->{button} == $self->{button}) {
2815	undef $GRAB;	2945	undef $GRAB;
2816	$self->hide;	2946	$self->hide;
2817		2947
2818	$self->emit ("popdown");	2948	$self->_emit ("popdown");
2819	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
		2954	1
		2955	}
		2956
		2957	#############################################################################
		2958
		2959	package CFClient::UI::Multiplexer;
		2960
		2961	our @ISA = CFClient::UI::Container::;
		2962
		2963	sub new {
		2964	my $class = shift;
		2965
		2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
2820	}	3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
2821	}	3063	}
2822		3064
2823	#############################################################################	3065	#############################################################################
2824		3066
2825	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2885	sub add {	3127	sub add {
2886	my ($self, $text, %arg) = @_;	3128	my ($self, $text, %arg) = @_;
2887		3129
2888	$text =~ s/^\s+//;	3130	$text =~ s/^\s+//;
2889	$text =~ s/\s+$//;	3131	$text =~ s/\s+$//;
		3132
		3133	return unless $text;
2890		3134
2891	my $timeout = time + ((delete $arg{timeout}) || 60);	3135	my $timeout = time + ((delete $arg{timeout}) || 60);
2892		3136
2893	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3137	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894		3138
…		…
2928	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2929	}	3173	}
2930		3174
2931	#############################################################################	3175	#############################################################################
2932		3176
2933	package CFClient::UI::Root;	3177	package CFClient::UI::Inventory;
2934		3178
2935	our @ISA = CFClient::UI::Container::;	3179	our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937	use CFClient::OpenGL;
2938		3180
2939	sub new {	3181	sub new {
2940	my $class = shift;	3182	my $class = shift;
2941		3183
2942	$class->SUPER::new (	3184	my $self = $class->SUPER::new (
		3185	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3186	@_,
		3187	);
		3188
		3189	$self
		3190	}
		3191
		3192	sub set_items {
		3193	my ($self, $items) = @_;
		3194
		3195	$self->{child}->clear;
		3196	return unless $items;
		3197
		3198	my @items = sort {
		3199	($a->{type} <=> $b->{type})
		3200	or ($a->{name} cmp $b->{name})
		3201	} @$items;
		3202
		3203	$self->{real_items} = \@items;
		3204
		3205	my $row = 0;
		3206	for my $item (@items) {
		3207	CFClient::Item::update_widgets $item;
		3208
		3209	$self->{child}->add (0, $row, $item->{face_widget});
		3210	$self->{child}->add (1, $row, $item->{desc_widget});
		3211	$self->{child}->add (2, $row, $item->{weight_widget});
		3212
		3213	$row++;
		3214	}
		3215	}
		3216
		3217	#############################################################################
		3218
		3219	package CFClient::UI::BindEditor;
		3220
		3221	our @ISA = CFClient::UI::FancyFrame::;
		3222
		3223	sub new {
		3224	my $class = shift;
		3225
		3226	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3227
		3228	$self->add (my $vb = new CFClient::UI::VBox);
		3229
		3230
		3231	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3232	text => "start recording",
		3233	tooltip => "Start/Stops recording of actions."
		3234	."All subsequent actions after the recording started will be captured."
		3235	."The actions are displayed after the record was stopped."
		3236	."To bind the action you have to click on the 'Bind' button",
		3237	on_activate => sub {
		3238	unless ($self->{recording}) {
		3239	$self->start;
		3240	} else {
		3241	$self->stop;
		3242	}
		3243	});
		3244
		3245	$vb->add (new CFClient::UI::Label text => "Actions:");
		3246	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3251	$hb->add (new CFClient::UI::Button
		3252	text => "bind",
		3253	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3254	on_activate => sub {
		3255	$self->ask_for_bind;
		3256	});
		3257
		3258	$vb->add (my $hb = new CFClient::UI::HBox);
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "ok",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor and saves the binding",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->commit;
		3266	});
		3267
		3268	$hb->add (new CFClient::UI::Button
		3269	text => "cancel",
		3270	expand => 1,
		3271	tooltip => "This closes the binding editor without saving",
		3272	on_activate => sub {
		3273	$self->hide;
		3274	$self->{binding_cancel}->()
		3275	if $self->{binding_cancel};
		3276	});
		3277
		3278	$self->update_binding_widgets;
		3279
		3280	$self
		3281	}
		3282
		3283	sub commit {
		3284	my ($self) = @_;
		3285	my ($mod, $sym, $cmds) = $self->get_binding;
		3286	if ($sym != 0 && @$cmds > 0) {
		3287	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3288	."'. Don't forget 'Save Config'!");
		3289	$self->{binding_change}->($mod, $sym, $cmds)
		3290	if $self->{binding_change};
		3291	} else {
		3292	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3293	$self->{binding_cancel}->()
		3294	if $self->{binding_cancel};
		3295	}
		3296	}
		3297
		3298	sub start {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("stop recording");
		3302	$self->{recording} = 1;
		3303	$self->clear_command_list;
		3304	$::CONN->start_record if $::CONN;
		3305	}
		3306
		3307	sub stop {
		3308	my ($self) = @_;
		3309
		3310	$self->{rec_btn}->set_text ("start recording");
		3311	$self->{recording} = 0;
		3312
		3313	my $rec;
		3314	$rec = $::CONN->stop_record if $::CONN;
		3315	return unless ref $rec eq 'ARRAY';
		3316	$self->set_command_list ($rec);
		3317	}
		3318
		3319
		3320	sub ask_for_bind_and_commit {
		3321	my ($self) = @_;
		3322	$self->ask_for_bind (1);
		3323	}
		3324
		3325	sub ask_for_bind {
		3326	my ($self, $commit) = @_;
		3327
		3328	CFClient::Binder::open_binding_dialog (sub {
		3329	my ($mod, $sym) = @_;
		3330	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3331	$self->update_binding_widgets;
		3332	$self->commit if $commit;
		3333	});
		3334	}
		3335
		3336	# $mod and $sym are the modifiers and key symbol
		3337	# $cmds is a array ref of strings (the commands)
		3338	# $cb is the callback that is executed on OK
		3339	# $ccb is the callback that is executed on CANCEL and
		3340	# when the binding was unsuccessful on OK
		3341	sub set_binding {
		3342	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3343
		3344	$self->clear_command_list;
		3345	$self->{recording} = 0;
		3346	$self->{rec_btn}->set_text ("start recording");
		3347
		3348	$self->{binding} = [$mod, $sym];
		3349	$self->{commands} = $cmds;
		3350
		3351	$self->{binding_change} = $cb;
		3352	$self->{binding_cancel} = $ccb;
		3353
		3354	$self->update_binding_widgets;
		3355	}
		3356
		3357	# this is a shortcut method that asks for a binding
		3358	# and then just binds it.
		3359	sub do_quick_binding {
		3360	my ($self, $cmds) = @_;
		3361	$self->set_binding (undef, undef, $cmds, sub {
		3362	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3363	});
		3364	$self->ask_for_bind (1);
		3365	}
		3366
		3367	sub update_binding_widgets {
		3368	my ($self) = @_;
		3369	my ($mod, $sym, $cmds) = $self->get_binding;
		3370	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3371	$self->set_command_list ($cmds);
		3372	}
		3373
		3374	sub get_binding {
		3375	my ($self) = @_;
		3376	return (
		3377	$self->{binding}->[0],
		3378	$self->{binding}->[1],
		3379	[ grep { defined $_ } @{$self->{commands}} ]
		3380	);
		3381	}
		3382
		3383	sub clear_command_list {
		3384	my ($self) = @_;
		3385	$self->{cmdbox}->clear ();
		3386	}
		3387
		3388	sub set_command_list {
		3389	my ($self, $cmds) = @_;
		3390
		3391	$self->{cmdbox}->clear ();
		3392	$self->{commands} = $cmds;
		3393
		3394	my $idx = 0;
		3395
		3396	for (@$cmds) {
		3397	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3398
		3399	my $i = $idx;
		3400	$hb->add (new CFClient::UI::Label text => $_);
		3401	$hb->add (new CFClient::UI::Button
		3402	text => "delete",
		3403	tooltip => "Deletes the action from the record",
		3404	on_activate => sub {
		3405	$self->{cmdbox}->remove ($hb);
		3406	$cmds->[$i] = undef;
		3407	});
		3408
		3409
		3410	$idx++
		3411	}
		3412	}
		3413
		3414	#############################################################################
		3415
		3416	package CFClient::UI::SpellList;
		3417
		3418	our @ISA = CFClient::UI::Table::;
		3419
		3420	sub new {
		3421	my $class = shift;
		3422
		3423	my $self = $class->SUPER::new (
		3424	binding => [],
		3425	commands => [],
2943	@_,	3426	@_,
2944	)	3427	)
2945	}	3428	}
2946		3429
2947	sub configure {	3430	# XXX: Do sorting? Argl...
2948	my ($self, $x, $y, $w, $h) = @_;	3431	sub add_spell {
2949
2950	$self->{w} = $w;
2951	$self->{h} = $h;
2952	}
2953
2954	sub check_size {
2955	my ($self) = @_;	3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
2956		3434
2957	$self->size_allocate ($self->{w}, $self->{h})	3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2958	if $self->{w};	3436	face => $spell->{face},
		3437	can_hover => 1,
		3438	can_events => 1,
		3439	tooltip => $spell->{message});
		3440
		3441	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3442	text => $spell->{name},
		3443	can_hover => 1,
		3444	can_events => 1,
		3445	tooltip => $spell->{message},
		3446	expand => 1);
		3447
		3448	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3450	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3451	expand => 1);
		3452
		3453	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3454	text => "bind to key",
		3455	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3456	}
		3457
		3458	sub rebuild_spell_list {
		3459	my ($self) = @_;
		3460	$self->{tbl_idx} = 0;
		3461	$self->add_spell ($_) for values %{$self->{spells}};
		3462	}
		3463
		3464	sub remove_spell {
		3465	my ($self, $spell) = @_;
		3466	delete $self->{spells}->{$spell->{name}};
		3467	$self->rebuild_spell_list;
		3468	}
		3469
		3470	#############################################################################
		3471
		3472	package CFClient::UI::Root;
		3473
		3474	our @ISA = CFClient::UI::Container::;
		3475
		3476	use CFClient::OpenGL;
		3477
		3478	sub new {
		3479	my $class = shift;
		3480
		3481	my $self = $class->SUPER::new (
		3482	visible => 1,
		3483	@_,
		3484	);
		3485
		3486	Scalar::Util::weaken ($self->{root} = $self);
		3487
		3488	$self
2959	}	3489	}
2960		3490
2961	sub size_request {	3491	sub size_request {
2962	my ($self) = @_;	3492	my ($self) = @_;
2963		3493
2964	($self->{w}, $self->{h})	3494	($self->{w}, $self->{h})
		3495	}
		3496
		3497	sub _to_pixel {
		3498	my ($coord, $size, $max) = @_;
		3499
		3500	$coord =
		3501	$coord eq "center" ? ($max - $size) * 0.5
		3502	: $coord eq "max" ? $max
		3503	: $coord;
		3504
		3505	$coord = 0 if $coord < 0;
		3506	$coord = $max - $size if $coord > $max - $size;
		3507
		3508	int $coord + 0.5
2965	}	3509	}
2966		3510
2967	sub size_allocate {	3511	sub size_allocate {
2968	my ($self, $w, $h) = @_;	3512	my ($self, $w, $h) = @_;
2969		3513
2970	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976	for my $child ($self->children) {	3514	for my $child ($self->children) {
2977	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3515	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978		3516
2979	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
2980	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
2981		3519
2982	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
2983	if exists $child->{req_y};	3521	$Y = _to_pixel $Y, $H, $self->{h};
2984
2985	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987		3522
2988	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
2989	}	3524	}
2990	}	3525	}
2991		3526
…		…
3002	}	3537	}
3003		3538
3004	sub update {	3539	sub update {
3005	my ($self) = @_;	3540	my ($self) = @_;
3006		3541
3007	$self->check_size;
3008	$::WANT_REFRESH++;	3542	$::WANT_REFRESH++;
3009	}	3543	}
3010		3544
3011	sub add {	3545	sub add {
3012	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3013		3547
3014	for my $child (@children) {
3015	$child->{toplevel} = 1;	3548	$_->{is_toplevel} = 1
3016		3549	for @children;
3017	# integerise window positions
3018	$child->{x} = int $child->{x};
3019	$child->{y} = int $child->{y};
3020	}
3021		3550
3022	$self->SUPER::add (@children);	3551	$self->SUPER::add (@children);
		3552	}
		3553
		3554	sub remove {
		3555	my ($self, @children) = @_;
		3556
		3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3023		3561
3024	while (@children) {	3562	while (@children) {
3025	my $w = pop @children;	3563	my $w = pop @children;
3026	push @children, $w->children;	3564	push @children, $w->children;
3027	$w->{visible} = 1;	3565	$w->set_invisible;
3028	}
3029	}
3030
3031	sub remove {
3032	my ($self, @children) = @_;
3033
3034	$self->SUPER::remove (@children);
3035
3036	while (@children) {
3037	my $w = pop @children;
3038	push @children, $w->children;
3039	delete $w->{visible};
3040	}	3566	}
3041	}	3567	}
3042		3568
3043	sub on_refresh {	3569	sub on_refresh {
3044	my ($self, $id, $cb) = @_;	3570	my ($self, $id, $cb) = @_;
…		…
3058	while ($self->{refresh_hook}) {	3584	while ($self->{refresh_hook}) {
3059	$_->()	3585	$_->()
3060	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3061	}	3587	}
3062		3588
3063	if ($self->{check_size}) {	3589	if ($self->{realloc}) {
3064	my @queue = ([], []);	3590	my %queue;
		3591	my @queue;
		3592	my $widget;
3065		3593
3066	for (;;) {	3594	outer:
3067	if ($self->{check_size}) {	3595	while () {
3068	# heuristic: check containers last	3596	if (my $realloc = delete $self->{realloc}) {
3069	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3597	for $widget (values %$realloc) {
3070	for values %{delete $self->{check_size}}	3598	$widget->{visible} or next; # do not resize invisible widgets
		3599
		3600	$queue{$widget+0}++ and next; # duplicates are common
		3601
		3602	push @{ $queue[$widget->{visible}] }, $widget;
		3603	}
3071	}	3604	}
3072		3605
3073	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3606	while () {
		3607	@queue or last outer;
3074		3608
3075	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3609	$widget = pop @{ $queue[-1] || [] }
3076	? @$widget{qw(user_w user_h)}	3610	and last;
3077	: $widget->size_request;
3078
3079	if (delete $widget->{force_alloc}
3080	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082		3611
		3612	pop @queue;
		3613	}
		3614
		3615	delete $queue{$widget+0};
		3616
		3617	my ($w, $h) = $widget->size_request;
		3618
		3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3621
		3622	$w = $widget->{force_w} if exists $widget->{force_w};
		3623	$h = $widget->{force_h} if exists $widget->{force_h};
		3624
		3625	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3626	|| delete $widget->{force_realloc}) {
3083	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3084	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3085		3629
3086	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3630	$self->{size_alloc}{$widget+0} = $widget;
3087		3631
3088	$widget->{parent}->check_size
3089	if $widget->{parent};	3632	if (my $parent = $widget->{parent}) {
		3633	$self->{realloc}{$parent+0} = $parent
		3634	unless $queue{$parent+0};
		3635
		3636	$parent->{force_size_alloc} = 1;
		3637	$self->{size_alloc}{$parent+0} = $parent;
		3638	}
3090	}	3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3091	}	3642	}
3092	}	3643	}
3093		3644
3094	while ($self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3095	for (values %{delete $self->{size_alloc}}) {	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3096	my ($widget, $w, $h) = @$_;	3647	values %$size_alloc;
		3648
		3649	while () {
		3650	my $widget = pop @queue || last;
		3651
		3652	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3097		3653
3098	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3099	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3100		3656
		3657	$w = int $w + 0.5;
		3658	$h = int $h + 0.5;
		3659
		3660	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3661	$widget->{old_w} = $widget->{w};
		3662	$widget->{old_h} = $widget->{h};
		3663
3101	$widget->{w} = $w;	3664	$widget->{w} = $w;
3102	$widget->{h} = $h;	3665	$widget->{h} = $h;
3103	$widget->size_allocate ($w, $h);	3666
3104	$widget->emit (size_allocate => $w, $h);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3105	}	3669	}
3106	}	3670	}
3107		3671
3108	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3109	$_->()	3673	$_->()
3110	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3111	}	3675	}
		3676
3112		3677
3113	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3116		3681
…		…
3118	glLoadIdentity;	3683	glLoadIdentity;
3119	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3121	glLoadIdentity;	3686	glLoadIdentity;
3122		3687
		3688	{
		3689	package CFClient::UI::Base;
		3690
		3691	($draw_x, $draw_y, $draw_w, $draw_h) =
		3692	(0, 0, $self->{w}, $self->{h});
		3693	}
		3694
3123	$self->_draw;	3695	$self->_draw;
3124	}	3696	}
3125		3697
3126	#############################################################################	3698	#############################################################################
3127		3699

Diff Legend

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