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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

…		…
9	use CFClient;	9	use CFClient;
10	use CFClient::Texture;	10	use CFClient::Texture;
11		11
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		13
		14	our $LAYOUT;
14	our $ROOT;	15	our $ROOT;
15	our $TOOLTIP;	16	our $TOOLTIP;
16	our $BUTTON_STATE;	17	our $BUTTON_STATE;
17		18
18	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
19		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
20	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
21	if (!$GRAB) {	47	if (!$GRAB) {
22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
24
25	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
26	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
27		54
28	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
29		56
30	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
31		58
32	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
33	$TOOLTIP->show;	60	$TOOLTIP->show;
34
35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	if $x + $TOOLTIP->{w} > $::WIDTH;
39
40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;
42	$TOOLTIP->update;
43	}	61	}
44		62
45	return;	63	return;
46	}	64	}
47	}	65	}
…		…
153	sub rescale_widgets {	171	sub rescale_widgets {
154	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
155		173
156	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
157	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
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167	}	190	}
168		191
169	reconfigure_widgets;	192	reconfigure_widgets;
170	}	193	}
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub show_centered {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
218	return if $self->{parent};	257	return if $self->{visible};
219		258
220	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
221		261
222	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
223	"centered $self" => sub {	263
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
225	},	265
226	);	266	$_->set_visible for $self->children;
227	}	267	}
228		268
229	sub set_invisible {	269	sub set_invisible {
230	my ($self) = @_;	270	my ($self) = @_;
231		271
232	# broken show/hide model	272	return unless $self->{visible};
233		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
234	delete $self->{visible};	277	delete $self->{visible};
235		278
236	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
237	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
238		281
239	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
240	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
241		284
242	$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;
243	}	305	}
244		306
245	sub hide {	307	sub hide {
246	my ($self) = @_;	308	my ($self) = @_;
247		309
…		…
249		311
250	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
251	if $self->{parent};	313	if $self->{parent};
252	}	314	}
253		315
254	sub move {	316	sub move_abs {
255	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
256		318
257	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
258	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
259	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
260		322
261	$self->update;	323	$self->update;
262	}	324	}
263		325
264	sub set_size {	326	sub set_size {
265	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
266		328
267	$self->{user_w} = $w;	329	$self->{force_w} = $w;
268	$self->{user_h} = $h;	330	$self->{force_h} = $h;
269		331
270	$self->check_size;	332	$self->realloc;
271	}	333	}
272		334
273	sub size_request {	335	sub size_request {
274	require Carp;	336	require Carp;
275	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
277		339
278	sub configure {	340	sub configure {
279	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
280		342
281	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
282	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
283	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
284		348
285	# use alignment to adjust x, y	349	# use alignment to adjust x, y
286		350
287	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
288	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
289
290	($w, $h) = ($w2, $h2);
291	}	353	}
292		354
293	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
294	$self->{x} = $x;	356	$self->{x} = $x;
295	$self->{y} = $y;	357	$self->{y} = $y;
296	$self->update;	358	$self->update;
297	}	359	}
298		360
299	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300	$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;
301	}	368	}
302	}	369	}
303		370
304	sub size_allocate {	371	sub size_allocate {
305	# nothing to be done	372	# nothing to be done
306	}	373	}
307		374
308	sub reconfigure {
309	my ($self) = @_;
310
311	$self->check_size (1);
312	$self->update;
313	}
314
315	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
316	}	381	}
317		382
318	sub set_max_size {	383	sub set_max_size {
319	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
320		385
…		…
379		444
380	$::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
381	unless $FOCUS;	446	unless $FOCUS;
382	}	447	}
383		448
384	sub mouse_motion { }	449	sub mouse_motion { 0 }
385	sub button_up { }	450	sub button_up { 0 }
386	sub key_down { }	451	sub key_down { 0 }
387	sub key_up { }	452	sub key_up { 0 }
388		453
389	sub button_down {	454	sub button_down {
390	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
391		456
392	$self->focus_in;	457	$self->focus_in;
393	}
394		458
395	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
396	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
397	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
398	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
399	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
400		535
401	sub draw {	536	sub draw {
402	my ($self) = @_;	537	my ($self) = @_;
403		538
404	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);
405		550
406	glPushMatrix;	551	glPushMatrix;
407	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
408	$self->_draw;	553	$self->_draw;
409	glPopMatrix;	554	glPopMatrix;
…		…
421	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
422	glEnd;	567	glEnd;
423	glDisable GL_BLEND;	568	glDisable GL_BLEND;
424	}	569	}
425		570
426	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
427	glPushMatrix;	572	glPushMatrix;
428	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
431	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
442	my ($self) = @_;	587	my ($self) = @_;
443		588
444	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
445	}	590	}
446		591
447	sub find_widget {
448	my ($self, $x, $y) = @_;
449
450	return () unless $self->{can_events};
451
452	return $self
453	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456	()
457	}
458
459	sub set_parent {
460	my ($self, $parent) = @_;
461
462	Scalar::Util::weaken ($self->{parent} = $parent);
463
464	$self->{root} = $parent->{root};
465	$self->{visible} = $parent->{visible};
466
467	# TODO: req_w _does_change after ->reconfigure
468	$self->check_size
469	unless exists $self->{req_w};
470
471	$self->show;
472	}
473
474	sub check_size {
475	my ($self, $forced) = @_;
476
477	$self->{force_alloc} = 1 if $forced;
478	$CFClient::UI::ROOT->{check_size}{$self} = $self;
479	}
480
481	sub update {
482	my ($self) = @_;
483
484	$self->{parent}->update
485	if $self->{parent};
486	}
487
488	sub connect {
489	my ($self, $signal, $cb) = @_;
490
491	push @{ $self->{signal_cb}{$signal} }, $cb;
492	}
493
494	sub _emit {
495	my ($self, $signal, @args) = @_;
496
497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498	}
499
500	sub emit {
501	my ($self, $signal, @args) = @_;
502
503	$self->_emit ($signal, @args)
504	|| $self->$signal (@args);
505	}
506
507	sub DESTROY {	592	sub DESTROY {
508	my ($self) = @_;	593	my ($self) = @_;
509		594
510	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
511	#$self->deactivate;	596	#$self->deactivate;
…		…
567	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
568	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
569	}	654	}
570		655
571	sub size_request {	656	sub size_request {
572	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
573	}	660	}
574		661
575	sub draw { }	662	sub draw { }
576		663
577	#############################################################################	664	#############################################################################
…		…
581	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
582		669
583	sub new {	670	sub new {
584	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
585		672
586	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
587		674
588	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
589	children => [],	676	children => [],
590	can_events => 0,	677	can_events => 0,
591	%arg,	678	%arg,
592	);	679	);
		680
