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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_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
157	$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.]+$/;
158	$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};
159	$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};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$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};
163	$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};
164	$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
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	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	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
238	$self->focus_out;	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;
239	}	305	}
240		306
241	sub hide {	307	sub hide {
242	my ($self) = @_;	308	my ($self) = @_;
243		309
…		…
245		311
246	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
247	if $self->{parent};	313	if $self->{parent};
248	}	314	}
249		315
250	sub move {	316	sub move_abs {
251	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
252		318
253	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
254	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
255	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
256		322
257	$self->update;	323	$self->update;
258	}	324	}
259		325
260	sub set_size {	326	sub set_size {
261	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
262		328
263	$self->{user_w} = $w;	329	$self->{force_w} = $w;
264	$self->{user_h} = $h;	330	$self->{force_h} = $h;
265		331
266	$self->check_size;	332	$self->realloc;
267	}	333	}
268		334
269	sub size_request {	335	sub size_request {
270	require Carp;	336	require Carp;
271	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
273		339
274	sub configure {	340	sub configure {
275	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
276		342
277	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
278	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
279	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
280		348
281	# use alignment to adjust x, y	349	# use alignment to adjust x, y
282		350
283	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
284	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
285
286	($w, $h) = ($w2, $h2);
287	}	353	}
288		354
289	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
290	$self->{x} = $x;	356	$self->{x} = $x;
291	$self->{y} = $y;	357	$self->{y} = $y;
292	$self->update;	358	$self->update;
293	}	359	}
294		360
295	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296	$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;
297	}	368	}
298	}	369	}
299		370
300	sub size_allocate {	371	sub size_allocate {
301	# nothing to be done	372	# nothing to be done
302	}	373	}
303		374
304	sub reconfigure {
305	my ($self) = @_;
306
307	$self->check_size (1);
308	$self->update;
309	}
310
311	sub children {	375	sub children {
312	}	376	}
313		377
314	sub set_max_size {	378	sub set_max_size {
315	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
318	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
319	}	383	}
320		384
321	sub set_tooltip {	385	sub set_tooltip {
322	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
323		392
324	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
325		394
326	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
370		439
371	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372	unless $FOCUS;	441	unless $FOCUS;
373	}	442	}
374		443
375	sub mouse_motion { }	444	sub mouse_motion { 0 }
376	sub button_up { }	445	sub button_up { 0 }
377	sub key_down { }	446	sub key_down { 0 }
378	sub key_up { }	447	sub key_up { 0 }
379		448
380	sub button_down {	449	sub button_down {
381	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
382		451
383	$self->focus_in;	452	$self->focus_in;
384	}
385		453
386	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
387	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
388	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456
389	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub find_widget {
390	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		474	}
		475
		476	sub connect {
		477	my ($self, $signal, $cb) = @_;
		478
		479	push @{ $self->{signal_cb}{$signal} }, $cb;
		480	}
		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
		488	sub emit {
		489	my ($self, $signal, @args) = @_;
		490
		491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
		493	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self+0};
		504
		505	$self->{root}{realloc}{$self+0} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	delete $self->{req_h};
		510	}
		511	}
		512
		513	sub update {
		514	my ($self) = @_;
		515
		516	$self->{parent}->update
		517	if $self->{parent};
		518	}
		519
		520	sub reconfigure {
		521	my ($self) = @_;
		522
		523	$self->realloc;
		524	$self->update;
		525	}
		526
		527	# using global variables seems a bit hacky, but passing through all drawing
		528	# functions seems pointless.
		529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
