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.238 by root, Thu May 25 21:48:22 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	$self->{root} = $parent->{root};
464	$self->{visible} = $parent->{visible};
465
466	# TODO: req_w _does_change after ->reconfigure
467	$self->check_size
468	unless exists $self->{req_w};
469
470	$self->show;
471	}
472
473	sub check_size {
474	my ($self, $forced) = @_;
475
476	$self->{force_alloc} = 1 if $forced;
477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
478	}
479
480	sub update {
481	my ($self) = @_;
482
483	$self->{parent}->update
484	if $self->{parent};
485	}
486
487	sub connect {
488	my ($self, $signal, $cb) = @_;
489
490	push @{ $self->{signal_cb}{$signal} }, $cb;
491	}
492
493	sub _emit {
494	my ($self, $signal, @args) = @_;
495
496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497	}
498
499	sub emit {
500	my ($self, $signal, @args) = @_;
501
502	$self->_emit ($signal, @args)
503	|| $self->$signal (@args);
504	}
505
506	sub DESTROY {	592	sub DESTROY {
507	my ($self) = @_;	593	my ($self) = @_;
508		594
509	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
510	#$self->deactivate;	596	#$self->deactivate;
…		…
566	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
567	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
568	}	654	}
569		655
570	sub size_request {	656	sub size_request {
571	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
572	}	660	}
573		661
574	sub draw { }	662	sub draw { }
575		663
576	#############################################################################	664	#############################################################################
…		…
580	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
581		669
582	sub new {	670	sub new {
583	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
584		672
585	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
586		674
587	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
588	children => [],	676	children => [],
589	can_events => 0,	677	can_events => 0,
590	%arg,	678	%arg,
591	);	679	);
		680