593	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
594		683
595	$self	684	$self
596	}	685	}
597		686
598	sub add {	687	sub add {
…		…
606	$self->{children} = [	695	$self->{children} = [
607	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
608	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
609	];	698	];
610		699
611	$self->check_size (1);	700	$self->realloc;
612	$self->update;
613	}	701	}
614		702
615	sub children {	703	sub children {
616	@{ $_[0]{children} }	704	@{ $_[0]{children} }
617	}	705	}
…		…
622	delete $child->{parent};	710	delete $child->{parent};
623	$child->hide;	711	$child->hide;
624		712
625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626		714
627	$self->check_size (1);	715	$self->realloc;
628	$self->update;
629	}	716	}
630		717
631	sub clear {	718	sub clear {
632	my ($self) = @_;	719	my ($self) = @_;
633		720
…		…
637	for (@$children) {	724	for (@$children) {
638	delete $_->{parent};	725	delete $_->{parent};
639	$_->hide;	726	$_->hide;
640	}	727	}
641		728
642	$self->check_size;	729	$self->realloc;
643	$self->update;
644	}	730	}
645		731
646	sub find_widget {	732	sub find_widget {
647	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
648		734
649	$x -= $self->{x};	735	$x -= $self->{x};
650	$y -= $self->{y};	736	$y -= $self->{y};
651		737
652	my $res;	738	my $res;
653		739
654	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
655	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
656	and return $res;	742	and return $res;
657	}	743	}
658		744
659	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
735	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
736	$self->update;	822	$self->update;
737	}	823	}
738		824
739	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
740	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
741	}	829	}
742		830
743	sub render_child {	831	sub render_child {
744	my ($self) = @_;	832	my ($self) = @_;
745		833
746	$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 {
747	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
748	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
749		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
750	$self->_render;	845	$self->_render;
751	};	846	};
752	}	847	}
753		848
754	sub _draw {	849	sub _draw {
755	my ($self) = @_;	850	my ($self) = @_;
756		851
757	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
758		853
759	my $tex = $self->{texture}	854	my $tex = $self->{texture}
760	or return;	855	or return;
761		856
762	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
785	}	880	}
786		881
787	sub size_request {	882	sub size_request {
788	my ($self) = @_;	883	my ($self) = @_;
789		884
790	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791		886
792	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
793	}	891	}
794		892
795	sub size_allocate {	893	sub size_allocate {
796	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
797		895
		896	my $child = $self->child;
		897
798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800		900
801	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
802	$self->update;	902	$self->update;
803	}	903	}
804		904
…		…
840	}	940	}
841		941
842	sub _render {	942	sub _render {
843	my ($self) = @_;	943	my ($self) = @_;
844		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
845	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846		949
847	$self->SUPER::_render;	950	$self->SUPER::_render;
848	}	951	}
849		952
…		…
857	my $class = shift;	960	my $class = shift;
858		961
859	my $self;	962	my $self;
860		963
861	my $slider = new CFClient::UI::Slider	964	my $slider = new CFClient::UI::Slider
862	vertical => 1,	965	vertical => 1,
863	range => [0, 0, 1, 0.01], # HACK fix	966	range => [0, 0, 1, 0.01], # HACK fix
864	connect_changed => sub {	967	on_changed => sub {
865	$self->{vp}->set_offset (0, $_[1]);	968	$self->{vp}->set_offset (0, $_[1]);
866	},	969	},
867	;	970	;
868		971
869	$self = $class->SUPER::new (	972	$self = $class->SUPER::new (
…		…
947		1050
948	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
949		1052
950	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
951		1054
952	my @tex =	1055	my $bg =
		1056	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1057	mipmap => 1, wrap => 1;
		1058
		1059	my @border =
953	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955		1062
956	sub new {	1063	sub new {
957	my $class = shift;	1064	my ($class, %arg) = @_;
958		1065
959	# TODO: user_x, user_y, overwrite moveto?	1066	my $title = delete $arg{title};
960		1067
961	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
962	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
963	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
964	border => 0.6,	1071	border => 0.6,
965	is_toplevel => 1,
966	can_events => 1,	1072	can_events => 1,
967	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
968	);	1076	);
969		1077
970	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
971	align => 0,	1079	align => 0,
972	valign => 1,	1080	valign => 1,
973	text => $self->{title},	1081	text => $title,
974	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
975		1084
976	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
977	}	1093	}
978		1094
979	sub border {	1095	sub border {
980	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
981	}	1097	}
982		1098
983	sub size_request {	1099	sub size_request {
984	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
985		1104
986	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
987		1106
988	(	1107	(
989	$w + $self->border * 2,	1108	$w + $self->border * 2,
…		…
992	}	1111	}
993		1112
994	sub size_allocate {	1113	sub size_allocate {
995	my ($self, $w, $h) = @_;	1114	my ($self, $w, $h) = @_;
996		1115
		1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
		1121
		1122	my $border = $self->border;
		1123
997	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
998	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
999		1126
1000	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001	if $self->{title};
1002
1003	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
1004	}	1128	}
1005		1129
1006	sub button_down {	1130	sub button_down {
1007	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1008		1132
…		…
1024	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1025		1149
1026	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1027	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1028		1152
1029	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1155
		1156	$self->realloc;
1031	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032	$self->check_size;
1033	};	1158	};
1034		1159
1035	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1036	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1039	$self->{motion} = sub {	1164	$self->{motion} = sub {
1040	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1041		1166
1042	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1043		1168
1044	$self->move ($bx + $x - $ox, $by + $y - $oy);	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045	$self->update;
1046	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1047	}	1175	1
1048	}	1176	}
1049		1177
1050	sub button_up {	1178	sub button_up {
1051	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1052		1180
1053	delete $self->{motion};	1181	!!delete $self->{motion}
1054	}	1182	}
1055		1183
1056	sub mouse_motion {	1184	sub mouse_motion {
1057	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1058		1186
1059	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1060	}	1190	}
1061		1191
1062	sub _draw {	1192	sub _draw {
1063	my ($self) = @_;	1193	my ($self) = @_;
1064		1194
		1195	my $child = $self->{children}[0];
		1196
1065	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1066	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1067		1199
1068	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1069	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070		1202
1071	my $border = $self->border;	1203	my $border = $self->border;
1072		1204
1073	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1074	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1075	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078		1210
1079	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1081		1213
1082	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1083	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1084	my $rep_y = $ch / $bg->{h};	1217	$bg->{t} = $ch / $bg->{h};
1085
1086	glColor @{ $self->{bg} };
1087
1088	$bg->{s} = $rep_x;
1089	$bg->{t} = $rep_y;
1090	$bg->{wrap_mode} = 1;
1091	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092	}	1219	}
1093		1220
1094	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1095		1222
1096	$self->{title}->draw if $self->{title};
1097
1098	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1099	}	1229	}
1100		1230
1101	#############################################################################	1231	#############################################################################
1102		1232
1103	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1125	my ($self, $x, $y, $child) = @_;	1255	my ($self, $x, $y, $child) = @_;
1126		1256
1127	$child->set_parent ($self);	1257	$child->set_parent ($self);
1128	$self->{children}[$y][$x] = $child;	1258	$self->{children}[$y][$x] = $child;
1129		1259
1130	$self->check_size (1);	1260	$self->realloc;
1131	}	1261	}
1132		1262
1133	# TODO: move to container class maybe? send children a signal on removal?	1263	# TODO: move to container class maybe? send children a signal on removal?
1134	sub clear {	1264	sub clear {
1135	my ($self) = @_;	1265	my ($self) = @_;
…		…
1140	for (@children) {	1270	for (@children) {
1141	delete $_->{parent};	1271	delete $_->{parent};
1142	$_->hide;	1272	$_->hide;
1143	}	1273	}
1144		1274
1145	$self->check_size (1);	1275	$self->realloc;
1146	$self->update;
1147	}	1276	}
1148		1277
1149	sub get_wh {	1278	sub get_wh {
1150	my ($self) = @_;	1279	my ($self) = @_;
1151		1280
…		…
1247	}	1376	}
1248	}	1377	}
1249		1378
1250	#############################################################################	1379	#############################################################################
1251		1380
1252	package CFClient::UI::HBox;	1381	package CFClient::UI::Box;
1253
1254	# TODO: wrap into common Box base class
1255		1382
1256	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Container::;
1257		1384
1258	sub size_request {	1385	sub size_request {
1259	my ($self) = @_;	1386	my ($self) = @_;
1260		1387
1261	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$self->{vertical}
1262		1389	? (
1263	(	1390	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1264	(List::Util::sum map $_->[0], @alloc),	1391	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265	(List::Util::max map $_->[1], @alloc),	1392	)
1266	)	1393	: (
		1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1396	)
1267	}	1397	}
1268		1398
1269	sub size_allocate {	1399	sub size_allocate {
1270	my ($self, $w, $h) = @_;	1400	my ($self, $w, $h) = @_;
1271		1401
1272	($h, $w) = ($w, $h);	1402	my $space = $self->{vertical} ? $h : $w;
1273
1274	my $children = $self->{children};	1403	my $children = $self->{children};
1275		1404
1276	my @h = map $_->{req_w}, @$children;	1405	my @req;
1277		1406
1278	my $req_h = List::Util::sum @h;	1407	if ($self->{homogeneous}) {
1279		1408	@req = ($space / (@$children || 1)) x @$children;
1280	if ($req_h > $h) {
1281	# ah well, not enough space
1282	$_ *= $h / $req_h for @h;
1283	} else {	1409	} else {
		1410	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1411	my $req = List::Util::sum @req;
		1412
		1413	if ($req > $space) {
		1414	# ah well, not enough space
		1415	$_ *= $space / $req for @req;
		1416	} else {
1284	my $exp = List::Util::sum map $_->{expand}, @$children;	1417	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285	$exp ||= 1;
1286		1418
		1419	$space = ($space - $req) / $expand; # remaining space to give away
		1420
		1421	$req[$_] += $space * $children->[$_]{expand}
1287	for (0 .. $#$children) {	1422	for 0 .. $#$children;
1288	my $child = $children->[$_];
1289
1290	my $alloc_h = $h[$_];
1291	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292	$h[$_] = $alloc_h;
1293	}	1423	}
1294	}	1424	}
1295		1425
1296	CFClient::UI::harmonize \@h;	1426	CFClient::UI::harmonize \@req;
1297		1427
1298	my $y = 0;	1428	my $pos = 0;
1299	for (0 .. $#$children) {	1429	for (0 .. $#$children) {
1300	my $child = $children->[$_];
1301	my $h = $h[$_];	1430	my $alloc = $req[$_];
1302	$child->configure ($y, 0, $h, $w);	1431	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303		1432
1304	$y += $h;	1433	$pos += $alloc;
1305	}	1434	}
1306		1435
1307	1	1436	1
1308	}	1437	}
1309		1438
1310	#############################################################################	1439	#############################################################################
1311		1440
		1441	package CFClient::UI::HBox;
		1442
		1443	our @ISA = CFClient::UI::Box::;
		1444
		1445	sub new {
		1446	my $class = shift;
		1447
		1448	$class->SUPER::new (
		1449	vertical => 0,
		1450	@_,
		1451	)
		1452	}
		1453
		1454	#############################################################################
		1455