391		530
392	sub draw {	531	sub draw {
393	my ($self) = @_;	532	my ($self) = @_;
394		533
395	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
		535
		536	# update screen rectangle
		537	local $draw_x = $draw_x + $self->{x};
		538	local $draw_y = $draw_y + $self->{y};
		539	local $draw_w = $draw_x + $self->{w};
		540	local $draw_h = $draw_y + $self->{h};
		541
		542	# skip widgets that are entirely outside the drawing area
		543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
396		545
397	glPushMatrix;	546	glPushMatrix;
398	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
399	$self->_draw;	548	$self->_draw;
400	glPopMatrix;	549	glPopMatrix;
…		…
412	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
413	glEnd;	562	glEnd;
414	glDisable GL_BLEND;	563	glDisable GL_BLEND;
415	}	564	}
416		565
417	if ($ENV{PCLIENT_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
418	glPushMatrix;	567	glPushMatrix;
419	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
420	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
422	glVertex 0 , 0;	571	glVertex 0 , 0;
423	glVertex $self->{w}, 0;	572	glVertex $self->{w} - 1, 0;
424	glVertex $self->{w}, $self->{h};	573	glVertex $self->{w} - 1, $self->{h} - 1;
425	glVertex 0 , $self->{h};	574	glVertex 0 , $self->{h} - 1;
426	glEnd;	575	glEnd;
427	glPopMatrix;	576	glPopMatrix;
428	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	577	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429	}	578	}
430	}	579	}
431		580
432	sub _draw {	581	sub _draw {
433	my ($self) = @_;	582	my ($self) = @_;
434		583
435	warn "no draw defined for $self\n";	584	warn "no draw defined for $self\n";
436	}
437
438	sub find_widget {
439	my ($self, $x, $y) = @_;
440
441	return () unless $self->{can_events};
442
443	return $self
444	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447	()
448	}
449
450	sub set_parent {
451	my ($self, $parent) = @_;
452
453	Scalar::Util::weaken ($self->{parent} = $parent);
454
455	# TODO: req_w _does_change after ->reconfigure
456	$self->check_size
457	unless exists $self->{req_w};
458
459	$self->show;
460	}
461
462	sub check_size {
463	my ($self, $forced) = @_;
464
465	$self->{force_alloc} = 1 if $forced;
466	$CFClient::UI::ROOT->{check_size}{$self} = $self;
467	}
468
469	sub update {
470	my ($self) = @_;
471
472	$self->{parent}->update
473	if $self->{parent};
474	}
475
476	sub connect {
477	my ($self, $signal, $cb) = @_;
478
479	push @{ $self->{signal_cb}{$signal} }, $cb;
480	}
481
482	sub _emit {
483	my ($self, $signal, @args) = @_;
484
485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486	}
487
488	sub emit {
489	my ($self, $signal, @args) = @_;
490
491	$self->_emit ($signal, @args)
492	|| $self->$signal (@args);
493	}	585	}
494		586
495	sub DESTROY {	587	sub DESTROY {
496	my ($self) = @_;	588	my ($self) = @_;
497		589
…		…
555	my ($class, %arg) = @_;	647	my ($class, %arg) = @_;
556	$class->SUPER::new (can_events => 0, %arg);	648	$class->SUPER::new (can_events => 0, %arg);
557	}	649	}
558		650
559	sub size_request {	651	sub size_request {
560	(0, 0)	652	my ($self) = @_;
		653
		654	($self->{w} + 0, $self->{h} + 0)
561	}	655	}
562		656
563	sub draw { }	657	sub draw { }
564		658
565	#############################################################################	659	#############################################################################
…		…
594	$self->{children} = [	688	$self->{children} = [
595	sort { $a->{z} <=> $b->{z} }	689	sort { $a->{z} <=> $b->{z} }
596	@{$self->{children}}, @widgets	690	@{$self->{children}}, @widgets
597	];	691	];
598		692
599	$self->check_size (1);	693	$self->realloc;
600	$self->update;
601	}	694	}
602		695
603	sub children {	696	sub children {
604	@{ $_[0]{children} }	697	@{ $_[0]{children} }
605	}	698	}
…		…
610	delete $child->{parent};	703	delete $child->{parent};
611	$child->hide;	704	$child->hide;
612		705
613	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	706	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614		707
615	$self->check_size;	708	$self->realloc;
616	$self->update;
617	}	709	}
618		710
619	sub clear {	711	sub clear {
620	my ($self) = @_;	712	my ($self) = @_;
621		713
…		…
625	for (@$children) {	717	for (@$children) {
626	delete $_->{parent};	718	delete $_->{parent};
627	$_->hide;	719	$_->hide;
628	}	720	}
629		721
630	$self->check_size;	722	$self->realloc;
631	$self->update;
632	}	723	}
633		724
634	sub find_widget {	725	sub find_widget {
635	my ($self, $x, $y) = @_;	726	my ($self, $x, $y) = @_;
636		727
…		…
723	$self->SUPER::size_allocate ($w, $h);	814	$self->SUPER::size_allocate ($w, $h);
724	$self->update;	815	$self->update;
725	}	816	}
726		817
727	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
728	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
729	}	822	}
730		823
731	sub render_child {	824	sub render_child {
732	my ($self) = @_;	825	my ($self) = @_;
733		826
734	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	827	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
736	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
737		830
		831	{
		832	package CFClient::UI::Base;
		833
		834	($draw_x, $draw_y, $draw_w, $draw_h) =
		835	(0, 0, $self->{w}, $self->{h});
		836	}
		837
738	$self->_render;	838	$self->_render;
739	};	839	};
740	}	840	}
741		841
742	sub _draw {	842	sub _draw {
743	my ($self) = @_;	843	my ($self) = @_;
744		844
745	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
746		846
747	my $tex = $self->{texture}	847	my $tex = $self->{texture}
748	or return;	848	or return;
749		849
750	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
760		860
761	package CFClient::UI::ViewPort;	861	package CFClient::UI::ViewPort;
762		862
763	our @ISA = CFClient::UI::Window::;	863	our @ISA = CFClient::UI::Window::;
764		864
		865	sub new {
		866	my $class = shift;
		867
		868	$class->SUPER::new (
		869	scroll_x => 0,
		870	scroll_y => 1,
		871	@_,
		872	)
		873	}
		874
765	sub size_request {	875	sub size_request {
766	my ($self) = @_;	876	my ($self) = @_;
767		877
768	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769		879
770	@$self{qw(child_w child_h)}	880	$w = 10 if $self->{scroll_x};
		881	$h = 10 if $self->{scroll_y};
		882
		883	($w, $h)
771	}	884	}
772		885
773	sub size_allocate {	886	sub size_allocate {
774	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
775		888
776	my ($cw, $ch) = @$self{qw(child_w child_h)};	889	my $child = $self->child;
777	# $w = $self->{w};	890
		891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		893
778	$self->child->configure (0, 0, $cw, $ch);	894	$self->child->configure (0, 0, $w, $h);
779	$self->update;	895	$self->update;
780	}	896	}
781		897
782	sub set_offset {	898	sub set_offset {
783	my ($self, $x, $y) = @_;	899	my ($self, $x, $y) = @_;
…		…
817	}	933	}
818		934
819	sub _render {	935	sub _render {
820	my ($self) = @_;	936	my ($self) = @_;
821		937
		938	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		939	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		940
822	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823		942
824	$self->SUPER::_render;	943	$self->SUPER::_render;
825	}	944	}
826		945
…		…
834	my $class = shift;	953	my $class = shift;
835		954
836	my $self;	955	my $self;
837		956
838	my $slider = new CFClient::UI::Slider	957	my $slider = new CFClient::UI::Slider
839	vertical => 1,	958	vertical => 1,
840	range => [0, 0, 1, 0.01], # HACK fix	959	range => [0, 0, 1, 0.01], # HACK fix
841	connect_changed => sub {	960	on_changed => sub {
842	$self->{vp}->set_offset (0, $_[1]);	961	$self->{vp}->set_offset (0, $_[1]);
843	},	962	},
844	;	963	;
845		964
846	$self = $class->SUPER::new (	965	$self = $class->SUPER::new (
…		…
852	$self->{vp}->add ($self->{scrolled});	971	$self->{vp}->add ($self->{scrolled});
853	$self->add ($self->{vp});	972	$self->add ($self->{vp});
854	$self->add ($self->{slider});	973	$self->add ($self->{slider});
855		974
856	$self	975	$self
		976	}
		977
		978	sub update {
		979	my ($self) = @_;
		980
		981	$self->SUPER::update;
		982
		983	# todo: overwrite size_allocate of child
		984	my $child = $self->{vp}->child;
		985	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857	}	986	}
858		987
859	sub size_allocate {	988	sub size_allocate {
860	my ($self, $w, $h) = @_;	989	my ($self, $w, $h) = @_;
861		990
…		…
914		1043
915	our @ISA = CFClient::UI::Bin::;	1044	our @ISA = CFClient::UI::Bin::;
916		1045
917	use CFClient::OpenGL;	1046	use CFClient::OpenGL;
918		1047
919	my @tex =	1048	my $bg =
		1049	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1050	mipmap => 1, wrap => 1;
		1051
		1052	my @border =
920	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1054	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922		1055
923	sub new {	1056	sub new {
924	my $class = shift;	1057	my ($class, %arg) = @_;
925		1058
926	# TODO: user_x, user_y, overwrite moveto?	1059	my $title = delete $arg{title};
927		1060
928	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
929	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
930	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
931	border => 0.6,	1064	border => 0.6,
932	is_toplevel => 1,
933	can_events => 1,	1065	can_events => 1,
934	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
935	);	1069	);
936		1070
937	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
938	align => 0,	1072	align => 0,
939	valign => 1,	1073	valign => 1,
940	text => $self->{title},	1074	text => $title,
941	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
942		1077
943	$self	1078	$self
		1079	}
		1080
		1081	sub add {
		1082	my ($self, @widgets) = @_;
		1083
		1084	$self->SUPER::add (@widgets);
		1085	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944	}	1086	}
945		1087
946	sub border {	1088	sub border {
947	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
948	}	1090	}
949		1091
950	sub size_request {	1092	sub size_request {
951	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
952		1097
953	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
954		1099
955	(	1100	(
956	$w + $self->border * 2,	1101	$w + $self->border * 2,
…		…
959	}	1104	}
960		1105
961	sub size_allocate {	1106	sub size_allocate {
962	my ($self, $w, $h) = @_;	1107	my ($self, $w, $h) = @_;
963		1108
		1109	if ($self->{title}) {
		1110	$self->{title}{w} = $w;
		1111	$self->{title}{h} = $h;
		1112	$self->{title}->size_allocate ($w, $h);
		1113	}
		1114
		1115	my $border = $self->border;
		1116
964	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
965	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
966		1119
967	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968	if $self->{title};
969
970	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
971	}	1121	}
972		1122
973	sub button_down {	1123	sub button_down {
974	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
975		1125
…		…
991	my ($ev, $x, $y) = @_;	1141	my ($ev, $x, $y) = @_;
992		1142
993	my $dx = $ev->{x} - $ox;	1143	my $dx = $ev->{x} - $ox;
994	my $dy = $ev->{y} - $oy;	1144	my $dy = $ev->{y} - $oy;
995		1145
996	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1148
		1149	$self->realloc;
998	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999	$self->check_size;
1000	};	1151	};
1001		1152
1002	} elsif ($lr ^ $td) {	1153	} elsif ($lr ^ $td) {
1003	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004	my ($bx, $by) = ($self->{x}, $self->{y});	1155	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1006	$self->{motion} = sub {	1157	$self->{motion} = sub {
1007	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1008		1159
1009	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1010		1161
1011	$self->move ($bx + $x - $ox, $by + $y - $oy);	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012	$self->update;
1013	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1014	}	1168	1
1015	}	1169	}
1016		1170
1017	sub button_up {	1171	sub button_up {
1018	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1019		1173
1020	delete $self->{motion};	1174	!!delete $self->{motion}
1021	}	1175	}
1022		1176
1023	sub mouse_motion {	1177	sub mouse_motion {
1024	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1025		1179
1026	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1027	}	1183	}
1028		1184
1029	sub _draw {	1185	sub _draw {
1030	my ($self) = @_;	1186	my ($self) = @_;
1031		1187
		1188	my $child = $self->{children}[0];
		1189
1032	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1033	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1034		1192
1035	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037		1195
1038	my $border = $self->border;	1196	my $border = $self->border;
1039		1197
1040	glColor @{ $self->{border_bg} };	1198	glColor @{ $self->{border_bg} };
1041	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1199	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1042	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1200	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1201	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1202	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045		1203
1046	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1204	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047	my $bg = $tex[0];	1205	glColor @{ $self->{bg} };
1048		1206
1049	# TODO: repeat texture not scale	1207	# TODO: repeat texture not scale
		1208	# solve this better(?)
1050	my $rep_x = $cw / $bg->{w};	1209	$bg->{s} = $cw / $bg->{w};
1051	my $rep_y = $ch / $bg->{h};	1210	$bg->{t} = $ch / $bg->{h};
1052
1053	glColor @{ $self->{bg} };
1054
1055	$bg->{s} = $rep_x;
1056	$bg->{t} = $rep_y;
1057	$bg->{wrap_mode} = 1;
1058	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059	}	1212	}
1060		1213
1061	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1062		1215
1063	$self->{title}->draw if $self->{title};
1064
1065	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1066	}	1222	}
1067		1223
1068	#############################################################################	1224	#############################################################################
1069		1225
1070	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1078	sub new {	1234	sub new {
1079	my $class = shift;	1235	my $class = shift;
1080		1236
1081	$class->SUPER::new (	1237	$class->SUPER::new (
1082	col_expand => [],	1238	col_expand => [],
1083	@_	1239	@_,
1084	)	1240	)
		1241	}
		1242
		1243	sub children {
		1244	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085	}	1245	}
1086		1246
1087	sub add {	1247	sub add {
1088	my ($self, $x, $y, $child) = @_;	1248	my ($self, $x, $y, $child) = @_;
1089		1249
1090	$child->set_parent ($self);	1250	$child->set_parent ($self);
1091	$self->{children}[$y][$x] = $child;	1251	$self->{children}[$y][$x] = $child;
1092		1252
1093	$child->check_size;	1253	$self->realloc;
1094	}	1254	}
1095		1255
1096	sub children {
1097	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098	}
1099
1100	# TODO: move to container class maybe? send childs a signal on removal?	1256	# TODO: move to container class maybe? send children a signal on removal?
1101	sub clear {	1257	sub clear {
1102	my ($self) = @_;	1258	my ($self) = @_;
1103		1259
1104	my @children = $self->children;	1260	my @children = $self->children;
1105	delete $self->{children};	1261	delete $self->{children};
…		…
1107	for (@children) {	1263	for (@children) {
1108	delete $_->{parent};	1264	delete $_->{parent};
1109	$_->hide;	1265	$_->hide;
1110	}	1266	}
1111		1267
1112	$self->update;	1268	$self->realloc;
1113	}	1269	}
1114		1270
1115	sub get_wh {	1271	sub get_wh {
1116	my ($self) = @_;	1272	my ($self) = @_;
1117		1273
…		…
1148	sub size_allocate {	1304	sub size_allocate {
1149	my ($self, $w, $h) = @_;	1305	my ($self, $w, $h) = @_;
1150		1306
1151	my ($ws, $hs) = $self->get_wh;	1307	my ($ws, $hs) = $self->get_wh;
1152		1308
1153	my $req_w = sum @$ws;	1309	my $req_w = (sum @$ws) || 1;
1154	my $req_h = sum @$hs;	1310	my $req_h = (sum @$hs) || 1;
1155		1311
1156	# TODO: nicer code && do row_expand	1312	# TODO: nicer code && do row_expand
1157	my @col_expand = @{$self->{col_expand}};	1313	my @col_expand = @{$self->{col_expand}};
1158	@col_expand = (1) x @$ws unless @col_expand;	1314	@col_expand = (1) x @$ws unless @col_expand;
1159	my $col_expand = (sum @col_expand) || 1;	1315	my $col_expand = (sum @col_expand) || 1;
…		…
1213	}	1369	}
1214	}	1370	}
1215		1371
1216	#############################################################################	1372	#############################################################################
1217		1373
1218	package CFClient::UI::HBox;	1374	package CFClient::UI::Box;
1219
1220	# TODO: wrap into common Box base class
1221		1375
1222	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Container::;
1223		1377
1224	sub size_request {	1378	sub size_request {
1225	my ($self) = @_;	1379	my ($self) = @_;
1226		1380
1227	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$self->{vertical}
1228		1382	? (
1229	(	1383	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1230	(List::Util::sum map $_->[0], @alloc),	1384	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231	(List::Util::max map $_->[1], @alloc),	1385	)
1232	)	1386	: (
		1387	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1388	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1389	)
1233	}	1390	}
1234		1391
1235	sub size_allocate {	1392	sub size_allocate {
1236	my ($self, $w, $h) = @_;	1393	my ($self, $w, $h) = @_;
1237		1394
1238	($h, $w) = ($w, $h);	1395	my $space = $self->{vertical} ? $h : $w;
1239
1240	my $children = $self->{children};	1396	my $children = $self->{children};
1241		1397
1242	my @h = map $_->{req_w}, @$children;	1398	my @req;
1243		1399
1244	my $req_h = List::Util::sum @h;	1400	if ($self->{homogeneous}) {
1245		1401	@req = ($space / (@$children || 1)) x @$children;
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {	1402	} else {
		1403	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1404	my $req = List::Util::sum @req;
		1405
		1406	if ($req > $space) {
		1407	# ah well, not enough space
		1408	$_ *= $space / $req for @req;
		1409	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;	1410	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251	$exp ||= 1;
1252		1411
		1412	$space = ($space - $req) / $expand; # remaining space to give away
		1413
		1414	$req[$_] += $space * $children->[$_]{expand}
1253	for (0 .. $#$children) {	1415	for 0 .. $#$children;
1254	my $child = $children->[$_];
1255
1256	my $alloc_h = $h[$_];
1257	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258	$h[$_] = $alloc_h;
1259	}	1416	}
1260	}	1417	}
1261		1418
1262	CFClient::UI::harmonize \@h;	1419	CFClient::UI::harmonize \@req;
1263		1420
1264	my $y = 0;	1421	my $pos = 0;
1265	for (0 .. $#$children) {	1422	for (0 .. $#$children) {
1266	my $child = $children->[$_];
1267	my $h = $h[$_];	1423	my $alloc = $req[$_];
1268	$child->configure ($y, 0, $h, $w);	1424	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269		1425
1270	$y += $h;	1426	$pos += $alloc;
1271	}	1427	}
1272		1428
1273	1	1429	1
1274	}	1430	}
1275		1431
1276	#############################################################################	1432	#############################################################################
1277		1433
		1434	package CFClient::UI::HBox;
		1435
		1436	our @ISA = CFClient::UI::Box::;
		1437
		1438	sub new {
		1439	my $class = shift;
		1440
		1441	$class->SUPER::new (
		1442	vertical => 0,
		1443	@_,
		1444	)
		1445	}
		1446
		1447	#############################################################################
		1448