592	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
593		683
594	$self	684	$self
595	}	685	}
596		686
597	sub add {	687	sub add {
…		…
605	$self->{children} = [	695	$self->{children} = [
606	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
607	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
608	];	698	];
609		699
610	$self->check_size (1);	700	$self->realloc;
611	$self->update;
612	}	701	}
613		702
614	sub children {	703	sub children {
615	@{ $_[0]{children} }	704	@{ $_[0]{children} }
616	}	705	}
…		…
621	delete $child->{parent};	710	delete $child->{parent};
622	$child->hide;	711	$child->hide;
623		712
624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625		714
626	$self->check_size (1);	715	$self->realloc;
627	$self->update;
628	}	716	}
629		717
630	sub clear {	718	sub clear {
631	my ($self) = @_;	719	my ($self) = @_;
632		720
…		…
636	for (@$children) {	724	for (@$children) {
637	delete $_->{parent};	725	delete $_->{parent};
638	$_->hide;	726	$_->hide;
639	}	727	}
640		728
641	$self->check_size;	729	$self->realloc;
642	$self->update;
643	}	730	}
644		731
645	sub find_widget {	732	sub find_widget {
646	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
647		734
648	$x -= $self->{x};	735	$x -= $self->{x};
649	$y -= $self->{y};	736	$y -= $self->{y};
650		737
651	my $res;	738	my $res;
652		739
653	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
654	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
655	and return $res;	742	and return $res;
656	}	743	}
657		744
658	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
734	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
735	$self->update;	822	$self->update;
736	}	823	}
737		824
738	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
739	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
740	}	829	}
741		830
742	sub render_child {	831	sub render_child {
743	my ($self) = @_;	832	my ($self) = @_;
744		833
745	$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 {
746	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
747	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
748		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
749	$self->_render;	845	$self->_render;
750	};	846	};
751	}	847	}
752		848
753	sub _draw {	849	sub _draw {
754	my ($self) = @_;	850	my ($self) = @_;
755		851
756	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
757		853
758	my $tex = $self->{texture}	854	my $tex = $self->{texture}
759	or return;	855	or return;
760		856
761	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
784	}	880	}
785		881
786	sub size_request {	882	sub size_request {
787	my ($self) = @_;	883	my ($self) = @_;
788		884
789	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790		886
791	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
792	}	891	}
793		892
794	sub size_allocate {	893	sub size_allocate {
795	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
796		895
		896	my $child = $self->child;
		897
797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799		900
800	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
801	$self->update;	902	$self->update;
802	}	903	}
803		904
…		…
839	}	940	}
840		941
841	sub _render {	942	sub _render {
842	my ($self) = @_;	943	my ($self) = @_;
843		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
844	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845		949
846	$self->SUPER::_render;	950	$self->SUPER::_render;
847	}	951	}
848		952
…		…
851	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
852		956
853	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
854		958
855	sub new {	959	sub new {
856	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
857		963
858	my $self;	964	my $self;
859		965
860	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
861	vertical => 1,	967	vertical => 1,
862	range => [0, 0, 1, 0.01], # HACK fix	968	range => [0, 0, 1, 0.01], # HACK fix
863	connect_changed => sub {	969	on_changed => sub {
864	$self->{vp}->set_offset (0, $_[1]);	970	$self->{vp}->set_offset (0, $_[1]);
865	},	971	},
866	;	972	;
867		973
868	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
869	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
870	slider => $slider,	976	slider => $slider,
871	@_,	977	%arg,
872	);	978	);
873		979
874	$self->{vp}->add ($self->{scrolled});
875	$self->add ($self->{vp});
876	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
877		982
878	$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]);
879	}	1000	}
880		1001
881	sub size_allocate {	1002	sub size_allocate {
882	my ($self, $w, $h) = @_;	1003	my ($self, $w, $h) = @_;
883		1004
…		…
936		1057
937	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
938		1059
939	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
940		1061
941	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 =
942	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943	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);
944		1069
945	sub new {	1070	sub new {
946	my $class = shift;	1071	my ($class, %arg) = @_;
947		1072
948	# TODO: user_x, user_y, overwrite moveto?	1073	my $title = delete $arg{title};
949		1074
950	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
951	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
952	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
953	border => 0.6,	1078	border => 0.6,
954	is_toplevel => 1,
955	can_events => 1,	1079	can_events => 1,
956	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
957	);	1083	);
958		1084
959	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
960	align => 0,	1086	align => 0,
961	valign => 1,	1087	valign => 1,
962	text => $self->{title},	1088	text => $title,
963	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
964		1091
965	$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};
966	}	1100	}
967		1101
968	sub border {	1102	sub border {
969	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
970	}	1104	}
971		1105
972	sub size_request {	1106	sub size_request {
973	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
974		1111
975	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
976		1113
977	(	1114	(
978	$w + $self->border * 2,	1115	$w + $self->border * 2,
…		…
981	}	1118	}
982		1119
983	sub size_allocate {	1120	sub size_allocate {
984	my ($self, $w, $h) = @_;	1121	my ($self, $w, $h) = @_;
985		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
986	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
987	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
988		1133
989	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990	if $self->{title};
991
992	$self->child->configure ($self->border, $self->border, $w, $h);	1134	$self->child->configure ($border, $border, $w, $h);
993	}	1135	}
994		1136
995	sub button_down {	1137	sub button_down {
996	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
997		1139
…		…
1013	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
1014		1156
1015	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
1016	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
1017		1159
1018	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1162
		1163	$self->realloc;
1020	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021	$self->check_size;
1022	};	1165	};
1023		1166
1024	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
1025	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1028	$self->{motion} = sub {	1171	$self->{motion} = sub {
1029	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
1030		1173
1031	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1032		1175
1033	$self->move ($bx + $x - $ox, $by + $y - $oy);	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034	$self->update;
1035	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1036	}	1182	1
1037	}	1183	}
1038		1184
1039	sub button_up {	1185	sub button_up {
1040	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1041		1187
1042	delete $self->{motion};	1188	!!delete $self->{motion}
1043	}	1189	}
1044		1190
1045	sub mouse_motion {	1191	sub mouse_motion {
1046	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1047		1193
1048	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1049	}	1197	}
1050		1198
1051	sub _draw {	1199	sub _draw {
1052	my ($self) = @_;	1200	my ($self) = @_;
1053		1201
		1202	my $child = $self->{children}[0];
		1203
1054	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1055	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1056		1206
1057	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1058	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059		1209
1060	my $border = $self->border;	1210	my $border = $self->border;
1061		1211
1062	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1063	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1064	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067		1217
1068	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1070		1220
1071	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1072	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1073	my $rep_y = $ch / $bg->{h};	1224	$bg->{t} = $ch / $bg->{h};
1074
1075	glColor @{ $self->{bg} };
1076
1077	$bg->{s} = $rep_x;
1078	$bg->{t} = $rep_y;
1079	$bg->{wrap_mode} = 1;
1080	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081	}	1226	}
1082		1227
1083	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1084		1229
1085	$self->{title}->draw if $self->{title};
1086
1087	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1088	}	1236	}
1089		1237
1090	#############################################################################	1238	#############################################################################
1091		1239
1092	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1114	my ($self, $x, $y, $child) = @_;	1262	my ($self, $x, $y, $child) = @_;
1115		1263
1116	$child->set_parent ($self);	1264	$child->set_parent ($self);
1117	$self->{children}[$y][$x] = $child;	1265	$self->{children}[$y][$x] = $child;
1118		1266
1119	$self->check_size (1);	1267	$self->realloc;
1120	}	1268	}
1121		1269
1122	# TODO: move to container class maybe? send children a signal on removal?	1270	# TODO: move to container class maybe? send children a signal on removal?
1123	sub clear {	1271	sub clear {
1124	my ($self) = @_;	1272	my ($self) = @_;
…		…
1129	for (@children) {	1277	for (@children) {
1130	delete $_->{parent};	1278	delete $_->{parent};
1131	$_->hide;	1279	$_->hide;
1132	}	1280	}
1133		1281
1134	$self->check_size (1);	1282	$self->realloc;
1135	$self->update;
1136	}	1283	}
1137		1284
1138	sub get_wh {	1285	sub get_wh {
1139	my ($self) = @_;	1286	my ($self) = @_;
1140		1287
…		…
1236	}	1383	}
1237	}	1384	}
1238		1385
1239	#############################################################################	1386	#############################################################################
1240		1387
1241	package CFClient::UI::HBox;	1388	package CFClient::UI::Box;
1242
1243	# TODO: wrap into common Box base class
1244		1389
1245	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Container::;
1246		1391
1247	sub size_request {	1392	sub size_request {
1248	my ($self) = @_;	1393	my ($self) = @_;
1249		1394
1250	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$self->{vertical}
1251		1396	? (
1252	(	1397	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1253	(List::Util::sum map $_->[0], @alloc),	1398	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254	(List::Util::max map $_->[1], @alloc),	1399	)
1255	)	1400	: (
		1401	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1402	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1403	)
1256	}	1404	}
1257		1405
1258	sub size_allocate {	1406	sub size_allocate {
1259	my ($self, $w, $h) = @_;	1407	my ($self, $w, $h) = @_;
1260		1408
1261	($h, $w) = ($w, $h);	1409	my $space = $self->{vertical} ? $h : $w;
1262
1263	my $children = $self->{children};	1410	my $children = $self->{children};
1264		1411
1265	my @h = map $_->{req_w}, @$children;	1412	my @req;
1266		1413
1267	my $req_h = List::Util::sum @h;	1414	if ($self->{homogeneous}) {
1268		1415	@req = ($space / (@$children || 1)) x @$children;
1269	if ($req_h > $h) {
1270	# ah well, not enough space
1271	$_ *= $h / $req_h for @h;
1272	} 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 {
1273	my $exp = List::Util::sum map $_->{expand}, @$children;	1424	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274	$exp ||= 1;
1275		1425
		1426	$space = ($space - $req) / $expand; # remaining space to give away
		1427
		1428	$req[$_] += $space * $children->[$_]{expand}
1276	for (0 .. $#$children) {	1429	for 0 .. $#$children;
1277	my $child = $children->[$_];
1278
1279	my $alloc_h = $h[$_];
1280	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281	$h[$_] = $alloc_h;
1282	}	1430	}
1283	}	1431	}
1284		1432
1285	CFClient::UI::harmonize \@h;	1433	CFClient::UI::harmonize \@req;
1286		1434
1287	my $y = 0;	1435	my $pos = 0;
1288	for (0 .. $#$children) {	1436	for (0 .. $#$children) {
1289	my $child = $children->[$_];
1290	my $h = $h[$_];	1437	my $alloc = $req[$_];
1291	$child->configure ($y, 0, $h, $w);	1438	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292		1439
1293	$y += $h;	1440	$pos += $alloc;
1294	}	1441	}
1295		1442
1296	1	1443	1
1297	}	1444	}
1298		1445
1299	#############################################################################	1446	#############################################################################
1300		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
1301	package CFClient::UI::VBox;	1463	package CFClient::UI::VBox;
1302		1464
1303	# TODO: wrap into common Box base class
1304
1305	our @ISA = CFClient::UI::Container::;	1465	our @ISA = CFClient::UI::Box::;
1306		1466
1307	sub size_request {	1467	sub new {
1308	my ($self) = @_;	1468	my $class = shift;
1309		1469
1310	my @alloc = map [$_->size_request], @{$self->{children}};	1470	$class->SUPER::new (
1311		1471	vertical => 1,
1312	(	1472	@_,
1313	(List::Util::max map $_->[0], @alloc),
1314	(List::Util::sum map $_->[1], @alloc),
1315	)	1473	)
1316	}
1317
1318	sub size_allocate {
1319	my ($self, $w, $h) = @_;
1320
1321	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323	my $children = $self->{children};
1324
1325	my @h = map $_->{req_h}, @$children;
1326
1327	my $req_h = List::Util::sum @h;
1328
1329	if ($req_h > $h) {
1330	# ah well, not enough space
1331	$_ *= $h / $req_h for @h;
1332	} else {
1333	my $exp = List::Util::sum map $_->{expand}, @$children;
1334	$exp ||= 1;
1335
1336	for (0 .. $#$children) {
1337	my $child = $children->[$_];
1338
1339	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340	}
1341	}
1342
1343	CFClient::UI::harmonize \@h;
1344
1345	my $y = 0;
1346	for (0 .. $#$children) {
1347	my $child = $children->[$_];
1348	my $h = $h[$_];
1349	$child->configure (0, $y, $w, $h);
1350
1351	$y += $h;
1352	}
1353
1354	1
1355	}	1474	}
1356		1475
1357	#############################################################################	1476	#############################################################################
1358		1477
1359	package CFClient::UI::Label;	1478	package CFClient::UI::Label;
…		…
1376	ellipsise => 3, # end	1495	ellipsise => 3, # end
1377	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1378	fontsize => 1,	1497	fontsize => 1,
1379	align => -1,	1498	align => -1,
1380	valign => -1,	1499	valign => -1,
1381	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1382	can_events => 0,	1502	can_events => 0,
1383	%arg	1503	%arg
1384	);	1504	);
1385		1505
1386	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1422	$self->{text} = "T$text";	1542	$self->{text} = "T$text";
1423		1543
1424	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425	$self->{layout}->set_text ($text);	1545	$self->{layout}->set_text ($text);
1426		1546
		1547	$self->realloc;