1312	package CFClient::UI::VBox;	1456	package CFClient::UI::VBox;
1313		1457
1314	# TODO: wrap into common Box base class
1315
1316	our @ISA = CFClient::UI::Container::;	1458	our @ISA = CFClient::UI::Box::;
1317		1459
1318	sub size_request {	1460	sub new {
1319	my ($self) = @_;	1461	my $class = shift;
1320		1462
1321	my @alloc = map [$_->size_request], @{$self->{children}};	1463	$class->SUPER::new (
1322		1464	vertical => 1,
1323	(	1465	@_,
1324	(List::Util::max map $_->[0], @alloc),
1325	(List::Util::sum map $_->[1], @alloc),
1326	)	1466	)
1327	}
1328
1329	sub size_allocate {
1330	my ($self, $w, $h) = @_;
1331
1332	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334	my $children = $self->{children};
1335
1336	my @h = map $_->{req_h}, @$children;
1337
1338	my $req_h = List::Util::sum @h;
1339
1340	if ($req_h > $h) {
1341	# ah well, not enough space
1342	$_ *= $h / $req_h for @h;
1343	} else {
1344	my $exp = List::Util::sum map $_->{expand}, @$children;
1345	$exp ||= 1;
1346
1347	for (0 .. $#$children) {
1348	my $child = $children->[$_];
1349
1350	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351	}
1352	}
1353
1354	CFClient::UI::harmonize \@h;
1355
1356	my $y = 0;
1357	for (0 .. $#$children) {
1358	my $child = $children->[$_];
1359	my $h = $h[$_];
1360	$child->configure (0, $y, $w, $h);
1361
1362	$y += $h;
1363	}
1364
1365	1
1366	}	1467	}
1367		1468
1368	#############################################################################	1469	#############################################################################
1369		1470
1370	package CFClient::UI::Label;	1471	package CFClient::UI::Label;
…		…
1387	ellipsise => 3, # end	1488	ellipsise => 3, # end
1388	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1389	fontsize => 1,	1490	fontsize => 1,
1390	align => -1,	1491	align => -1,
1391	valign => -1,	1492	valign => -1,
1392	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1393	can_events => 0,	1495	can_events => 0,
1394	%arg	1496	%arg
1395	);	1497	);
1396		1498
1397	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1433	$self->{text} = "T$text";	1535	$self->{text} = "T$text";
1434		1536
1435	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436	$self->{layout}->set_text ($text);	1538	$self->{layout}->set_text ($text);
1437		1539
		1540	$self->realloc;