1278	package CFClient::UI::VBox;	1449	package CFClient::UI::VBox;
1279		1450
1280	# TODO: wrap into common Box base class
1281
1282	our @ISA = CFClient::UI::Container::;	1451	our @ISA = CFClient::UI::Box::;
1283		1452
1284	sub size_request {	1453	sub new {
1285	my ($self) = @_;	1454	my $class = shift;
1286		1455
1287	my @alloc = map [$_->size_request], @{$self->{children}};	1456	$class->SUPER::new (
1288		1457	vertical => 1,
1289	(	1458	@_,
1290	(List::Util::max map $_->[0], @alloc),
1291	(List::Util::sum map $_->[1], @alloc),
1292	)	1459	)
1293	}
1294
1295	sub size_allocate {
1296	my ($self, $w, $h) = @_;
1297
1298	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300	my $children = $self->{children};
1301
1302	my @h = map $_->{req_h}, @$children;
1303
1304	my $req_h = List::Util::sum @h;
1305
1306	if ($req_h > $h) {
1307	# ah well, not enough space
1308	$_ *= $h / $req_h for @h;
1309	} else {
1310	my $exp = List::Util::sum map $_->{expand}, @$children;
1311	$exp ||= 1;
1312
1313	for (0 .. $#$children) {
1314	my $child = $children->[$_];
1315
1316	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317	}
1318	}
1319
1320	CFClient::UI::harmonize \@h;
1321
1322	my $y = 0;
1323	for (0 .. $#$children) {
1324	my $child = $children->[$_];
1325	my $h = $h[$_];
1326	$child->configure (0, $y, $w, $h);
1327
1328	$y += $h;
1329	}
1330
1331	1
1332	}	1460	}
1333		1461
1334	#############################################################################	1462	#############################################################################
1335		1463
1336	package CFClient::UI::Label;	1464	package CFClient::UI::Label;
…		…
1353	ellipsise => 3, # end	1481	ellipsise => 3, # end
1354	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1355	fontsize => 1,	1483	fontsize => 1,
1356	align => -1,	1484	align => -1,
1357	valign => -1,	1485	valign => -1,
1358	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1359	can_events => 0,	1488	can_events => 0,
1360	%arg	1489	%arg
1361	);	1490	);
1362		1491
1363	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1399	$self->{text} = "T$text";	1528	$self->{text} = "T$text";
1400		1529
1401	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402	$self->{layout}->set_text ($text);	1531	$self->{layout}->set_text ($text);
1403		1532
		1533	$self->realloc;