1427	$self->update;	1548	$self->update;
1428	$self->check_size;
1429	}	1549	}
1430		1550
1431	sub set_markup {	1551	sub set_markup {
1432	my ($self, $markup) = @_;	1552	my ($self, $markup) = @_;
1433		1553
…		…
1437	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1557	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438		1558
1439	$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;
1440	$self->{layout}->set_markup ($markup);	1560	$self->{layout}->set_markup ($markup);
1441		1561
		1562	$self->realloc;
1442	$self->update;	1563	$self->update;
1443	$self->check_size;
1444	}	1564	}
1445		1565
1446	sub size_request {	1566	sub size_request {
1447	my ($self) = @_;	1567	my ($self) = @_;
1448		1568
…		…
1462		1582
1463	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1464	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1465	}	1585	}
1466		1586
1467	(	1587	($w, $h)
1468	$w + $self->{padding} * 2,
1469	$h + $self->{padding} * 2,
1470	)
1471	}	1588	}
1472		1589
1473	sub size_allocate {	1590	sub size_allocate {
1474	my ($self, $w, $h) = @_;	1591	my ($self, $w, $h) = @_;
1475		1592
		1593	delete $self->{ox};
		1594
1476	delete $self->{texture};	1595	delete $self->{texture}
		1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477	}	1597	}