1438	$self->update;	1541	$self->update;
1439	$self->check_size;
1440	}	1542	}
1441		1543
1442	sub set_markup {	1544	sub set_markup {
1443	my ($self, $markup) = @_;	1545	my ($self, $markup) = @_;
1444		1546
…		…
1448	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449		1551
1450	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1552	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451	$self->{layout}->set_markup ($markup);	1553	$self->{layout}->set_markup ($markup);
1452		1554
		1555	$self->realloc;
1453	$self->update;	1556	$self->update;
1454	$self->check_size;
1455	}	1557	}
1456		1558
1457	sub size_request {	1559	sub size_request {
1458	my ($self) = @_;	1560	my ($self) = @_;
1459		1561
…		…
1473		1575
1474	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1475	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1476	}	1578	}
1477		1579
1478	(	1580	($w, $h)
1479	$w + $self->{padding} * 2,
1480	$h + $self->{padding} * 2,
1481	)
1482	}	1581	}
1483		1582
1484	sub size_allocate {	1583	sub size_allocate {
1485	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1486		1585
		1586	delete $self->{ox};
		1587
1487	delete $self->{texture};	1588	delete $self->{texture}
		1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488	}	1590	}
1489		1591
1490	sub set_fontsize {	1592	sub set_fontsize {
1491	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1492		1594
1493	$self->{fontsize} = $fontsize;	1595	$self->{fontsize} = $fontsize;
1494	delete $self->{texture};	1596	delete $self->{texture};
1495		1597
1496	$self->update;	1598	$self->realloc;
1497	$self->check_size;
1498	}	1599	}
1499		1600
1500	sub _draw {	1601	sub _draw {
1501	my ($self) = @_;	1602	my ($self) = @_;
1502		1603
…		…
1508	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1509	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512		1613
1513	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1514		1616
		1617	unless (exists $self->{ox}) {
1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1518		1621
1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1522
1523	$tex
1524	};	1625	};
1525		1626
1526	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528		1629
…		…
1582	sub set_text {	1683	sub set_text {
1583	my ($self, $text) = @_;	1684	my ($self, $text) = @_;
1584		1685
1585	$self->{cursor} = length $text;	1686	$self->{cursor} = length $text;
1586	$self->_set_text ($text);	1687	$self->_set_text ($text);
1587	$self->update;	1688
1588	$self->check_size;	1689	$self->realloc;
1589	}	1690	}
1590		1691
1591	sub get_text {	1692	sub get_text {
1592	$_[0]{text}	1693	$_[0]{text}
1593	}	1694	}
…		…
1623	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1624	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1625	$self->_emit ('escape');	1726	$self->_emit ('escape');
1626	} elsif ($uni) {	1727	} elsif ($uni) {
1627	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1628	}	1731	}
1629		1732
1630	$self->_set_text ($text);	1733	$self->_set_text ($text);
1631	$self->update;	1734
1632	$self->check_size;	1735	$self->realloc;
		1736
		1737	1
