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.234 by root, Thu May 25 16:24:44 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	}
…		…
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
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$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;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$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;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
315	}	381	}
316		382
317	sub set_max_size {	383	sub set_max_size {
318	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
319		385
…		…
378		444
379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380	unless $FOCUS;	446	unless $FOCUS;
381	}	447	}
382		448
383	sub mouse_motion { }	449	sub mouse_motion { 0 }
384	sub button_up { }	450	sub button_up { 0 }
385	sub key_down { }	451	sub key_down { 0 }
386	sub key_up { }	452	sub key_up { 0 }
387		453
388	sub button_down {	454	sub button_down {
389	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
390		456
391	$self->focus_in;	457	$self->focus_in;
392	}
393		458
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
398	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
399		535
400	sub draw {	536	sub draw {
401	my ($self) = @_;	537	my ($self) = @_;
402		538
403	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);
404		550
405	glPushMatrix;	551	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	553	$self->_draw;
408	glPopMatrix;	554	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
421	glEnd;	567	glEnd;
422	glDisable GL_BLEND;	568	glDisable GL_BLEND;
423	}	569	}
424		570
425	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	572	glPushMatrix;
427	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
441	my ($self) = @_;	587	my ($self) = @_;
442		588
443	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
444	}	590	}
445		591
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	# TODO: req_w _does_change after ->reconfigure
464	$self->check_size
465	unless exists $self->{req_w};
466
467	$self->show;
468	}
469
470	sub check_size {
471	my ($self, $forced) = @_;
472
473	$self->{force_alloc} = 1 if $forced;
474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
475	}
476
477	sub update {
478	my ($self) = @_;
479
480	$self->{parent}->update
481	if $self->{parent};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub DESTROY {	592	sub DESTROY {
504	my ($self) = @_;	593	my ($self) = @_;
505		594
506	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
507	#$self->deactivate;	596	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
565	}	654	}
566		655
567	sub size_request {	656	sub size_request {
568	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
569	}	660	}
570		661
571	sub draw { }	662	sub draw { }
572		663
573	#############################################################################	664	#############################################################################
…		…
577	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
578		669
579	sub new {	670	sub new {
580	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
581		672
582	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
583		674
584	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
585	children => [],	676	children => [],
586	can_events => 0,	677	can_events => 0,
587	%arg,	678	%arg,
588	);	679	);
		680
589	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
590		683
591	$self	684	$self
592	}	685	}
593		686
594	sub add {	687	sub add {
…		…
602	$self->{children} = [	695	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
605	];	698	];
606		699
607	$self->check_size (1);	700	$self->realloc;
608	$self->update;
609	}	701	}
610		702
611	sub children {	703	sub children {
612	@{ $_[0]{children} }	704	@{ $_[0]{children} }
613	}	705	}
…		…
618	delete $child->{parent};	710	delete $child->{parent};
619	$child->hide;	711	$child->hide;
620		712
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		714
623	$self->check_size;	715	$self->realloc;
624	$self->update;
625	}	716	}
626		717
627	sub clear {	718	sub clear {
628	my ($self) = @_;	719	my ($self) = @_;
629		720
…		…
633	for (@$children) {	724	for (@$children) {
634	delete $_->{parent};	725	delete $_->{parent};
635	$_->hide;	726	$_->hide;
636	}	727	}
637		728
638	$self->check_size;	729	$self->realloc;
639	$self->update;
640	}	730	}
641		731
642	sub find_widget {	732	sub find_widget {
643	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
644		734
645	$x -= $self->{x};	735	$x -= $self->{x};
646	$y -= $self->{y};	736	$y -= $self->{y};
647		737
648	my $res;	738	my $res;
649		739
650	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
651	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
652	and return $res;	742	and return $res;
653	}	743	}
654		744
655	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
731	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
732	$self->update;	822	$self->update;
733	}	823	}
734		824
735	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
736	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
737	}	829	}
738		830
739	sub render_child {	831	sub render_child {
740	my ($self) = @_;	832	my ($self) = @_;
741		833
742	$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 {
743	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
744	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
745		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
746	$self->_render;	845	$self->_render;
747	};	846	};
748	}	847	}
749		848
750	sub _draw {	849	sub _draw {
751	my ($self) = @_;	850	my ($self) = @_;
752		851
753	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
754		853
755	my $tex = $self->{texture}	854	my $tex = $self->{texture}
756	or return;	855	or return;
757		856
758	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
781	}	880	}
782		881
783	sub size_request {	882	sub size_request {
784	my ($self) = @_;	883	my ($self) = @_;
785		884
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		886
788	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
789	}	891	}
790		892
791	sub size_allocate {	893	sub size_allocate {
792	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
793		895
		896	my $child = $self->child;
		897
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		900
797	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
798	$self->update;	902	$self->update;
799	}	903	}
800		904
…		…
836	}	940	}
837		941
838	sub _render {	942	sub _render {
839	my ($self) = @_;	943	my ($self) = @_;
840		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
841	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842		949
843	$self->SUPER::_render;	950	$self->SUPER::_render;
844	}	951	}
845		952
…		…
848	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
849		956
850	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
851		958
852	sub new {	959	sub new {
853	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
854		963
855	my $self;	964	my $self;
856		965
857	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
858	vertical => 1,	967	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	968	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	969	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	970	$self->{vp}->set_offset (0, $_[1]);
862	},	971	},
863	;	972	;
864		973
865	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
866	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
867	slider => $slider,	976	slider => $slider,
868	@_,	977	%arg,
869	);	978	);
870		979
871	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});
873	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
874		982
875	$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]);
876	}	1000	}
877		1001
878	sub size_allocate {	1002	sub size_allocate {
879	my ($self, $w, $h) = @_;	1003	my ($self, $w, $h) = @_;
880		1004
…		…
933		1057
934	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
935		1059
936	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
937		1061
938	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 =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940	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);
941		1069
942	sub new {	1070	sub new {
943	my $class = shift;	1071	my ($class, %arg) = @_;
944		1072
945	# TODO: user_x, user_y, overwrite moveto?	1073	my $title = delete $arg{title};
946		1074
947	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1078	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1079	can_events => 1,
953	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
954	);	1083	);
955		1084
956	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
957	align => 0,	1086	align => 0,
958	valign => 1,	1087	valign => 1,
959	text => $self->{title},	1088	text => $title,
960	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
961		1091
962	$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};
963	}	1100	}
964		1101
965	sub border {	1102	sub border {
966	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
967	}	1104	}
968		1105
969	sub size_request {	1106	sub size_request {
970	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
971		1111
972	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
973		1113
974	(	1114	(
975	$w + $self->border * 2,	1115	$w + $self->border * 2,
…		…
978	}	1118	}
979		1119
980	sub size_allocate {	1120	sub size_allocate {
981	my ($self, $w, $h) = @_;	1121	my ($self, $w, $h) = @_;
982		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
983	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
985		1133
986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987	if $self->{title};
988
989	$self->child->configure ($self->border, $self->border, $w, $h);	1134	$self->child->configure ($border, $border, $w, $h);
990	}	1135	}
991		1136
992	sub button_down {	1137	sub button_down {
993	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
994		1139
…		…
1010	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
1011		1156
1012	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
1014		1159
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1162
		1163	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1165	};
1020		1166
1021	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1171	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
1027		1173
1028	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1029		1175
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1033	}	1182	1
1034	}	1183	}
1035		1184
1036	sub button_up {	1185	sub button_up {
1037	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1038		1187
1039	delete $self->{motion};	1188	!!delete $self->{motion}
1040	}	1189	}
1041		1190
1042	sub mouse_motion {	1191	sub mouse_motion {
1043	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1044		1193
1045	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1046	}	1197	}
1047		1198
1048	sub _draw {	1199	sub _draw {
1049	my ($self) = @_;	1200	my ($self) = @_;
1050		1201
		1202	my $child = $self->{children}[0];
		1203
1051	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1053		1206
1054	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1209
1057	my $border = $self->border;	1210	my $border = $self->border;
1058		1211
1059	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1217
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1067		1220
1068	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1224	$bg->{t} = $ch / $bg->{h};
1071
1072	glColor @{ $self->{bg} };
1073
1074	$bg->{s} = $rep_x;
1075	$bg->{t} = $rep_y;
1076	$bg->{wrap_mode} = 1;
1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1226	}
1079		1227
1080	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1081		1229
1082	$self->{title}->draw if $self->{title};
1083
1084	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1085	}	1236	}
1086		1237
1087	#############################################################################	1238	#############################################################################
1088		1239
1089	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1101	col_expand => [],	1252	col_expand => [],
1102	@_,	1253	@_,
1103	)	1254	)
1104	}	1255	}
1105		1256
		1257	sub children {
		1258	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1259	}
		1260