1478		1598
1479	sub set_fontsize {	1599	sub set_fontsize {
1480	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1481		1601
1482	$self->{fontsize} = $fontsize;	1602	$self->{fontsize} = $fontsize;
1483	delete $self->{texture};	1603	delete $self->{texture};
1484		1604
1485	$self->update;	1605	$self->realloc;
1486	$self->check_size;
1487	}	1606	}
1488		1607
1489	sub _draw {	1608	sub _draw {
1490	my ($self) = @_;	1609	my ($self) = @_;
1491		1610
…		…
1497	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1498	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1499	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501		1620
1502	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1503		1623
		1624	unless (exists $self->{ox}) {
1504	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1507		1628
1508	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1511
1512	$tex
1513	};	1632	};
1514		1633
1515	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1516	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517		1636
…		…
1571	sub set_text {	1690	sub set_text {
1572	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1573		1692
1574	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1575	$self->_set_text ($text);	1694	$self->_set_text ($text);
1576	$self->update;	1695
1577	$self->check_size;	1696	$self->realloc;
1578	}	1697	}
1579		1698
1580	sub get_text {	1699	sub get_text {
1581	$_[0]{text}	1700	$_[0]{text}
1582	}	1701	}
…		…
1612	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1613	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1614	$self->_emit ('escape');	1733	$self->_emit ('escape');
1615	} elsif ($uni) {	1734	} elsif ($uni) {
1616	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1617	}	1738	}
1618		1739
1619	$self->_set_text ($text);	1740	$self->_set_text ($text);
1620	$self->update;	1741
1621	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1622	}	1745	}
1623		1746
1624	sub focus_in {	1747	sub focus_in {
1625	my ($self) = @_;	1748	my ($self) = @_;
1626		1749
…		…
1641	utf8::encode $text;	1764	utf8::encode $text;
1642	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1643		1766
1644	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1645	$self->update;	1768	$self->update;
		1769
		1770	1
1646	}	1771	}
1647		1772
1648	sub mouse_motion {	1773	sub mouse_motion {
1649	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1650	# 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
1651	}	1778	}
1652		1779
1653	sub _draw {	1780	sub _draw {
1654	my ($self) = @_;	1781	my ($self) = @_;
1655		1782
…		…
1732	} else {	1859	} else {
1733	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1734	}	1861	}
1735		1862
1736	} else {	1863	} else {
1737	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1738	}	1867	1
1739
1740	}	1868	}
1741		1869
1742	#############################################################################	1870	#############################################################################
1743		1871
1744	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1753		1881
1754	sub new {	1882	sub new {
1755	my $class = shift;	1883	my $class = shift;
1756		1884
1757	$class->SUPER::new (	1885	$class->SUPER::new (
1758	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1759	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1760	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1761	can_hover => 1,	1890	can_hover => 1,
1762	align => 0,	1891	align => 0,
1763	valign => 0,	1892	valign => 0,
…		…
1772	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1773		1902
1774	$self->emit ("activate")	1903	$self->emit ("activate")
1775	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1776	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1777	}	1908	}
1778		1909
1779	sub _draw {	1910	sub _draw {
1780	my ($self) = @_;	1911	my ($self) = @_;
1781		1912
…		…
1810		1941
1811	sub new {	1942	sub new {
1812	my $class = shift;	1943	my $class = shift;
1813		1944
1814	$class->SUPER::new (	1945	$class->SUPER::new (
1815	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1816	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1817	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1818	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1819	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1820	state => 0,	1952	state => 0,
…		…
1824	}	1956	}
1825		1957
1826	sub size_request {	1958	sub size_request {
1827	my ($self) = @_;	1959	my ($self) = @_;
1828		1960
1829	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1830	}	1962	}
1831		1963
1832	sub button_down {	1964	sub button_down {
1833	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1834		1966
1835	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1838	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1839	}	1975	1
1840	}	1976	}
1841		1977
1842	sub _draw {	1978	sub _draw {
1843	my ($self) = @_;	1979	my ($self) = @_;
1844		1980
1845	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1846		1982
1847	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848		1984
1849	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;
1850		1988
1851	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852		1990
1853	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1854		1992
…		…
2119	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2120	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2121	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2122	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2123	range => [0, 0, 100, 10, 0],	2261	range => [0, 0, 100, 10, 0],
2124	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2125	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2126	vertical => 0,	2264	vertical => 0,
2127	can_hover => 1,	2265	can_hover => 1,
2128	inner_pad => 0.02,	2266	inner_pad => 0.02,
2129	@_	2267	@_
2130	);	2268	);
…		…
2133	$self->update;	2271	$self->update;
2134		2272
2135	$self	2273	$self
2136	}	2274	}
2137		2275
		2276	sub changed { }
		2277
2138	sub set_range {	2278	sub set_range {
2139	my ($self, $range) = @_;	2279	my ($self, $range) = @_;
2140		2280
2141	$self->{range} = $range;	2281	($range, $self->{range}) = ($self->{range}, $range);
2142		2282
2143	$self->update;	2283	$self->update
		2284	if "@$range" ne "@{$self->{range}}";
2144	}	2285	}
2145		2286
2146	sub set_value {	2287	sub set_value {
2147	my ($self, $value) = @_;	2288	my ($self, $value) = @_;
2148		2289
…		…
2167	}	2308	}
2168		2309
2169	sub size_request {	2310	sub size_request {
2170	my ($self) = @_;	2311	my ($self) = @_;
2171		2312
2172	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2173	my $h = $self->{req_h};
2174
2175	$self->{vertical} ? ($h, $w) : ($w, $h)
2176	}	2314	}
2177		2315
2178	sub button_down {	2316	sub button_down {
2179	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2180		2318
2181	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2182		2320
2183	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184		2322
2185	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2186	}	2324	}
2187		2325
2188	sub mouse_motion {	2326	sub mouse_motion {
2189	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2190		2328
…		…
2194	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2195		2333
2196	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197		2335
2198	$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
2199	}	2341	1
2200	}	2342	}
2201		2343
2202	sub update {	2344	sub update {
2203	my ($self) = @_;	2345	my ($self) = @_;
2204		2346
…		…
2531		2673
2532	sub new {	2674	sub new {
2533	my $class = shift;	2675	my $class = shift;
2534		2676
2535	my $self = $class->SUPER::new (	2677	my $self = $class->SUPER::new (
2536	state => 0,	2678	state => 0,
2537	connect_activate => \&toggle_flopper,	2679	on_activate => \&toggle_flopper,
2538	@_	2680	@_
2539	);	2681	);
2540		2682
2541	if ($self->{state}) {
2542	$self->{state} = 0;
2543	$self->toggle_flopper;
2544	}
2545
2546	$self	2683	$self
2547	}	2684	}
2548		2685
2549	sub toggle_flopper {	2686	sub toggle_flopper {
2550	my ($self) = @_;	2687	my ($self) = @_;
2551		2688
2552	# TODO: use animation	2689	$self->{other}->toggle_visibility;
2553	if ($self->{state} = !$self->{state}) {
2554	$CFClient::UI::ROOT->add ($self->{other});
2555	$self->{other}->move ($self->coord2global (0, $self->{h}));
2556	$self->_emit ("open");
2557	} else {
2558	$CFClient::UI::ROOT->remove ($self->{other});
2559	$self->_emit ("close");
2560	}
2561
2562	$self->_emit (changed => $self->{state});
2563	}	2690	}
2564		2691
2565	#############################################################################	2692	#############################################################################
2566		2693
2567	package CFClient::UI::Tooltip;	2694	package CFClient::UI::Tooltip;
…		…
2580	}	2707	}
2581		2708
2582	sub set_tooltip_from {	2709	sub set_tooltip_from {
2583	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2584		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
2585	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2586	markup => $widget->{tooltip},	2722	markup => $tooltip,
2587	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588	fontsize => 0.8,	2724	fontsize => 0.8,
2589	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2590	ellipsise => 0,	2726	ellipsise => 0,
2591	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2602		2738
2603	sub size_allocate {	2739	sub size_allocate {
2604	my ($self, $w, $h) = @_;	2740	my ($self, $w, $h) = @_;
2605		2741
2606	$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	});
2607	}	2761	}
2608		2762
2609	sub _draw {	2763	sub _draw {
2610	my ($self) = @_;	2764	my ($self) = @_;
2611		2765
…		…
2628	glVertex $w, $h;	2782	glVertex $w, $h;
2629	glVertex $w, 0;	2783	glVertex $w, 0;
2630	glEnd;	2784	glEnd;
2631		2785
2632	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2633	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2634	}	2789	}
2635		2790
2636	#############################################################################	2791	#############################################################################
2637		2792
…		…
2713	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2714	}	2869	}
2715		2870
2716	#############################################################################	2871	#############################################################################
2717		2872
2718	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2719		2874
2720	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2721		2876
2722	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2723	my $class = shift;
2724
2725	my $self = $class->SUPER::new (
2726	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727	@_,
2728	);
2729
2730	$self
2731	}
2732
2733	sub set_items {
2734	my ($self, $items) = @_;
2735
2736	$self->{scrolled}->clear;
2737	return unless $items;
2738
2739	my @items = sort {
2740	($a->{type} <=> $b->{type})
2741	or ($a->{name} cmp $b->{name})
2742	} @$items;
2743
2744	$self->{real_items} = \@items;
2745
2746	my $row = 0;
2747	for my $item (@items) {
2748	CFClient::Item::update_widgets $item;
2749
2750	$self->{scrolled}->add (0, $row, $item->{face_widget});
2751	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2752	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754	$row++;
2755	}
2756
2757	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758	}
2759
2760	sub size_request {
2761	my ($self) = @_;
2762	($self->{req_w}, $self->{req_h});
2763	}
2764		2878
2765	#############################################################################	2879	#############################################################################
2766		2880
2767	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2768		2882
…		…
2809	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2810	$GRAB = $self;	2924	$GRAB = $self;
2811	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2812		2926
2813	$self->show;	2927	$self->show;
2814	$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);
2815	}	2929	}
2816		2930
2817	sub mouse_motion {	2931	sub mouse_motion {
2818	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2819		2933
2820	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2821	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2823	}	2939	}
2824		2940
2825	sub button_up {	2941	sub button_up {
2826	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2827		2943
…		…
2829	undef $GRAB;	2945	undef $GRAB;
2830	$self->hide;	2946	$self->hide;
2831		2947
2832	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2833	$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	);
2834	}	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});
2835	}	3063	}
2836		3064
2837	#############################################################################	3065	#############################################################################
2838		3066
2839	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2944	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2945	}	3173	}
2946		3174
2947	#############################################################################	3175	#############################################################################
2948		3176
2949	package CFClient::UI::Root;	3177	package CFClient::UI::Inventory;
2950		3178
2951	our @ISA = CFClient::UI::Container::;	3179	our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953	use CFClient::OpenGL;
2954		3180
2955	sub new {	3181	sub new {
2956	my $class = shift;	3182	my $class = shift;
2957		3183
2958	$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 => [],
2959	@_,	3426	@_,
2960	)	3427	)
2961	}	3428	}
2962		3429
2963	sub configure {	3430	# XXX: Do sorting? Argl...
2964	my ($self, $x, $y, $w, $h) = @_;	3431	sub add_spell {
2965
2966	$self->{w} = $w;
2967	$self->{h} = $h;
2968	}
2969
2970	sub check_size {
2971	my ($self) = @_;	3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
2972		3434
2973	$self->size_allocate ($self->{w}, $self->{h})	3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2974	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
2975	}	3489	}
2976		3490
2977	sub size_request {	3491	sub size_request {
2978	my ($self) = @_;	3492	my ($self) = @_;
2979		3493
2980	($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
2981	}	3509	}
2982		3510
2983	sub size_allocate {	3511	sub size_allocate {
2984	my ($self, $w, $h) = @_;	3512	my ($self, $w, $h) = @_;
2985		3513
2986	for my $child ($self->children) {	3514	for my $child ($self->children) {
2987	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)};
2988		3516
2989	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
2990	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
2991		3519
2992	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
2993	if exists $child->{req_y};	3521	$Y = _to_pixel $Y, $H, $self->{h};
2994
2995	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997		3522
2998	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
2999	}	3524	}
3000	}	3525	}
3001		3526
…		…
3012	}	3537	}
3013		3538
3014	sub update {	3539	sub update {
3015	my ($self) = @_;	3540	my ($self) = @_;
3016		3541
3017	$self->check_size;
3018	$::WANT_REFRESH++;	3542	$::WANT_REFRESH++;
3019	}	3543	}
3020		3544
3021	sub add {	3545	sub add {
3022	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3023		3547
3024	for (my @widgets = @children; my $w = pop @widgets; ) {
3025	push @widgets, $w->children;
3026	$w->{root} = $self;
3027	$w->{visible} = 1;
3028	}
3029
3030	for my $child (@children) {
3031	$child->{is_toplevel} = 1;	3548	$_->{is_toplevel} = 1
3032		3549	for @children;
3033	# integerise window positions
3034	$child->{x} = int $child->{x};
3035	$child->{y} = int $child->{y};
3036	}
3037		3550
3038	$self->SUPER::add (@children);	3551	$self->SUPER::add (@children);
3039	}	3552	}
3040		3553
3041	sub remove {	3554	sub remove {
3042	my ($self, @children) = @_;	3555	my ($self, @children) = @_;
3043		3556
3044	$self->SUPER::remove (@children);	3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3045		3561
3046	while (@children) {	3562	while (@children) {
3047	my $w = pop @children;	3563	my $w = pop @children;
3048	push @children, $w->children;	3564	push @children, $w->children;
3049	$w->set_invisible;	3565	$w->set_invisible;
…		…
3068	while ($self->{refresh_hook}) {	3584	while ($self->{refresh_hook}) {
3069	$_->()	3585	$_->()
3070	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3071	}	3587	}
3072		3588
3073	if ($self->{check_size}) {	3589	if ($self->{realloc}) {
3074	my @queue = ([], []);	3590	my %queue;
		3591	my @queue;
		3592	my $widget;
3075		3593
3076	for (;;) {	3594	outer:
3077	if ($self->{check_size}) {	3595	while () {
3078	# heuristic: check containers last	3596	if (my $realloc = delete $self->{realloc}) {
3079	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3597	for $widget (values %$realloc) {
3080	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	}
3081	}	3604	}
3082		3605
3083	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3606	while () {
		3607	@queue or last outer;
3084		3608
3085	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3609	$widget = pop @{ $queue[-1] || [] }
3086	? @$widget{qw(user_w user_h)}	3610	and last;
3087	: $widget->size_request;
3088
3089	if (delete $widget->{force_alloc}
3090	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092		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}) {
3093	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3094	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3095		3629
3096	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3630	$self->{size_alloc}{$widget+0} = $widget;
3097		3631
3098	$widget->{parent}->check_size
3099	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	}
3100	}	3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3101	}	3642	}
3102	}	3643	}
3103		3644
3104	while ($self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3105	for (values %{delete $self->{size_alloc}}) {	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3106	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)};
3107		3653
3108	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3109	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3110		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
3111	$widget->{w} = $w;	3664	$widget->{w} = $w;
3112	$widget->{h} = $h;	3665	$widget->{h} = $h;
		3666
3113	$widget->emit (size_allocate => $w, $h);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3114	}	3669	}
3115	}	3670	}
3116		3671
3117	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3118	$_->()	3673	$_->()
3119	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3120	}	3675	}
		3676
3121		3677
3122	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3125		3681
…		…
3127	glLoadIdentity;	3683	glLoadIdentity;
3128	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3130	glLoadIdentity;	3686	glLoadIdentity;
3131		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
3132	$self->_draw;	3695	$self->_draw;
3133	}	3696	}
3134		3697
3135	#############################################################################	3698	#############################################################################
3136		3699

Diff Legend

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