1633	}	1738	}
1634		1739
1635	sub focus_in {	1740	sub focus_in {
1636	my ($self) = @_;	1741	my ($self) = @_;
1637		1742
…		…
1652	utf8::encode $text;	1757	utf8::encode $text;
1653	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1654		1759
1655	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1656	$self->update;	1761	$self->update;
		1762
		1763	1
1657	}	1764	}
1658		1765
1659	sub mouse_motion {	1766	sub mouse_motion {
1660	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1661	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1662	}	1771	}
1663		1772
1664	sub _draw {	1773	sub _draw {
1665	my ($self) = @_;	1774	my ($self) = @_;
1666		1775
…		…
1743	} else {	1852	} else {
1744	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1745	}	1854	}
1746		1855
1747	} else {	1856	} else {
1748	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1749	}	1860	1
1750
1751	}	1861	}
1752		1862
1753	#############################################################################	1863	#############################################################################
1754		1864
1755	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1764		1874
1765	sub new {	1875	sub new {
1766	my $class = shift;	1876	my $class = shift;
1767		1877
1768	$class->SUPER::new (	1878	$class->SUPER::new (
1769	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1770	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1771	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1772	can_hover => 1,	1883	can_hover => 1,
1773	align => 0,	1884	align => 0,
1774	valign => 0,	1885	valign => 0,
…		…
1783	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1784		1895
1785	$self->emit ("activate")	1896	$self->emit ("activate")
1786	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1787	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1788	}	1901	}
1789		1902
1790	sub _draw {	1903	sub _draw {
1791	my ($self) = @_;	1904	my ($self) = @_;
1792		1905
…		…
1821		1934
1822	sub new {	1935	sub new {
1823	my $class = shift;	1936	my $class = shift;
1824		1937
1825	$class->SUPER::new (	1938	$class->SUPER::new (
1826	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1827	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1828	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1829	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1830	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1831	state => 0,	1945	state => 0,
…		…
1835	}	1949	}
1836		1950
1837	sub size_request {	1951	sub size_request {
1838	my ($self) = @_;	1952	my ($self) = @_;
1839		1953
1840	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1841	}	1955	}
1842		1956
1843	sub button_down {	1957	sub button_down {
1844	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1845		1959
1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1849	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1850	}	1968	1
1851	}	1969	}
1852		1970
1853	sub _draw {	1971	sub _draw {
1854	my ($self) = @_;	1972	my ($self) = @_;
1855		1973
1856	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1857		1975
1858	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859		1977
1860	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861		1981
1862	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863		1983
1864	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1865		1985
…		…
2130	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2131	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2132	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2133	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2134	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2135	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2136	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2137	vertical => 0,	2257	vertical => 0,
2138	can_hover => 1,	2258	can_hover => 1,
2139	inner_pad => 0.02,	2259	inner_pad => 0.02,
2140	@_	2260	@_
2141	);	2261	);
…		…
2144	$self->update;	2264	$self->update;
2145		2265
2146	$self	2266	$self
2147	}	2267	}
2148		2268
		2269	sub changed { }
		2270
2149	sub set_range {	2271	sub set_range {
2150	my ($self, $range) = @_;	2272	my ($self, $range) = @_;
2151		2273
2152	($range, $self->{range}) = ($self->{range}, $range);	2274	($range, $self->{range}) = ($self->{range}, $range);
2153		2275
…		…
2179	}	2301	}
2180		2302
2181	sub size_request {	2303	sub size_request {
2182	my ($self) = @_;	2304	my ($self) = @_;
2183		2305
2184	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2185	my $h = $self->{req_h};
2186
2187	$self->{vertical} ? ($h, $w) : ($w, $h)
2188	}	2307	}
2189		2308
2190	sub button_down {	2309	sub button_down {
2191	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2192		2311
2193	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2194		2313
2195	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196		2315
2197	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2198	}	2317	}
2199		2318
2200	sub mouse_motion {	2319	sub mouse_motion {
2201	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2202		2321
…		…
2206	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2207		2326
2208	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209		2328
2210	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2211	}	2334	1
2212	}	2335	}
2213		2336
2214	sub update {	2337	sub update {
2215	my ($self) = @_;	2338	my ($self) = @_;
2216		2339
…		…
2543		2666
2544	sub new {	2667	sub new {
2545	my $class = shift;	2668	my $class = shift;
2546		2669
2547	my $self = $class->SUPER::new (	2670	my $self = $class->SUPER::new (
2548	state => 0,	2671	state => 0,
2549	connect_activate => \&toggle_flopper,	2672	on_activate => \&toggle_flopper,
2550	@_	2673	@_
2551	);	2674	);
2552		2675
2553	if ($self->{state}) {
2554	$self->{state} = 0;
2555	$self->toggle_flopper;
2556	}
2557
2558	$self	2676	$self
2559	}	2677	}
2560		2678
2561	sub toggle_flopper {	2679	sub toggle_flopper {
2562	my ($self) = @_;	2680	my ($self) = @_;
2563		2681
2564	# TODO: use animation	2682	$self->{other}->toggle_visibility;
2565	if ($self->{state} = !$self->{state}) {
2566	$CFClient::UI::ROOT->add ($self->{other});
2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2568	$self->_emit ("open");
2569	} else {
2570	$CFClient::UI::ROOT->remove ($self->{other});
2571	$self->_emit ("close");
2572	}
2573
2574	$self->_emit (changed => $self->{state});
2575	}	2683	}
2576		2684
2577	#############################################################################	2685	#############################################################################
2578		2686
2579	package CFClient::UI::Tooltip;	2687	package CFClient::UI::Tooltip;
…		…
2592	}	2700	}
2593		2701
2594	sub set_tooltip_from {	2702	sub set_tooltip_from {
2595	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2596		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2597	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2598	markup => $widget->{tooltip},	2715	markup => $tooltip,
2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600	fontsize => 0.8,	2717	fontsize => 0.8,
2601	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2602	ellipsise => 0,	2719	ellipsise => 0,
2603	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2614		2731
2615	sub size_allocate {	2732	sub size_allocate {
2616	my ($self, $w, $h) = @_;	2733	my ($self, $w, $h) = @_;
2617		2734
2618	$self->SUPER::size_allocate ($w - 4, $h - 4);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2736	}
		2737
		2738	sub visibility_change {
		2739	my ($self, $visible) = @_;
		2740
		2741	return unless $visible;
		2742
		2743	$self->{root}->on_post_alloc ("move_$self" => sub {
		2744	my $widget = $self->{owner}
		2745	or return;
		2746
		2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2748
		2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2750	if $x + $self->{w} > $::WIDTH;
		2751
		2752	$self->move_abs ($x, $y);
		2753	});
2619	}	2754	}
2620		2755
2621	sub _draw {	2756	sub _draw {
2622	my ($self) = @_;	2757	my ($self) = @_;
2623		2758
…		…
2640	glVertex $w, $h;	2775	glVertex $w, $h;
2641	glVertex $w, 0;	2776	glVertex $w, 0;
2642	glEnd;	2777	glEnd;
2643		2778
2644	glTranslate 2 - 0.375, 2 - 0.375;	2779	glTranslate 2 - 0.375, 2 - 0.375;
		2780
2645	$self->SUPER::_draw;	2781	$self->SUPER::_draw;
2646	}	2782	}
2647		2783
2648	#############################################################################	2784	#############################################################################
2649		2785
…		…
2725	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2726	}	2862	}
2727		2863
2728	#############################################################################	2864	#############################################################################
2729		2865
2730	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2731		2867
2732	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2733		2869
2734	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2735	my $class = shift;
2736
2737	my $self = $class->SUPER::new (
2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739	@_,
2740	);
2741
2742	$self
2743	}
2744
2745	sub set_items {
2746	my ($self, $items) = @_;
2747
2748	$self->{scrolled}->clear;
2749	return unless $items;
2750
2751	my @items = sort {
2752	($a->{type} <=> $b->{type})
2753	or ($a->{name} cmp $b->{name})
2754	} @$items;
2755
2756	$self->{real_items} = \@items;
2757
2758	my $row = 0;
2759	for my $item (@items) {
2760	CFClient::Item::update_widgets $item;
2761
2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766	$row++;
2767	}
2768	}
2769
2770	sub size_request {
2771	my ($self) = @_;
2772	($self->{req_w}, $self->{req_h});
2773	}
2774		2871
2775	#############################################################################	2872	#############################################################################
2776		2873
2777	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2778		2875
…		…
2819	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2820	$GRAB = $self;	2917	$GRAB = $self;
2821	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2822		2919
2823	$self->show;	2920	$self->show;
2824	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825	}	2922	}
2826		2923
2827	sub mouse_motion {	2924	sub mouse_motion {
2828	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2829		2926
2830	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2831	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2833	}	2932	}
2834		2933
2835	sub button_up {	2934	sub button_up {
2836	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2837		2936
…		…
2839	undef $GRAB;	2938	undef $GRAB;
2840	$self->hide;	2939	$self->hide;
2841		2940
2842	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2843	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2844	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2845	}	3054	}
2846		3055
2847	#############################################################################	3056	#############################################################################
2848		3057
2849	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2954	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2955	}	3164	}
2956		3165
2957	#############################################################################	3166	#############################################################################
2958		3167
2959	package CFClient::UI::Root;	3168	package CFClient::UI::Inventory;
2960		3169
2961	our @ISA = CFClient::UI::Container::;	3170	our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963	use CFClient::OpenGL;
2964		3171
2965	sub new {	3172	sub new {
2966	my $class = shift;	3173	my $class = shift;
2967		3174
2968	$class->SUPER::new (	3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
2969	@_,	3418	@_,
2970	)	3419	)
2971	}	3420	}
2972		3421
2973	sub configure {	3422	# XXX: Do sorting? Argl...
2974	my ($self, $x, $y, $w, $h) = @_;	3423	sub add_spell {
2975
2976	$self->{w} = $w;
2977	$self->{h} = $h;
2978	}
2979
2980	sub check_size {
2981	my ($self) = @_;	3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
2982		3426
2983	$self->size_allocate ($self->{w}, $self->{h})	3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2984	if $self->{w};	3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
		3464	package CFClient::UI::Root;
		3465
		3466	our @ISA = CFClient::UI::Container::;
		3467
		3468	use CFClient::OpenGL;
		3469
		3470	sub new {
		3471	my $class = shift;
		3472
		3473	my $self = $class->SUPER::new (
		3474	visible => 1,
		3475	@_,
		3476	);
		3477
		3478	Scalar::Util::weaken ($self->{root} = $self);
		3479
		3480	$self
2985	}	3481	}
2986		3482
2987	sub size_request {	3483	sub size_request {
2988	my ($self) = @_;	3484	my ($self) = @_;
2989		3485
2990	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
		3487	}
		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
2991	}	3501	}
2992		3502
2993	sub size_allocate {	3503	sub size_allocate {
2994	my ($self, $w, $h) = @_;	3504	my ($self, $w, $h) = @_;
2995		3505
2996	for my $child ($self->children) {	3506	for my $child ($self->children) {
2997	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998		3508
2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
3000	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3001		3511
3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3003	if exists $child->{req_y};	3513	$Y = _to_pixel $Y, $H, $self->{h};
3004
3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007		3514
3008	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3009	}	3516	}
3010	}	3517	}
3011		3518
…		…
3022	}	3529	}
3023		3530
3024	sub update {	3531	sub update {
3025	my ($self) = @_;	3532	my ($self) = @_;
3026		3533
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3534	$::WANT_REFRESH++;
3029	}	3535	}
3030		3536
3031	sub add {	3537	sub add {
3032	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3033		3539
3034	for (my @widgets = @children; my $w = pop @widgets; ) {
3035	push @widgets, $w->children;
3036	$w->{root} = $self;
3037	$w->{visible} = 1;
3038	}
3039
3040	for my $child (@children) {
3041	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3042		3541	for @children;
3043	# integerise window positions
3044	$child->{x} = int $child->{x};
3045	$child->{y} = int $child->{y};
3046	}
3047		3542
3048	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3049	}	3544	}
3050		3545
3051	sub remove {	3546	sub remove {
3052	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3053		3548
3054	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3055		3553
3056	while (@children) {	3554	while (@children) {
3057	my $w = pop @children;	3555	my $w = pop @children;
3058	push @children, $w->children;	3556	push @children, $w->children;
3059	$w->set_invisible;	3557	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3576	while ($self->{refresh_hook}) {
3079	$_->()	3577	$_->()
3080	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3081	}	3579	}
3082		3580
3083	if ($self->{check_size}) {	3581	if ($self->{realloc}) {
3084	my @queue = ([], []);	3582	my %queue;
		3583	my @queue;
		3584	my $widget;
3085		3585
3086	for (;;) {	3586	outer:
3087	if ($self->{check_size}) {	3587	while () {
3088	# heuristic: check containers last	3588	if (my $realloc = delete $self->{realloc}) {
3089	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3589	for $widget (values %$realloc) {
3090	for values %{delete $self->{check_size}}	3590	$widget->{visible} or next; # do not resize invisible widgets
		3591
		3592	$queue{$widget+0}++ and next; # duplicates are common
		3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3091	}	3596	}
3092		3597
3093	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3598	while () {
		3599	@queue or last outer;
3094		3600
3095	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3601	$widget = pop @{ $queue[-1] || [] }
3096	? @$widget{qw(user_w user_h)}	3602	and last;
3097	: $widget->size_request;
3098
3099	if (delete $widget->{force_alloc}
3100	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
3103	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3104	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3105		3621
3106	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3622	$self->{size_alloc}{$widget+0} = $widget;
3107		3623
3108	$widget->{parent}->check_size
3109	if $widget->{parent};	3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
3110	}	3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3111	}	3634	}
3112	}	3635	}
3113		3636
3114	while ($self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3115	for (values %{delete $self->{size_alloc}}) {	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3116	my ($widget, $w, $h) = @$_;	3639	values %$size_alloc;
		3640
		3641	while () {
		3642	my $widget = pop @queue || last;
		3643
		3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117		3645
3118	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3119	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3120		3648
		3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3121	$widget->{w} = $w;	3656	$widget->{w} = $w;
3122	$widget->{h} = $h;	3657	$widget->{h} = $h;
		3658
3123	$widget->emit (size_allocate => $w, $h);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3124	}	3661	}
3125	}	3662	}
3126		3663
3127	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3128	$_->()	3665	$_->()
3129	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3130	}	3667	}
		3668
3131		3669
3132	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3135		3673
…		…
3137	glLoadIdentity;	3675	glLoadIdentity;
3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3140	glLoadIdentity;	3678	glLoadIdentity;
3141		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3142	$self->_draw;	3687	$self->_draw;
3143	}	3688	}
3144		3689
3145	#############################################################################	3690	#############################################################################
3146		3691

Diff Legend

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