1106	sub add {	1261	sub add {
1107	my ($self, $x, $y, $child) = @_;	1262	my ($self, $x, $y, $child) = @_;
1108		1263
1109	$child->set_parent ($self);	1264	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1265	$self->{children}[$y][$x] = $child;
1111		1266
1112	$child->check_size;	1267	$self->realloc;
1113	}	1268	}
1114		1269
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# 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?
1120	sub clear {	1271	sub clear {
1121	my ($self) = @_;	1272	my ($self) = @_;
1122		1273
1123	my @children = $self->children;	1274	my @children = $self->children;
1124	delete $self->{children};	1275	delete $self->{children};
…		…
1126	for (@children) {	1277	for (@children) {
1127	delete $_->{parent};	1278	delete $_->{parent};
1128	$_->hide;	1279	$_->hide;
1129	}	1280	}
1130		1281
1131	$self->update;	1282	$self->realloc;
1132	}	1283	}
1133		1284
1134	sub get_wh {	1285	sub get_wh {
1135	my ($self) = @_;	1286	my ($self) = @_;
1136		1287
…		…
1167	sub size_allocate {	1318	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1319	my ($self, $w, $h) = @_;
1169		1320
1170	my ($ws, $hs) = $self->get_wh;	1321	my ($ws, $hs) = $self->get_wh;
1171		1322
1172	my $req_w = sum @$ws;	1323	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1324	my $req_h = (sum @$hs) || 1;
1174		1325
1175	# TODO: nicer code && do row_expand	1326	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1327	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1328	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1329	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1383	}
1233	}	1384	}
1234		1385
1235	#############################################################################	1386	#############################################################################
1236		1387
1237	package CFClient::UI::HBox;	1388	package CFClient::UI::Box;
1238
1239	# TODO: wrap into common Box base class
1240		1389
1241	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Container::;
1242		1391
1243	sub size_request {	1392	sub size_request {
1244	my ($self) = @_;	1393	my ($self) = @_;
1245		1394
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$self->{vertical}
1247		1396	? (
1248	(	1397	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1249	(List::Util::sum map $_->[0], @alloc),	1398	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250	(List::Util::max map $_->[1], @alloc),	1399	)
1251	)	1400	: (
		1401	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1402	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1403	)
1252	}	1404	}
1253		1405
1254	sub size_allocate {	1406	sub size_allocate {
1255	my ($self, $w, $h) = @_;	1407	my ($self, $w, $h) = @_;
1256		1408
1257	($h, $w) = ($w, $h);	1409	my $space = $self->{vertical} ? $h : $w;
1258
1259	my $children = $self->{children};	1410	my $children = $self->{children};
1260		1411
1261	my @h = map $_->{req_w}, @$children;	1412	my @req;
1262		1413
1263	my $req_h = List::Util::sum @h;	1414	if ($self->{homogeneous}) {
1264		1415	@req = ($space / (@$children || 1)) x @$children;
1265	if ($req_h > $h) {
1266	# ah well, not enough space
1267	$_ *= $h / $req_h for @h;
1268	} 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 {
1269	my $exp = List::Util::sum map $_->{expand}, @$children;	1424	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270	$exp ||= 1;
1271		1425
		1426	$space = ($space - $req) / $expand; # remaining space to give away
		1427
		1428	$req[$_] += $space * $children->[$_]{expand}
1272	for (0 .. $#$children) {	1429	for 0 .. $#$children;
1273	my $child = $children->[$_];
1274
1275	my $alloc_h = $h[$_];
1276	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277	$h[$_] = $alloc_h;
1278	}	1430	}
1279	}	1431	}
1280		1432
1281	CFClient::UI::harmonize \@h;	1433	CFClient::UI::harmonize \@req;
1282		1434
1283	my $y = 0;	1435	my $pos = 0;
1284	for (0 .. $#$children) {	1436	for (0 .. $#$children) {
1285	my $child = $children->[$_];
1286	my $h = $h[$_];	1437	my $alloc = $req[$_];
1287	$child->configure ($y, 0, $h, $w);	1438	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288		1439
1289	$y += $h;	1440	$pos += $alloc;
1290	}	1441	}
1291		1442
1292	1	1443	1
1293	}	1444	}
1294		1445
1295	#############################################################################	1446	#############################################################################
1296		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
1297	package CFClient::UI::VBox;	1463	package CFClient::UI::VBox;
1298		1464
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1465	our @ISA = CFClient::UI::Box::;
1302		1466
1303	sub size_request {	1467	sub new {
1304	my ($self) = @_;	1468	my $class = shift;
1305		1469
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1470	$class->SUPER::new (
1307		1471	vertical => 1,
1308	(	1472	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1473	)
1312	}
1313
1314	sub size_allocate {
1315	my ($self, $w, $h) = @_;
1316
1317	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319	my $children = $self->{children};
1320
1321	my @h = map $_->{req_h}, @$children;
1322
1323	my $req_h = List::Util::sum @h;
1324
1325	if ($req_h > $h) {
1326	# ah well, not enough space
1327	$_ *= $h / $req_h for @h;
1328	} else {
1329	my $exp = List::Util::sum map $_->{expand}, @$children;
1330	$exp ||= 1;
1331
1332	for (0 .. $#$children) {
1333	my $child = $children->[$_];
1334
1335	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336	}
1337	}
1338
1339	CFClient::UI::harmonize \@h;
1340
1341	my $y = 0;
1342	for (0 .. $#$children) {
1343	my $child = $children->[$_];
1344	my $h = $h[$_];
1345	$child->configure (0, $y, $w, $h);
1346
1347	$y += $h;
1348	}
1349
1350	1
1351	}	1474	}
1352		1475
1353	#############################################################################	1476	#############################################################################
1354		1477
1355	package CFClient::UI::Label;	1478	package CFClient::UI::Label;
…		…
1372	ellipsise => 3, # end	1495	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1374	fontsize => 1,	1497	fontsize => 1,
1375	align => -1,	1498	align => -1,
1376	valign => -1,	1499	valign => -1,
1377	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1378	can_events => 0,	1502	can_events => 0,
1379	%arg	1503	%arg
1380	);	1504	);
1381		1505
1382	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1418	$self->{text} = "T$text";	1542	$self->{text} = "T$text";
1419		1543
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1545	$self->{layout}->set_text ($text);
1422		1546
		1547	$self->realloc;