1404	$self->update;	1534	$self->update;
1405	$self->check_size;
1406	}	1535	}
1407		1536
1408	sub set_markup {	1537	sub set_markup {
1409	my ($self, $markup) = @_;	1538	my ($self, $markup) = @_;
1410		1539
…		…
1414	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1543	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415		1544
1416	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1545	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417	$self->{layout}->set_markup ($markup);	1546	$self->{layout}->set_markup ($markup);
1418		1547
		1548	$self->realloc;
1419	$self->update;	1549	$self->update;
1420	$self->check_size;
1421	}	1550	}
1422		1551
1423	sub size_request {	1552	sub size_request {
1424	my ($self) = @_;	1553	my ($self) = @_;
1425		1554
…		…
1439		1568
1440	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1441	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1442	}	1571	}
1443		1572
1444	(	1573	($w, $h)
1445	$w + $self->{padding} * 2,
1446	$h + $self->{padding} * 2,
1447	)
1448	}	1574	}
1449		1575
1450	sub size_allocate {	1576	sub size_allocate {
1451	my ($self, $w, $h) = @_;	1577	my ($self, $w, $h) = @_;
1452		1578
		1579	delete $self->{ox};
		1580
1453	delete $self->{texture};	1581	delete $self->{texture}
		1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454	}	1583	}
1455		1584
1456	sub set_fontsize {	1585	sub set_fontsize {
1457	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1458		1587
1459	$self->{fontsize} = $fontsize;	1588	$self->{fontsize} = $fontsize;
1460	delete $self->{texture};	1589	delete $self->{texture};
1461		1590
1462	$self->update;	1591	$self->realloc;
1463	$self->check_size;
1464	}	1592	}
1465		1593
1466	sub _draw {	1594	sub _draw {
1467	my ($self) = @_;	1595	my ($self) = @_;
1468		1596
…		…
1474	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1475	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1476	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478		1606
1479	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1480		1609
		1610	unless (exists $self->{ox}) {
1481	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1484		1614
1485	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1488
1489	$tex
1490	};	1618	};
1491		1619
1492	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494		1622
…		…
1548	sub set_text {	1676	sub set_text {
1549	my ($self, $text) = @_;	1677	my ($self, $text) = @_;
1550		1678
1551	$self->{cursor} = length $text;	1679	$self->{cursor} = length $text;
1552	$self->_set_text ($text);	1680	$self->_set_text ($text);
1553	$self->update;	1681
1554	$self->check_size;	1682	$self->realloc;
1555	}	1683	}
1556		1684
1557	sub get_text {	1685	sub get_text {
1558	$_[0]{text}	1686	$_[0]{text}
1559	}	1687	}
…		…
1562	my ($self) = @_;	1690	my ($self) = @_;
1563		1691
1564	my ($w, $h) = $self->SUPER::size_request;	1692	my ($w, $h) = $self->SUPER::size_request;
1565		1693
1566	($w + 1, $h) # add 1 for cursor	1694	($w + 1, $h) # add 1 for cursor
1567	}
1568
1569	sub size_allocate {
1570	my ($self, $w, $h) = @_;
1571
1572	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573	}	1695	}
1574		1696
1575	sub key_down {	1697	sub key_down {
1576	my ($self, $ev) = @_;	1698	my ($self, $ev) = @_;
1577		1699
…		…
1595	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1596	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1597	$self->_emit ('escape');	1719	$self->_emit ('escape');
1598	} elsif ($uni) {	1720	} elsif ($uni) {
1599	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1600	}	1724	}
1601		1725
1602	$self->_set_text ($text);	1726	$self->_set_text ($text);
1603	$self->update;	1727
1604	$self->check_size;	1728	$self->realloc;
		1729
		1730	1