1423	$self->update;	1548	$self->update;
1424	$self->check_size;
1425	}	1549	}
1426		1550
1427	sub set_markup {	1551	sub set_markup {
1428	my ($self, $markup) = @_;	1552	my ($self, $markup) = @_;
1429		1553
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1557	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1558
1435	$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;
1436	$self->{layout}->set_markup ($markup);	1560	$self->{layout}->set_markup ($markup);
1437		1561
		1562	$self->realloc;
1438	$self->update;	1563	$self->update;
1439	$self->check_size;
1440	}	1564	}
1441		1565
1442	sub size_request {	1566	sub size_request {
1443	my ($self) = @_;	1567	my ($self) = @_;
1444		1568
…		…
1458		1582
1459	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1461	}	1585	}
1462		1586
1463	(	1587	($w, $h)
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1588	}
1468		1589
1469	sub size_allocate {	1590	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1591	my ($self, $w, $h) = @_;
1471		1592
		1593	delete $self->{ox};
		1594
1472	delete $self->{texture};	1595	delete $self->{texture}
		1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473	}	1597	}
1474		1598
1475	sub set_fontsize {	1599	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1477		1601
1478	$self->{fontsize} = $fontsize;	1602	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1603	delete $self->{texture};
1480		1604
1481	$self->update;	1605	$self->realloc;
1482	$self->check_size;
1483	}	1606	}
1484		1607
1485	sub _draw {	1608	sub _draw {
1486	my ($self) = @_;	1609	my ($self) = @_;
1487		1610
…		…
1493	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1494	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1620
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1499		1623
		1624	unless (exists $self->{ox}) {
1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1503		1628
1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1507
1508	$tex
1509	};	1632	};
1510		1633
1511	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513		1636
…		…
1567	sub set_text {	1690	sub set_text {
1568	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1569		1692
1570	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1694	$self->_set_text ($text);
1572	$self->update;	1695
1573	$self->check_size;	1696	$self->realloc;
1574	}	1697	}
1575		1698
1576	sub get_text {	1699	sub get_text {
1577	$_[0]{text}	1700	$_[0]{text}
1578	}	1701	}
…		…
1608	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1609	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1610	$self->_emit ('escape');	1733	$self->_emit ('escape');
1611	} elsif ($uni) {	1734	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1613	}	1738	}
1614		1739
1615	$self->_set_text ($text);	1740	$self->_set_text ($text);
1616	$self->update;	1741
1617	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1618	}	1745	}
1619		1746
1620	sub focus_in {	1747	sub focus_in {
1621	my ($self) = @_;	1748	my ($self) = @_;
1622		1749
…		…
1637	utf8::encode $text;	1764	utf8::encode $text;
1638	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1639		1766
1640	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1641	$self->update;	1768	$self->update;
		1769
		1770	1
1642	}	1771	}
1643		1772
1644	sub mouse_motion {	1773	sub mouse_motion {
1645	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1646	# 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
1647	}	1778	}
1648		1779
1649	sub _draw {	1780	sub _draw {
1650	my ($self) = @_;	1781	my ($self) = @_;
1651		1782
…		…
1728	} else {	1859	} else {
1729	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1730	}	1861	}
1731		1862
1732	} else {	1863	} else {
1733	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1734	}	1867	1
1735
1736	}	1868	}
1737		1869
1738	#############################################################################	1870	#############################################################################
1739		1871
1740	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1749		1881
1750	sub new {	1882	sub new {
1751	my $class = shift;	1883	my $class = shift;
1752		1884
1753	$class->SUPER::new (	1885	$class->SUPER::new (
1754	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1755	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1757	can_hover => 1,	1890	can_hover => 1,
1758	align => 0,	1891	align => 0,
1759	valign => 0,	1892	valign => 0,
…		…
1768	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1769		1902
1770	$self->emit ("activate")	1903	$self->emit ("activate")
1771	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1772	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1773	}	1908	}
1774		1909
1775	sub _draw {	1910	sub _draw {
1776	my ($self) = @_;	1911	my ($self) = @_;
1777		1912
…		…
1806		1941
1807	sub new {	1942	sub new {
1808	my $class = shift;	1943	my $class = shift;
1809		1944
1810	$class->SUPER::new (	1945	$class->SUPER::new (
1811	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1812	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	1952	state => 0,
…		…
1820	}	1956	}
1821		1957
1822	sub size_request {	1958	sub size_request {
1823	my ($self) = @_;	1959	my ($self) = @_;
1824		1960
1825	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1826	}	1962	}
1827		1963
1828	sub button_down {	1964	sub button_down {
1829	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1830		1966
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1834	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1835	}	1975	1
1836	}	1976	}
1837		1977
1838	sub _draw {	1978	sub _draw {
1839	my ($self) = @_;	1979	my ($self) = @_;
1840		1980
1841	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1842		1982
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		1984
1845	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;
1846		1988
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		1990
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		1992
…		…
2115	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2261	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2122	vertical => 0,	2264	vertical => 0,
2123	can_hover => 1,	2265	can_hover => 1,
2124	inner_pad => 0.02,	2266	inner_pad => 0.02,
2125	@_	2267	@_
2126	);	2268	);
…		…
2129	$self->update;	2271	$self->update;
2130		2272
2131	$self	2273	$self
2132	}	2274	}
2133		2275
		2276	sub changed { }
		2277
2134	sub set_range {	2278	sub set_range {
2135	my ($self, $range) = @_;	2279	my ($self, $range) = @_;
2136		2280
2137	$self->{range} = $range;	2281	($range, $self->{range}) = ($self->{range}, $range);
2138		2282
2139	$self->update;	2283	$self->update
		2284	if "@$range" ne "@{$self->{range}}";
2140	}	2285	}
2141		2286
2142	sub set_value {	2287	sub set_value {
2143	my ($self, $value) = @_;	2288	my ($self, $value) = @_;
2144		2289
…		…
2163	}	2308	}
2164		2309
2165	sub size_request {	2310	sub size_request {
2166	my ($self) = @_;	2311	my ($self) = @_;
2167		2312
2168	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2314	}
2173		2315
2174	sub button_down {	2316	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2176		2318
2177	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2178		2320
2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180		2322
2181	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2182	}	2324	}
2183		2325
2184	sub mouse_motion {	2326	sub mouse_motion {
2185	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2186		2328
…		…
2190	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2191		2333
2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193		2335
2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2336	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2337	} else {
		2338	return 0;
		2339	}
		2340
2195	}	2341	1
2196	}	2342	}
2197		2343
2198	sub update {	2344	sub update {
2199	my ($self) = @_;	2345	my ($self) = @_;
2200		2346
…		…
2527		2673
2528	sub new {	2674	sub new {
2529	my $class = shift;	2675	my $class = shift;
2530		2676
2531	my $self = $class->SUPER::new (	2677	my $self = $class->SUPER::new (
2532	state => 0,	2678	state => 0,
2533	connect_activate => \&toggle_flopper,	2679	on_activate => \&toggle_flopper,
2534	@_	2680	@_
2535	);	2681	);
2536		2682
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2683	$self
2543	}	2684	}
2544		2685
2545	sub toggle_flopper {	2686	sub toggle_flopper {
2546	my ($self) = @_;	2687	my ($self) = @_;
2547		2688
2548	# TODO: use animation	2689	$self->{other}->toggle_visibility;
2549	if ($self->{state} = !$self->{state}) {
2550	$CFClient::UI::ROOT->add ($self->{other});
2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2552	$self->_emit ("open");
2553	} else {
2554	$CFClient::UI::ROOT->remove ($self->{other});
2555	$self->_emit ("close");
2556	}
2557
2558	$self->_emit (changed => $self->{state});
2559	}	2690	}
2560		2691
2561	#############################################################################	2692	#############################################################################
2562		2693
2563	package CFClient::UI::Tooltip;	2694	package CFClient::UI::Tooltip;
…		…
2576	}	2707	}
2577		2708
2578	sub set_tooltip_from {	2709	sub set_tooltip_from {
2579	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2580		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
2581	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2582	markup => $widget->{tooltip},	2722	markup => $tooltip,
2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584	fontsize => 0.8,	2724	fontsize => 0.8,
2585	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2586	ellipsise => 0,	2726	ellipsise => 0,
2587	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2598		2738
2599	sub size_allocate {	2739	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2740	my ($self, $w, $h) = @_;
2601		2741
2602	$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	});
2603	}	2761	}
2604		2762
2605	sub _draw {	2763	sub _draw {
2606	my ($self) = @_;	2764	my ($self) = @_;
2607		2765
…		…
2624	glVertex $w, $h;	2782	glVertex $w, $h;
2625	glVertex $w, 0;	2783	glVertex $w, 0;
2626	glEnd;	2784	glEnd;
2627		2785
2628	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2629	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2630	}	2789	}
2631		2790
2632	#############################################################################	2791	#############################################################################
2633		2792
…		…
2709	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2710	}	2869	}
2711		2870
2712	#############################################################################	2871	#############################################################################
2713		2872
2714	package CFClient::UI::InventoryItem;	2873	package CFClient::UI::Buttonbar;
2715		2874
2716	our @ISA = CFClient::UI::HBox::;	2875	our @ISA = CFClient::UI::HBox::;
2717		2876
2718	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2719	my $class = shift;
2720
2721	my %args = @_;
2722
2723	my $item = delete $args{item};
2724
2725	my $desc = CFClient::Item::desc_string $item;
2726
2727	my $self = $class->SUPER::new (
2728	can_hover => 1,
2729	can_events => 1,
2730	tooltip => ((CFClient::UI::Label::escape $desc)
2731	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732	connect_button_down => sub {
2733	my ($self, $ev, $x, $y) = @_;
2734
2735	# todo: maybe put examine on 1? but should just be a tooltip :(
2736	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737	my $targ = $::CONN->{player}{tag};
2738
2739	if ($item->{container} == $::CONN->{player}{tag}) {
2740	$targ = $main::OPENCONT;
2741	}
2742
2743	$::CONN->send ("move $targ $item->{tag} 0");
2744	} elsif ($ev->{button} == 1) {
2745	$::CONN->send ("examine $item->{tag}");
2746	} elsif ($ev->{button} == 2) {
2747	$::CONN->send ("apply $item->{tag}");
2748	} elsif ($ev->{button} == 3) {
2749	my @menu_items = (
2750	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753	(
2754	$item->{flags} & Crossfire::Protocol::F_LOCKED
2755	? (
2756	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757	)
2758	: (
2759	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761	)
2762	),
2763	);
2764
2765	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766	}
2767
2768	1
2769	},
2770	%args
2771	);
2772
2773
2774	$self->add (new CFClient::UI::Face
2775	can_events => 0,
2776	face => $item->{face},
2777	anim => $item->{anim},
2778	animspeed => $item->{animspeed},
2779	);
2780
2781	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783	$self->{item} = $item;
2784
2785	$self->update_item;
2786
2787	$self
2788	}
2789
2790	sub update_item {
2791	my ($self) = @_;
2792
2793	my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795	$self->{name_lbl}->set_text ($desc);
2796	}
2797
2798	#############################################################################
2799
2800	package CFClient::UI::Inventory;
2801
2802	our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804	sub new {
2805	my $class = shift;
2806
2807	my $self = $class->SUPER::new (
2808	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809	@_,
2810	);
2811
2812	$self
2813	}
2814
2815	sub set_items {
2816	my ($self, $items) = @_;
2817
2818	$self->{scrolled}->clear;
2819	return unless $items;
2820
2821	my @items = sort {
2822	($a->{type} <=> $b->{type})
2823	or ($a->{name} cmp $b->{name})
2824	} @$items;
2825
2826	$self->{real_items} = \@items;
2827
2828	my $row = 0;
2829	for my $item (@items) {
2830	CFClient::Item::update_widgets $item;
2831
2832	$self->{scrolled}->add (0, $row, $item->{face_widget});
2833	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2834	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836	$row++;
2837	}
2838
2839	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840	}
2841
2842	sub size_request {
2843	my ($self) = @_;
2844	($self->{req_w}, $self->{req_h});
2845	}
2846		2878
2847	#############################################################################	2879	#############################################################################
2848		2880
2849	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2850		2882
…		…
2891	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2892	$GRAB = $self;	2924	$GRAB = $self;
2893	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2894		2926
2895	$self->show;	2927	$self->show;
2896	$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);
2897	}	2929	}
2898		2930
2899	sub mouse_motion {	2931	sub mouse_motion {
2900	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2901		2933
2902	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2903	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2905	}	2939	}
2906		2940
2907	sub button_up {	2941	sub button_up {
2908	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2909		2943
…		…
2911	undef $GRAB;	2945	undef $GRAB;
2912	$self->hide;	2946	$self->hide;
2913		2947
2914	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2915	$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	);
2916	}	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});
2917	}	3063	}
2918		3064
2919	#############################################################################	3065	#############################################################################
2920		3066
2921	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
3026	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
3027	}	3173	}
3028		3174
3029	#############################################################################	3175	#############################################################################
3030		3176
3031	package CFClient::UI::Root;	3177	package CFClient::UI::Inventory;
3032		3178
3033	our @ISA = CFClient::UI::Container::;	3179	our @ISA = CFClient::UI::ScrolledWindow::;
3034
3035	use CFClient::OpenGL;
3036		3180
3037	sub new {	3181	sub new {
3038	my $class = shift;	3182	my $class = shift;
3039		3183
3040	$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 => [],
3041	@_,	3426	@_,
3042	)	3427	)
3043	}	3428	}
3044		3429
3045	sub configure {	3430	# XXX: Do sorting? Argl...
3046	my ($self, $x, $y, $w, $h) = @_;	3431	sub add_spell {
3047
3048	$self->{w} = $w;
3049	$self->{h} = $h;
3050	}
3051
3052	sub check_size {
3053	my ($self) = @_;	3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
3054		3434
3055	$self->size_allocate ($self->{w}, $self->{h})	3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3056	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
3057	}	3489	}
3058		3490
3059	sub size_request {	3491	sub size_request {
3060	my ($self) = @_;	3492	my ($self) = @_;
3061		3493
3062	($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
3063	}	3509	}
3064		3510
3065	sub size_allocate {	3511	sub size_allocate {
3066	my ($self, $w, $h) = @_;	3512	my ($self, $w, $h) = @_;
3067		3513
3068	for my $child ($self->children) {	3514	for my $child ($self->children) {
3069	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)};
3070		3516
3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
3072	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
3073		3519
3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
3075	if exists $child->{req_y};	3521	$Y = _to_pixel $Y, $H, $self->{h};
3076
3077	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079		3522
3080	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
3081	}	3524	}
3082	}	3525	}
3083		3526
…		…
3094	}	3537	}
3095		3538
3096	sub update {	3539	sub update {
3097	my ($self) = @_;	3540	my ($self) = @_;
3098		3541
3099	$self->check_size;
3100	$::WANT_REFRESH++;	3542	$::WANT_REFRESH++;
3101	}	3543	}
3102		3544
3103	sub add {	3545	sub add {
3104	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3105		3547
3106	for (my @widgets = @children; my $w = pop @widgets; ) {
3107	push @widgets, $w->children;
3108	$w->{root} = $self;
3109	$w->{visible} = 1;
3110	}
3111
3112	for my $child (@children) {
3113	$child->{is_toplevel} = 1;	3548	$_->{is_toplevel} = 1
3114		3549	for @children;
3115	# integerise window positions
3116	$child->{x} = int $child->{x};
3117	$child->{y} = int $child->{y};
3118	}
3119		3550
3120	$self->SUPER::add (@children);	3551	$self->SUPER::add (@children);
3121	}	3552	}
3122		3553
3123	sub remove {	3554	sub remove {
3124	my ($self, @children) = @_;	3555	my ($self, @children) = @_;
3125		3556
3126	$self->SUPER::remove (@children);	3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3127		3561
3128	while (@children) {	3562	while (@children) {
3129	my $w = pop @children;	3563	my $w = pop @children;
3130	push @children, $w->children;	3564	push @children, $w->children;
3131	$w->set_invisible;	3565	$w->set_invisible;
…		…
3150	while ($self->{refresh_hook}) {	3584	while ($self->{refresh_hook}) {
3151	$_->()	3585	$_->()
3152	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3153	}	3587	}
3154		3588
3155	if ($self->{check_size}) {	3589	if ($self->{realloc}) {
3156	my @queue = ([], []);	3590	my %queue;
		3591	my @queue;
		3592	my $widget;
3157		3593
3158	for (;;) {	3594	outer:
3159	if ($self->{check_size}) {	3595	while () {
3160	# heuristic: check containers last	3596	if (my $realloc = delete $self->{realloc}) {
3161	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3597	for $widget (values %$realloc) {
3162	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	}
3163	}	3604	}
3164		3605
3165	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3606	while () {
		3607	@queue or last outer;
3166		3608
3167	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3609	$widget = pop @{ $queue[-1] || [] }
3168	? @$widget{qw(user_w user_h)}	3610	and last;
3169	: $widget->size_request;
3170
3171	if (delete $widget->{force_alloc}
3172	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174		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}) {
3175	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3176	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3177		3629
3178	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3630	$self->{size_alloc}{$widget+0} = $widget;
3179		3631
3180	$widget->{parent}->check_size
3181	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	}
3182	}	3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3183	}	3642	}
3184	}	3643	}
3185		3644
3186	while ($self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3187	for (values %{delete $self->{size_alloc}}) {	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3188	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)};
3189		3653
3190	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3191	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3192		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
3193	$widget->{w} = $w;	3664	$widget->{w} = $w;
3194	$widget->{h} = $h;	3665	$widget->{h} = $h;
		3666
3195	$widget->emit (size_allocate => $w, $h);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3196	}	3669	}
3197	}	3670	}
3198		3671
3199	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3200	$_->()	3673	$_->()
3201	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3202	}	3675	}
		3676
3203		3677
3204	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3207		3681
…		…
3209	glLoadIdentity;	3683	glLoadIdentity;
3210	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3212	glLoadIdentity;	3686	glLoadIdentity;
3213		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
3214	$self->_draw;	3695	$self->_draw;
3215	}	3696	}
3216		3697
3217	#############################################################################	3698	#############################################################################
3218		3699

Diff Legend

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