1605	}	1731	}
1606		1732
1607	sub focus_in {	1733	sub focus_in {
1608	my ($self) = @_;	1734	my ($self) = @_;
1609		1735
…		…
1624	utf8::encode $text;	1750	utf8::encode $text;
1625	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1626		1752
1627	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1628	$self->update;	1754	$self->update;
		1755
		1756	1
1629	}	1757	}
1630		1758
1631	sub mouse_motion {	1759	sub mouse_motion {
1632	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1633	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1761	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1762
		1763	0
1634	}	1764	}
1635		1765
1636	sub _draw {	1766	sub _draw {
1637	my ($self) = @_;	1767	my ($self) = @_;
1638		1768
…		…
1715	} else {	1845	} else {
1716	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1717	}	1847	}
1718		1848
1719	} else {	1849	} else {
1720	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1721	}	1853	1
1722
1723	}	1854	}
1724		1855
1725	#############################################################################	1856	#############################################################################
1726		1857
1727	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1736		1867
1737	sub new {	1868	sub new {
1738	my $class = shift;	1869	my $class = shift;
1739		1870
1740	$class->SUPER::new (	1871	$class->SUPER::new (
1741	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1742	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1743	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1744	can_hover => 1,	1876	can_hover => 1,
1745	align => 0,	1877	align => 0,
1746	valign => 0,	1878	valign => 0,
…		…
1755	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1756		1888
1757	$self->emit ("activate")	1889	$self->emit ("activate")
1758	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1759	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1760	}	1894	}
1761		1895
1762	sub _draw {	1896	sub _draw {
1763	my ($self) = @_;	1897	my ($self) = @_;
1764		1898
…		…
1793		1927
1794	sub new {	1928	sub new {
1795	my $class = shift;	1929	my $class = shift;
1796		1930
1797	$class->SUPER::new (	1931	$class->SUPER::new (
1798	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1799	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1800	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1801	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1802	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1803	state => 0,	1938	state => 0,
…		…
1807	}	1942	}
1808		1943
1809	sub size_request {	1944	sub size_request {
1810	my ($self) = @_;	1945	my ($self) = @_;
1811		1946
1812	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1813	}	1948	}
1814		1949
1815	sub button_down {	1950	sub button_down {
1816	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1817		1952
1818	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1821	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1822	}	1961	1
1823	}	1962	}
1824		1963
1825	sub _draw {	1964	sub _draw {
1826	my ($self) = @_;	1965	my ($self) = @_;
1827		1966
1828	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1829		1968
1830	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831		1970
1832	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1971	my ($w, $h) = @$self{qw(w h)};
		1972
		1973	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833		1974
1834	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835		1976
1836	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1837		1978
…		…
2102	fg => [1, 1, 1],	2243	fg => [1, 1, 1],
2103	active_fg => [0, 0, 0],	2244	active_fg => [0, 0, 0],
2104	bg => [0, 0, 0, 0.2],	2245	bg => [0, 0, 0, 0.2],
2105	active_bg => [1, 1, 1, 0.5],	2246	active_bg => [1, 1, 1, 0.5],
2106	range => [0, 0, 100, 10, 0],	2247	range => [0, 0, 100, 10, 0],
2107	req_w => $::WIDTH / 80,	2248	min_w => $::WIDTH / 80,
2108	req_h => $::WIDTH / 80,	2249	min_h => $::WIDTH / 80,
2109	vertical => 0,	2250	vertical => 0,
2110	can_hover => 1,	2251	can_hover => 1,
2111	inner_pad => 0.02,	2252	inner_pad => 0.02,
2112	@_	2253	@_
2113	);	2254	);
…		…
2116	$self->update;	2257	$self->update;
2117		2258
2118	$self	2259	$self
2119	}	2260	}
2120		2261
		2262	sub changed { }
		2263
2121	sub set_range {	2264	sub set_range {
2122	my ($self, $range) = @_;	2265	my ($self, $range) = @_;
2123		2266
2124	$self->{range} = $range;	2267	($range, $self->{range}) = ($self->{range}, $range);
2125		2268
2126	$self->update;	2269	$self->update
		2270	if "@$range" ne "@{$self->{range}}";
2127	}	2271	}
2128		2272
2129	sub set_value {	2273	sub set_value {
2130	my ($self, $value) = @_;	2274	my ($self, $value) = @_;
2131		2275
…		…
2150	}	2294	}
2151		2295
2152	sub size_request {	2296	sub size_request {
2153	my ($self) = @_;	2297	my ($self) = @_;
2154		2298
2155	my $w = $self->{req_w};	2299	($self->{req_w}, $self->{req_h})
2156	my $h = $self->{req_h};
2157
2158	$self->{vertical} ? ($h, $w) : ($w, $h)
2159	}	2300	}
2160		2301
2161	sub button_down {	2302	sub button_down {
2162	my ($self, $ev, $x, $y) = @_;	2303	my ($self, $ev, $x, $y) = @_;
2163		2304
2164	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2165		2306
2166	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167		2308
2168	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2169	}	2310	}
2170		2311
2171	sub mouse_motion {	2312	sub mouse_motion {
2172	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2173		2314
…		…
2177	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2178		2319
2179	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180		2321
2181	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2322	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2323	} else {
		2324	return 0;
		2325	}
		2326
2182	}	2327	1
2183	}	2328	}
2184		2329
2185	sub update {	2330	sub update {
2186	my ($self) = @_;	2331	my ($self) = @_;
2187		2332
…		…
2514		2659
2515	sub new {	2660	sub new {
2516	my $class = shift;	2661	my $class = shift;
2517		2662
2518	my $self = $class->SUPER::new (	2663	my $self = $class->SUPER::new (
2519	state => 0,	2664	state => 0,
2520	connect_activate => \&toggle_flopper,	2665	on_activate => \&toggle_flopper,
2521	@_	2666	@_
2522	);	2667	);
2523		2668
2524	if ($self->{state}) {
2525	$self->{state} = 0;
2526	$self->toggle_flopper;
2527	}
2528
2529	$self	2669	$self
2530	}	2670	}
2531		2671
2532	sub toggle_flopper {	2672	sub toggle_flopper {
2533	my ($self) = @_;	2673	my ($self) = @_;
2534		2674
2535	# TODO: use animation	2675	$self->{other}->toggle_visibility;
2536	if ($self->{state} = !$self->{state}) {
2537	$CFClient::UI::ROOT->add ($self->{other});
2538	$self->{other}->move ($self->coord2global (0, $self->{h}));
2539	$self->_emit ("open");
2540	} else {
2541	$CFClient::UI::ROOT->remove ($self->{other});
2542	$self->_emit ("close");
2543	}
2544
2545	$self->_emit (changed => $self->{state});
2546	}	2676	}
2547		2677
2548	#############################################################################	2678	#############################################################################
2549		2679
2550	package CFClient::UI::Tooltip;	2680	package CFClient::UI::Tooltip;
…		…
2563	}	2693	}
2564		2694
2565	sub set_tooltip_from {	2695	sub set_tooltip_from {
2566	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2567		2697
		2698	my $tooltip = $widget->{tooltip};
		2699
		2700	if ($ENV{CFPLUS_DEBUG} & 2) {
		2701	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2702	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2703	. "req $widget->{req_w} $widget->{req_h}\n"
		2704	. "visible $widget->{visible}";
		2705	}
		2706
2568	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2569	markup => $widget->{tooltip},	2708	markup => $tooltip,
2570	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571	fontsize => 0.8,	2710	fontsize => 0.8,
2572	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2573	ellipsise => 0,	2712	ellipsise => 0,
2574	font => ($widget->{tooltip_font} || $::FONT_PROP),	2713	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2585		2724
2586	sub size_allocate {	2725	sub size_allocate {
2587	my ($self, $w, $h) = @_;	2726	my ($self, $w, $h) = @_;
2588		2727
2589	$self->SUPER::size_allocate ($w - 4, $h - 4);	2728	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2729	}
		2730
		2731	sub visibility_change {
		2732	my ($self, $visible) = @_;
		2733
		2734	return unless $visible;
		2735
		2736	$self->{root}->on_post_alloc ("move_$self" => sub {
		2737	my $widget = $self->{owner}
		2738	or return;
		2739
		2740	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2741
		2742	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2743	if $x + $self->{w} > $::WIDTH;
		2744
		2745	$self->move_abs ($x, $y);
		2746	});
2590	}	2747	}
2591		2748
2592	sub _draw {	2749	sub _draw {
2593	my ($self) = @_;	2750	my ($self) = @_;
2594		2751
…		…
2611	glVertex $w, $h;	2768	glVertex $w, $h;
2612	glVertex $w, 0;	2769	glVertex $w, 0;
2613	glEnd;	2770	glEnd;
2614		2771
2615	glTranslate 2 - 0.375, 2 - 0.375;	2772	glTranslate 2 - 0.375, 2 - 0.375;
		2773
2616	$self->SUPER::_draw;	2774	$self->SUPER::_draw;
2617	}	2775	}
2618		2776
2619	#############################################################################	2777	#############################################################################
2620		2778
…		…
2626		2784
2627	sub new {	2785	sub new {
2628	my $class = shift;	2786	my $class = shift;
2629		2787
2630	my $self = $class->SUPER::new (	2788	my $self = $class->SUPER::new (
2631	aspect => 1,	2789	aspect => 1,
		2790	can_events => 0,
2632	@_,	2791	@_,
2633	);	2792	);
2634		2793
2635	if ($self->{anim} && $self->{animspeed}) {	2794	if ($self->{anim} && $self->{animspeed}) {
2636	Scalar::Util::weaken (my $widget = $self);	2795	Scalar::Util::weaken (my $widget = $self);
…		…
2695	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2696	}	2855	}
2697		2856
2698	#############################################################################	2857	#############################################################################
2699		2858
2700	package CFClient::UI::InventoryItem;
2701
2702	our @ISA = CFClient::UI::HBox::;
2703
2704	sub _item_to_desc {
2705	my ($item) = @_;
2706
2707	my $desc =
2708	$item->{nrof} < 2
2709	? $item->{name}
2710	: "$item->{nrof} × $item->{name_pl}";
2711
2712	$item->{flags} & Crossfire::Protocol::F_OPEN
2713	and $desc .= " (open)";
2714	$item->{flags} & Crossfire::Protocol::F_APPLIED
2715	and $desc .= " (applied)";
2716	$item->{flags} & Crossfire::Protocol::F_UNPAID
2717	and $desc .= " (unpaid)";
2718	$item->{flags} & Crossfire::Protocol::F_MAGIC
2719	and $desc .= " (magic)";
2720	$item->{flags} & Crossfire::Protocol::F_CURSED
2721	and $desc .= " (cursed)";
2722	$item->{flags} & Crossfire::Protocol::F_DAMNED
2723	and $desc .= " (damned)";
2724	$item->{flags} & Crossfire::Protocol::F_LOCKED
2725	and $desc .= " *";
2726
2727	$desc
2728	}
2729
2730	sub new {
2731	my $class = shift;
2732
2733	my %args = @_;
2734
2735	my $item = delete $args{item};
2736
2737	my $desc = _item_to_desc ($item);
2738
2739	my $self = $class->SUPER::new (
2740	can_hover => 1,
2741	can_events => 1,
2742	tooltip => ((CFClient::UI::Label::escape $desc)
2743	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744	connect_button_down => sub {
2745	my ($self, $ev, $x, $y) = @_;
2746
2747	# todo: maybe put examine on 1? but should just be a tooltip :(
2748	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749	my $targ = $::CONN->{player}{tag};
2750
2751	if ($item->{container} == $::CONN->{player}{tag}) {
2752	$targ = $main::OPENCONT;
2753	}
2754
2755	$::CONN->send ("move $targ $item->{tag} 0");
2756	} elsif ($ev->{button} == 1) {
2757	$::CONN->send ("examine $item->{tag}");
2758	} elsif ($ev->{button} == 2) {
2759	$::CONN->send ("apply $item->{tag}");
2760	} elsif ($ev->{button} == 3) {
2761	my @menu_items = (
2762	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765	(
2766	$item->{flags} & Crossfire::Protocol::F_LOCKED
2767	? (
2768	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769	)
2770	: (
2771	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773	)
2774	),
2775	);
2776
2777	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778	}
2779
2780	1
2781	},
2782	%args
2783	);
2784
2785
2786	$self->add (new CFClient::UI::Face
2787	can_events => 0,
2788	face => $item->{face},
2789	anim => $item->{anim},
2790	animspeed => $item->{animspeed},
2791	);
2792
2793	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795	$self->{item} = $item;
2796
2797	$self->update_item;
2798
2799	$self
2800	}
2801
2802	sub update_item {
2803	my ($self) = @_;
2804
2805	my $desc = _item_to_desc ($self->{item});
2806
2807	$self->{name_lbl}->set_text ($desc);
2808	}
2809
2810	#############################################################################
2811
2812	package CFClient::UI::Inventory;
2813
2814	our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816	sub new {
2817	my $class = shift;
2818
2819	my $self = $class->SUPER::new (
2820	scrolled => (new CFClient::UI::Table),
2821	@_,
2822	);
2823
2824	$self
2825	}
2826
2827	sub set_items {
2828	my ($self, $items) = @_;
2829
2830	$self->{scrolled}->clear;
2831	return unless $items;
2832
2833	my @items = sort {
2834	($a->{type} <=> $b->{type})
2835	or ($a->{name} cmp $b->{name})
2836	} @$items;
2837
2838	$self->{real_items} = \@items;
2839
2840	for my $item (@items) {
2841	$item->{item} = $item;
2842	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843	$item->update_item ();
2844	}
2845
2846	my $i = 0;
2847	for (@items) {
2848	$self->{scrolled}->add (0, $i, $_);
2849	my $nrof = $_->{item}->{nrof} || 1;
2850	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851	}
2852
2853	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854	}
2855
2856	sub size_request {
2857	my ($self) = @_;
2858	($self->{req_w}, $self->{req_h});
2859	}
2860
2861	#############################################################################
2862
2863	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2864		2860
2865	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2866		2862
2867	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2905	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2906	$GRAB = $self;	2902	$GRAB = $self;
2907	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2908		2904
2909	$self->show;	2905	$self->show;
2910	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2906	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911	}	2907	}
2912		2908
2913	sub mouse_motion {	2909	sub mouse_motion {
2914	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2915		2911
2916	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2917	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2919	}	2917	}
2920		2918
2921	sub button_up {	2919	sub button_up {
2922	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2923		2921
…		…
2925	undef $GRAB;	2923	undef $GRAB;
2926	$self->hide;	2924	$self->hide;
2927		2925
2928	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2929	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2930	}	2932	1
2931	}	2933	}
2932		2934
2933	#############################################################################	2935	#############################################################################
2934		2936
2935	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2995	sub add {	2997	sub add {
2996	my ($self, $text, %arg) = @_;	2998	my ($self, $text, %arg) = @_;
2997		2999
2998	$text =~ s/^\s+//;	3000	$text =~ s/^\s+//;
2999	$text =~ s/\s+$//;	3001	$text =~ s/\s+$//;
		3002
		3003	return unless $text;
3000		3004
3001	my $timeout = time + ((delete $arg{timeout}) || 60);	3005	my $timeout = time + ((delete $arg{timeout}) || 60);
3002		3006
3003	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3007	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004		3008
…		…
3038	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
3039	}	3043	}
3040		3044
3041	#############################################################################	3045	#############################################################################
3042		3046
3043	package CFClient::UI::Root;	3047	package CFClient::UI::Inventory;
3044		3048
3045	our @ISA = CFClient::UI::Container::;	3049	our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047	use CFClient::OpenGL;
3048		3050
3049	sub new {	3051	sub new {
3050	my $class = shift;	3052	my $class = shift;
3051		3053
3052	$class->SUPER::new (	3054	my $self = $class->SUPER::new (
		3055	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3053	@_,	3056	@_,
3054	)	3057	);
3055	}
3056		3058
3057	sub configure {	3059	$self
		3060	}
		3061
		3062	sub set_items {
		3063	my ($self, $items) = @_;
		3064
		3065	$self->{scrolled}->clear;
		3066	return unless $items;
		3067
		3068	my @items = sort {
		3069	($a->{type} <=> $b->{type})
		3070	or ($a->{name} cmp $b->{name})
		3071	} @$items;
		3072
		3073	$self->{real_items} = \@items;
		3074
		3075	my $row = 0;
		3076	for my $item (@items) {
		3077	CFClient::Item::update_widgets $item;
		3078
		3079	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3080	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3081	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3082
		3083	$row++;
		3084	}
		3085	}
		3086
		3087	#############################################################################
		3088
		3089	package CFClient::UI::BindEditor;
		3090
		3091	our @ISA = CFClient::UI::FancyFrame::;
		3092
		3093	sub new {
		3094	my $class = shift;
		3095
		3096	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3097
		3098	$self->add (my $vb = new CFClient::UI::VBox);
		3099
		3100
		3101	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3102	text => "start recording",
		3103	tooltip => "Start/Stops recording of actions."
		3104	."All subsequent actions after the recording started will be captured."
		3105	."The actions are displayed after the record was stopped."
		3106	."To bind the action you have to click on the 'Bind' button",
		3107	on_activate => sub {
		3108	unless ($self->{recording}) {
		3109	$self->start;
		3110	} else {
		3111	$self->stop;
		3112	}
		3113	});
		3114
		3115	$vb->add (new CFClient::UI::Label text => "Actions:");
		3116	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3117
		3118	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3119	$vb->add (my $hb = new CFClient::UI::HBox);
		3120	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3121	$hb->add (new CFClient::UI::Button
		3122	text => "bind",
		3123	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3124	on_activate => sub {
		3125	$self->ask_for_bind;
		3126	});
		3127
		3128	$vb->add (my $hb = new CFClient::UI::HBox);
		3129	$hb->add (new CFClient::UI::Button
		3130	text => "ok",
		3131	expand => 1,
		3132	tooltip => "This closes the binding editor and saves the binding",
		3133	on_activate => sub {
		3134	$self->hide;
		3135	$self->commit;
		3136	});
		3137
		3138	$hb->add (new CFClient::UI::Button
		3139	text => "cancel",
		3140	expand => 1,
		3141	tooltip => "This closes the binding editor without saving",
		3142	on_activate => sub {
		3143	$self->hide;
		3144	$self->{binding_cancel}->()
		3145	if $self->{binding_cancel};
		3146	});
		3147
		3148	$self->update_binding_widgets;
		3149
		3150	$self
		3151	}
		3152
		3153	sub commit {
		3154	my ($self) = @_;
		3155	my ($mod, $sym, $cmds) = $self->get_binding;
		3156	if ($sym != 0 && @$cmds > 0) {
		3157	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3158	."'. Don't forget 'Save Config'!");
		3159	$self->{binding_change}->($mod, $sym, $cmds)
		3160	if $self->{binding_change};
		3161	} else {
		3162	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3163	$self->{binding_cancel}->()
		3164	if $self->{binding_cancel};
		3165	}
		3166	}
		3167
		3168	sub start {
		3169	my ($self) = @_;
		3170
		3171	$self->{rec_btn}->set_text ("stop recording");
		3172	$self->{recording} = 1;
		3173	$self->clear_command_list;
		3174	$::CONN->start_record if $::CONN;
		3175	}
		3176
		3177	sub stop {
		3178	my ($self) = @_;
		3179
		3180	$self->{rec_btn}->set_text ("start recording");
		3181	$self->{recording} = 0;
		3182
		3183	my $rec;
		3184	$rec = $::CONN->stop_record if $::CONN;
		3185	return unless ref $rec eq 'ARRAY';
		3186	$self->set_command_list ($rec);
		3187	}
		3188
		3189
		3190	sub ask_for_bind_and_commit {
		3191	my ($self) = @_;
		3192	$self->ask_for_bind (1);
		3193	}
		3194
		3195	sub ask_for_bind {
		3196	my ($self, $commit) = @_;
		3197
		3198	CFClient::Binder::open_binding_dialog (sub {
		3199	my ($mod, $sym) = @_;
		3200	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3201	$self->update_binding_widgets;
		3202	$self->commit if $commit;
		3203	});
		3204	}
		3205
		3206	# $mod and $sym are the modifiers and key symbol
		3207	# $cmds is a array ref of strings (the commands)
		3208	# $cb is the callback that is executed on OK
		3209	# $ccb is the callback that is executed on CANCEL and
		3210	# when the binding was unsuccessful on OK
		3211	sub set_binding {
3058	my ($self, $x, $y, $w, $h) = @_;	3212	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3059		3213
3060	$self->{w} = $w;	3214	$self->clear_command_list;
3061	$self->{h} = $h;	3215	$self->{recording} = 0;
3062	}	3216	$self->{rec_btn}->set_text ("start recording");
3063		3217
3064	sub check_size {	3218	$self->{binding} = [$mod, $sym];
		3219	$self->{commands} = $cmds;
		3220
		3221	$self->{binding_change} = $cb;
		3222	$self->{binding_cancel} = $ccb;
		3223
		3224	$self->update_binding_widgets;
		3225	}
		3226
		3227	# this is a shortcut method that asks for a binding
		3228	# and then just binds it.
		3229	sub do_quick_binding {
3065	my ($self) = @_;	3230	my ($self, $cmds) = @_;
		3231	$self->set_binding (undef, undef, $cmds, sub {
		3232	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3233	});
		3234	$self->ask_for_bind (1);
		3235	}
3066		3236
3067	$self->size_allocate ($self->{w}, $self->{h})	3237	sub update_binding_widgets {
3068	if $self->{w};	3238	my ($self) = @_;
		3239	my ($mod, $sym, $cmds) = $self->get_binding;
		3240	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3241	$self->set_command_list ($cmds);
		3242	}
		3243
		3244	sub get_binding {
		3245	my ($self) = @_;
		3246	return (
		3247	$self->{binding}->[0],
		3248	$self->{binding}->[1],
		3249	[ grep { defined $_ } @{$self->{commands}} ]
		3250	);
		3251	}
		3252
		3253	sub clear_command_list {
		3254	my ($self) = @_;
		3255	$self->{cmdbox}->clear ();
		3256	}
		3257
		3258	sub set_command_list {
		3259	my ($self, $cmds) = @_;
		3260
		3261	$self->{cmdbox}->clear ();
		3262	$self->{commands} = $cmds;
		3263
		3264	my $idx = 0;
		3265
		3266	for (@$cmds) {
		3267	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3268
		3269	my $i = $idx;
		3270	$hb->add (new CFClient::UI::Label text => $_);
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "delete",
		3273	tooltip => "Deletes the action from the record",
		3274	on_activate => sub {
		3275	$self->{cmdbox}->remove ($hb);
		3276	$cmds->[$i] = undef;
		3277	});
		3278
		3279
		3280	$idx++
		3281	}
		3282	}
		3283
		3284	#############################################################################
		3285
		3286	package CFClient::UI::SpellList;
		3287
		3288	our @ISA = CFClient::UI::FancyFrame::;
		3289
		3290	sub new {
		3291	my $class = shift;
		3292
		3293	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3294
		3295	$self->add (new CFClient::UI::ScrolledWindow
		3296	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3297
		3298	$self;
		3299	}
		3300
		3301	# XXX: Do sorting? Argl...
		3302	sub add_spell {
		3303	my ($self, $spell) = @_;
		3304	$self->{spells}->{$spell->{name}} = $spell;
		3305
		3306	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3307	face => $spell->{face},
		3308	can_hover => 1,
		3309	can_events => 1,
		3310	tooltip => $spell->{message});
		3311
		3312	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3313	text => $spell->{name},
		3314	can_hover => 1,
		3315	can_events => 1,
		3316	tooltip => $spell->{message},
		3317	expand => 1);
		3318
		3319	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3320	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3321	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3322	expand => 1);
		3323
		3324	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3325	text => "bind to key",
		3326	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3327	}
		3328
		3329	sub rebuild_spell_list {
		3330	my ($self) = @_;
		3331	$self->{tbl_idx} = 0;
		3332	$self->add_spell ($_) for values %{$self->{spells}};
		3333	}
		3334
		3335	sub remove_spell {
		3336	my ($self, $spell) = @_;
		3337	delete $self->{spells}->{$spell->{name}};
		3338	$self->rebuild_spell_list;
		3339	}
		3340
		3341	#############################################################################
		3342
		3343	package CFClient::UI::Root;
		3344
		3345	our @ISA = CFClient::UI::Container::;
		3346
		3347	use CFClient::OpenGL;
		3348
		3349	sub new {
		3350	my $class = shift;
		3351
		3352	my $self = $class->SUPER::new (
		3353	visible => 1,
		3354	@_,
		3355	);
		3356
		3357	Scalar::Util::weaken ($self->{root} = $self);
		3358
		3359	$self
3069	}	3360	}
3070		3361
3071	sub size_request {	3362	sub size_request {
3072	my ($self) = @_;	3363	my ($self) = @_;
3073		3364
3074	($self->{w}, $self->{h})	3365	($self->{w}, $self->{h})
		3366	}
		3367
		3368	sub _to_pixel {
		3369	my ($coord, $size, $max) = @_;
		3370
		3371	$coord =
		3372	$coord eq "center" ? ($max - $size) * 0.5
		3373	: $coord eq "max" ? $max
		3374	: $coord;
		3375
		3376	$coord = 0 if $coord < 0;
		3377	$coord = $max - $size if $coord > $max - $size;
		3378
		3379	int $coord + 0.5
3075	}	3380	}
3076		3381
3077	sub size_allocate {	3382	sub size_allocate {
3078	my ($self, $w, $h) = @_;	3383	my ($self, $w, $h) = @_;
3079		3384
3080	for my $child ($self->children) {	3385	for my $child ($self->children) {
3081	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3386	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082		3387
3083	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3388	$X = $child->{force_x} if exists $child->{force_x};
3084	if exists $child->{req_x};	3389	$Y = $child->{force_y} if exists $child->{force_y};
3085		3390
3086	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3391	$X = _to_pixel $X, $W, $self->{w};
3087	if exists $child->{req_y};	3392	$Y = _to_pixel $Y, $H, $self->{h};
3088
3089	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091		3393
3092	$child->configure ($X, $Y, $W, $H);	3394	$child->configure ($X, $Y, $W, $H);
3093	}	3395	}
3094	}	3396	}
3095		3397
…		…
3106	}	3408	}
3107		3409
3108	sub update {	3410	sub update {
3109	my ($self) = @_;	3411	my ($self) = @_;
3110		3412
3111	$self->check_size;
3112	$::WANT_REFRESH++;	3413	$::WANT_REFRESH++;
3113	}	3414	}
3114		3415
3115	sub add {	3416	sub add {
3116	my ($self, @children) = @_;	3417	my ($self, @children) = @_;
3117		3418
3118	for (my @widgets = @children; my $w = pop @widgets; ) {
3119	push @widgets, $w->children;
3120	$w->{root} = $self;
3121	$w->{visible} = 1;
3122	}
3123
3124	for my $child (@children) {
3125	$child->{is_toplevel} = 1;	3419	$_->{is_toplevel} = 1
3126		3420	for @children;
3127	# integerise window positions
3128	$child->{x} = int $child->{x};
3129	$child->{y} = int $child->{y};
3130	}
3131		3421
3132	$self->SUPER::add (@children);	3422	$self->SUPER::add (@children);
3133	}	3423	}
3134		3424
3135	sub remove {	3425	sub remove {
3136	my ($self, @children) = @_;	3426	my ($self, @children) = @_;
3137		3427
3138	$self->SUPER::remove (@children);	3428	$self->SUPER::remove (@children);
		3429
		3430	delete $self->{is_toplevel}
		3431	for @children;
3139		3432
3140	while (@children) {	3433	while (@children) {
3141	my $w = pop @children;	3434	my $w = pop @children;
3142	push @children, $w->children;	3435	push @children, $w->children;
3143	$w->set_invisible;	3436	$w->set_invisible;
…		…
3162	while ($self->{refresh_hook}) {	3455	while ($self->{refresh_hook}) {
3163	$_->()	3456	$_->()
3164	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3165	}	3458	}
3166		3459
3167	if ($self->{check_size}) {	3460	if ($self->{realloc}) {
3168	my @queue = ([], []);	3461	my %queue;
		3462	my @queue;
		3463	my $widget;
3169		3464
3170	for (;;) {	3465	outer:
3171	if ($self->{check_size}) {	3466	while () {
3172	# heuristic: check containers last	3467	if (my $realloc = delete $self->{realloc}) {
3173	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3468	for $widget (values %$realloc) {
3174	for values %{delete $self->{check_size}}	3469	$widget->{visible} or next; # do not resize invisible widgets
		3470
		3471	$queue{$widget+0}++ and next; # duplicates are common
		3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3175	}	3475	}
3176		3476
3177	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3477	while () {
		3478	@queue or last outer;
3178		3479
3179	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3480	$widget = pop @{ $queue[-1] || [] }
3180	? @$widget{qw(user_w user_h)}	3481	and last;
3181	: $widget->size_request;
3182
3183	if (delete $widget->{force_alloc}
3184	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186		3482
		3483	pop @queue;
		3484	}
		3485
		3486	delete $queue{$widget+0};
		3487
		3488	my ($w, $h) = $widget->size_request;
		3489
		3490	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3491	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3492
		3493	$w = $widget->{force_w} if exists $widget->{force_w};
		3494	$h = $widget->{force_h} if exists $widget->{force_h};
		3495
		3496	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3497	|| delete $widget->{force_realloc}) {
3187	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3188	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3189		3500
3190	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3501	$self->{size_alloc}{$widget+0} = $widget;
3191		3502
3192	$widget->{parent}->check_size
3193	if $widget->{parent};	3503	if (my $parent = $widget->{parent}) {
		3504	$self->{realloc}{$parent+0} = $parent
		3505	unless $queue{$parent+0};
		3506
		3507	$parent->{force_size_alloc} = 1;
		3508	$self->{size_alloc}{$parent+0} = $parent;
		3509	}
3194	}	3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3195	}	3513	}
3196	}	3514	}
3197		3515
3198	while ($self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3199	for (values %{delete $self->{size_alloc}}) {	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3200	my ($widget, $w, $h) = @$_;	3518	values %$size_alloc;
		3519
		3520	while () {
		3521	my $widget = pop @queue || last;
		3522
		3523	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201		3524
3202	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3203	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3204		3527
		3528	$w = int $w + 0.5;
		3529	$h = int $h + 0.5;
		3530
		3531	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3532	$widget->{old_w} = $widget->{w};
		3533	$widget->{old_h} = $widget->{h};
		3534
3205	$widget->{w} = $w;	3535	$widget->{w} = $w;
3206	$widget->{h} = $h;	3536	$widget->{h} = $h;
		3537
3207	$widget->emit (size_allocate => $w, $h);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3208	}	3540	}
3209	}	3541	}
3210		3542
3211	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3212	$_->()	3544	$_->()
3213	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3214	}	3546	}
		3547
3215		3548
3216	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3219		3552
…		…
3221	glLoadIdentity;	3554	glLoadIdentity;
3222	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3224	glLoadIdentity;	3557	glLoadIdentity;
3225		3558
		3559	{
		3560	package CFClient::UI::Base;
		3561
		3562	($draw_x, $draw_y, $draw_w, $draw_h) =
		3563	(0, 0, $self->{w}, $self->{h});
		3564	}
		3565
3226	$self->_draw;	3566	$self->_draw;
3227	}	3567	}
3228		3568
3229	#############################################################################	3569	#############################################################################
3230		3570

Diff Legend

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