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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
315	}	381	}
316		382
317	sub set_max_size {	383	sub set_max_size {
318	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
319		385
…		…
378		444
379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380	unless $FOCUS;	446	unless $FOCUS;
381	}	447	}
382		448
383	sub mouse_motion { }	449	sub mouse_motion { 0 }
384	sub button_up { }	450	sub button_up { 0 }
385	sub key_down { }	451	sub key_down { 0 }
386	sub key_up { }	452	sub key_up { 0 }
387		453
388	sub button_down {	454	sub button_down {
389	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
390		456
391	$self->focus_in;	457	$self->focus_in;
392	}
393		458
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
398	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399		535
400	sub draw {	536	sub draw {
401	my ($self) = @_;	537	my ($self) = @_;
402		538
403	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404		550
405	glPushMatrix;	551	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	553	$self->_draw;
408	glPopMatrix;	554	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
421	glEnd;	567	glEnd;
422	glDisable GL_BLEND;	568	glDisable GL_BLEND;
423	}	569	}
424		570
425	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	572	glPushMatrix;
427	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
441	my ($self) = @_;	587	my ($self) = @_;
442		588
443	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
444	}	590	}
445		591
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	# TODO: req_w _does_change after ->reconfigure
464	$self->check_size
465	unless exists $self->{req_w};
466
467	$self->show;
468	}
469
470	sub check_size {
471	my ($self, $forced) = @_;
472
473	$self->{force_alloc} = 1 if $forced;
474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
475	}
476
477	sub update {
478	my ($self) = @_;
479
480	$self->{parent}->update
481	if $self->{parent};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub DESTROY {	592	sub DESTROY {
504	my ($self) = @_;	593	my ($self) = @_;
505		594
506	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
507	#$self->deactivate;	596	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
565	}	654	}
566		655
567	sub size_request {	656	sub size_request {
568	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
569	}	660	}
570		661
571	sub draw { }	662	sub draw { }
572		663
573	#############################################################################	664	#############################################################################
…		…
577	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
578		669
579	sub new {	670	sub new {
580	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
581		672
582	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
583		674
584	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
585	children => [],	676	children => [],
586	can_events => 0,	677	can_events => 0,
587	%arg,	678	%arg,
588	);	679	);
		680
589	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
590		683
591	$self	684	$self
592	}	685	}
593		686
594	sub add {	687	sub add {
…		…
602	$self->{children} = [	695	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
605	];	698	];
606		699
607	$self->check_size (1);	700	$self->realloc;
608	$self->update;
609	}	701	}
610		702
611	sub children {	703	sub children {
612	@{ $_[0]{children} }	704	@{ $_[0]{children} }
613	}	705	}
…		…
618	delete $child->{parent};	710	delete $child->{parent};
619	$child->hide;	711	$child->hide;
620		712
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		714
623	$self->check_size;	715	$self->realloc;
624	$self->update;
625	}	716	}
626		717
627	sub clear {	718	sub clear {
628	my ($self) = @_;	719	my ($self) = @_;
629		720
…		…
633	for (@$children) {	724	for (@$children) {
634	delete $_->{parent};	725	delete $_->{parent};
635	$_->hide;	726	$_->hide;
636	}	727	}
637		728
638	$self->check_size;	729	$self->realloc;
639	$self->update;
640	}	730	}
641		731
642	sub find_widget {	732	sub find_widget {
643	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
644		734
645	$x -= $self->{x};	735	$x -= $self->{x};
646	$y -= $self->{y};	736	$y -= $self->{y};
647		737
648	my $res;	738	my $res;
649		739
650	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
651	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
652	and return $res;	742	and return $res;
653	}	743	}
654		744
655	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
731	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
732	$self->update;	822	$self->update;
733	}	823	}
734		824
735	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
736	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
737	}	829	}
738		830
739	sub render_child {	831	sub render_child {
740	my ($self) = @_;	832	my ($self) = @_;
741		833
742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
744	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
745		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
746	$self->_render;	845	$self->_render;
747	};	846	};
748	}	847	}
749		848
750	sub _draw {	849	sub _draw {
751	my ($self) = @_;	850	my ($self) = @_;
752		851
753	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
754		853
755	my $tex = $self->{texture}	854	my $tex = $self->{texture}
756	or return;	855	or return;
757		856
758	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
781	}	880	}
782		881
783	sub size_request {	882	sub size_request {
784	my ($self) = @_;	883	my ($self) = @_;
785		884
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		886
788	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
789	}	891	}
790		892
791	sub size_allocate {	893	sub size_allocate {
792	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
793		895
		896	my $child = $self->child;
		897
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		900
797	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
798	$self->update;	902	$self->update;
799	}	903	}
800		904
…		…
836	}	940	}
837		941
838	sub _render {	942	sub _render {
839	my ($self) = @_;	943	my ($self) = @_;
840		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		947
841	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842		949
843	$self->SUPER::_render;	950	$self->SUPER::_render;
844	}	951	}
845		952
…		…
853	my $class = shift;	960	my $class = shift;
854		961
855	my $self;	962	my $self;
856		963
857	my $slider = new CFClient::UI::Slider	964	my $slider = new CFClient::UI::Slider
858	vertical => 1,	965	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	966	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	967	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	968	$self->{vp}->set_offset (0, $_[1]);
862	},	969	},
863	;	970	;
864		971
865	$self = $class->SUPER::new (	972	$self = $class->SUPER::new (
…		…
871	$self->{vp}->add ($self->{scrolled});	978	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});	979	$self->add ($self->{vp});
873	$self->add ($self->{slider});	980	$self->add ($self->{slider});
874		981
875	$self	982	$self
		983	}
		984
		985	sub update {
		986	my ($self) = @_;
		987
		988	$self->SUPER::update;
		989
		990	# todo: overwrite size_allocate of child
		991	my $child = $self->{vp}->child;
		992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876	}	993	}
877		994
878	sub size_allocate {	995	sub size_allocate {
879	my ($self, $w, $h) = @_;	996	my ($self, $w, $h) = @_;
880		997
…		…
933		1050
934	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
935		1052
936	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
937		1054
938	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 =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941		1062
942	sub new {	1063	sub new {
943	my $class = shift;	1064	my ($class, %arg) = @_;
944		1065
945	# TODO: user_x, user_y, overwrite moveto?	1066	my $title = delete $arg{title};
946		1067
947	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1071	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1072	can_events => 1,
953	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
954	);	1076	);
955		1077
956	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
957	align => 0,	1079	align => 0,
958	valign => 1,	1080	valign => 1,
959	text => $self->{title},	1081	text => $title,
960	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
961		1084
962	$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};
963	}	1093	}
964		1094
965	sub border {	1095	sub border {
966	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
967	}	1097	}
968		1098
969	sub size_request {	1099	sub size_request {
970	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
971		1104
972	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
973		1106
974	(	1107	(
975	$w + $self->border * 2,	1108	$w + $self->border * 2,
…		…
978	}	1111	}
979		1112
980	sub size_allocate {	1113	sub size_allocate {
981	my ($self, $w, $h) = @_;	1114	my ($self, $w, $h) = @_;
982		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
983	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
985		1126
986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987	if $self->{title};
988
989	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
990	}	1128	}
991		1129
992	sub button_down {	1130	sub button_down {
993	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
994		1132
…		…
1010	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1011		1149
1012	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1014		1152
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1155
		1156	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1158	};
1020		1159
1021	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1164	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1027		1166
1028	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1029		1168
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1033	}	1175	1
1034	}	1176	}
1035		1177
1036	sub button_up {	1178	sub button_up {
1037	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1038		1180
1039	delete $self->{motion};	1181	!!delete $self->{motion}
1040	}	1182	}
1041		1183
1042	sub mouse_motion {	1184	sub mouse_motion {
1043	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1044		1186
1045	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1046	}	1190	}
1047		1191
1048	sub _draw {	1192	sub _draw {
1049	my ($self) = @_;	1193	my ($self) = @_;
1050		1194
		1195	my $child = $self->{children}[0];
		1196
1051	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1053		1199
1054	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1202
1057	my $border = $self->border;	1203	my $border = $self->border;
1058		1204
1059	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1210
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1067		1213
1068	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1217	$bg->{t} = $ch / $bg->{h};
1071
1072	glColor @{ $self->{bg} };
1073
1074	$bg->{s} = $rep_x;
1075	$bg->{t} = $rep_y;
1076	$bg->{wrap_mode} = 1;
1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1219	}
1079		1220
1080	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1081		1222
1082	$self->{title}->draw if $self->{title};
1083
1084	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1085	}	1229	}
1086		1230
1087	#############################################################################	1231	#############################################################################
1088		1232
1089	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1101	col_expand => [],	1245	col_expand => [],
1102	@_,	1246	@_,
1103	)	1247	)
1104	}	1248	}
1105		1249
		1250	sub children {
		1251	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1252	}
		1253
1106	sub add {	1254	sub add {
1107	my ($self, $x, $y, $child) = @_;	1255	my ($self, $x, $y, $child) = @_;
1108		1256
1109	$child->set_parent ($self);	1257	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1258	$self->{children}[$y][$x] = $child;
1111		1259
1112	$child->check_size;	1260	$self->realloc;
1113	}	1261	}
1114		1262
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# TODO: move to container class maybe? send childs a signal on removal?	1263	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1264	sub clear {
1121	my ($self) = @_;	1265	my ($self) = @_;
1122		1266
1123	my @children = $self->children;	1267	my @children = $self->children;
1124	delete $self->{children};	1268	delete $self->{children};
…		…
1126	for (@children) {	1270	for (@children) {
1127	delete $_->{parent};	1271	delete $_->{parent};
1128	$_->hide;	1272	$_->hide;
1129	}	1273	}
1130		1274
1131	$self->update;	1275	$self->realloc;
1132	}	1276	}
1133		1277
1134	sub get_wh {	1278	sub get_wh {
1135	my ($self) = @_;	1279	my ($self) = @_;
1136		1280
…		…
1167	sub size_allocate {	1311	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1312	my ($self, $w, $h) = @_;
1169		1313
1170	my ($ws, $hs) = $self->get_wh;	1314	my ($ws, $hs) = $self->get_wh;
1171		1315
1172	my $req_w = sum @$ws;	1316	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1317	my $req_h = (sum @$hs) || 1;
1174		1318
1175	# TODO: nicer code && do row_expand	1319	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1320	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1321	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1322	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1376	}
1233	}	1377	}
1234		1378
1235	#############################################################################	1379	#############################################################################
1236		1380
1237	package CFClient::UI::HBox;	1381	package CFClient::UI::Box;
1238
1239	# TODO: wrap into common Box base class
1240		1382
1241	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Container::;
1242		1384
1243	sub size_request {	1385	sub size_request {
1244	my ($self) = @_;	1386	my ($self) = @_;
1245		1387
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$self->{vertical}
1247		1389	? (
1248	(	1390	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1249	(List::Util::sum map $_->[0], @alloc),	1391	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250	(List::Util::max map $_->[1], @alloc),	1392	)
1251	)	1393	: (
		1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1396	)
1252	}	1397	}
1253		1398
1254	sub size_allocate {	1399	sub size_allocate {
1255	my ($self, $w, $h) = @_;	1400	my ($self, $w, $h) = @_;
1256		1401
1257	($h, $w) = ($w, $h);	1402	my $space = $self->{vertical} ? $h : $w;
1258
1259	my $children = $self->{children};	1403	my $children = $self->{children};
1260		1404
1261	my @h = map $_->{req_w}, @$children;	1405	my @req;
1262		1406
1263	my $req_h = List::Util::sum @h;	1407	if ($self->{homogeneous}) {
1264		1408	@req = ($space / (@$children || 1)) x @$children;
1265	if ($req_h > $h) {
1266	# ah well, not enough space
1267	$_ *= $h / $req_h for @h;
1268	} else {	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 {
1269	my $exp = List::Util::sum map $_->{expand}, @$children;	1417	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270	$exp ||= 1;
1271		1418
		1419	$space = ($space - $req) / $expand; # remaining space to give away
		1420
		1421	$req[$_] += $space * $children->[$_]{expand}
1272	for (0 .. $#$children) {	1422	for 0 .. $#$children;
1273	my $child = $children->[$_];
1274
1275	my $alloc_h = $h[$_];
1276	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277	$h[$_] = $alloc_h;
1278	}	1423	}
1279	}	1424	}
1280		1425
1281	CFClient::UI::harmonize \@h;	1426	CFClient::UI::harmonize \@req;
1282		1427
1283	my $y = 0;	1428	my $pos = 0;
1284	for (0 .. $#$children) {	1429	for (0 .. $#$children) {
1285	my $child = $children->[$_];
1286	my $h = $h[$_];	1430	my $alloc = $req[$_];
1287	$child->configure ($y, 0, $h, $w);	1431	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288		1432
1289	$y += $h;	1433	$pos += $alloc;
1290	}	1434	}
1291		1435
1292	1	1436	1
1293	}	1437	}
1294		1438
1295	#############################################################################	1439	#############################################################################
1296		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
1297	package CFClient::UI::VBox;	1456	package CFClient::UI::VBox;
1298		1457
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1458	our @ISA = CFClient::UI::Box::;
1302		1459
1303	sub size_request {	1460	sub new {
1304	my ($self) = @_;	1461	my $class = shift;
1305		1462
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1463	$class->SUPER::new (
1307		1464	vertical => 1,
1308	(	1465	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1466	)
1312	}
1313
1314	sub size_allocate {
1315	my ($self, $w, $h) = @_;
1316
1317	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319	my $children = $self->{children};
1320
1321	my @h = map $_->{req_h}, @$children;
1322
1323	my $req_h = List::Util::sum @h;
1324
1325	if ($req_h > $h) {
1326	# ah well, not enough space
1327	$_ *= $h / $req_h for @h;
1328	} else {
1329	my $exp = List::Util::sum map $_->{expand}, @$children;
1330	$exp ||= 1;
1331
1332	for (0 .. $#$children) {
1333	my $child = $children->[$_];
1334
1335	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336	}
1337	}
1338
1339	CFClient::UI::harmonize \@h;
1340
1341	my $y = 0;
1342	for (0 .. $#$children) {
1343	my $child = $children->[$_];
1344	my $h = $h[$_];
1345	$child->configure (0, $y, $w, $h);
1346
1347	$y += $h;
1348	}
1349
1350	1
1351	}	1467	}
1352		1468
1353	#############################################################################	1469	#############################################################################
1354		1470
1355	package CFClient::UI::Label;	1471	package CFClient::UI::Label;
…		…
1372	ellipsise => 3, # end	1488	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1374	fontsize => 1,	1490	fontsize => 1,
1375	align => -1,	1491	align => -1,
1376	valign => -1,	1492	valign => -1,
1377	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1378	can_events => 0,	1495	can_events => 0,
1379	%arg	1496	%arg
1380	);	1497	);
1381		1498
1382	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1418	$self->{text} = "T$text";	1535	$self->{text} = "T$text";
1419		1536
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1538	$self->{layout}->set_text ($text);
1422		1539
		1540	$self->realloc;
1423	$self->update;	1541	$self->update;
1424	$self->check_size;
1425	}	1542	}
1426		1543
1427	sub set_markup {	1544	sub set_markup {
1428	my ($self, $markup) = @_;	1545	my ($self, $markup) = @_;
1429		1546
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1551
1435	$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;
1436	$self->{layout}->set_markup ($markup);	1553	$self->{layout}->set_markup ($markup);
1437		1554
		1555	$self->realloc;
1438	$self->update;	1556	$self->update;
1439	$self->check_size;
1440	}	1557	}
1441		1558
1442	sub size_request {	1559	sub size_request {
1443	my ($self) = @_;	1560	my ($self) = @_;
1444		1561
…		…
1458		1575
1459	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1461	}	1578	}
1462		1579
1463	(	1580	($w, $h)
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1581	}
1468		1582
1469	sub size_allocate {	1583	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1471		1585
		1586	delete $self->{ox};
		1587
1472	delete $self->{texture};	1588	delete $self->{texture}
		1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473	}	1590	}
1474		1591
1475	sub set_fontsize {	1592	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1477		1594
1478	$self->{fontsize} = $fontsize;	1595	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1596	delete $self->{texture};
1480		1597
1481	$self->update;	1598	$self->realloc;
1482	$self->check_size;
1483	}	1599	}
1484		1600
1485	sub _draw {	1601	sub _draw {
1486	my ($self) = @_;	1602	my ($self) = @_;
1487		1603
…		…
1493	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1494	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1613
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1499		1616
		1617	unless (exists $self->{ox}) {
1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1503		1621
1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1507
1508	$tex
1509	};	1625	};
1510		1626
1511	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513		1629
…		…
1567	sub set_text {	1683	sub set_text {
1568	my ($self, $text) = @_;	1684	my ($self, $text) = @_;
1569		1685
1570	$self->{cursor} = length $text;	1686	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1687	$self->_set_text ($text);
1572	$self->update;	1688
1573	$self->check_size;	1689	$self->realloc;
1574	}	1690	}
1575		1691
1576	sub get_text {	1692	sub get_text {
1577	$_[0]{text}	1693	$_[0]{text}
1578	}	1694	}
…		…
1608	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1609	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1610	$self->_emit ('escape');	1726	$self->_emit ('escape');
1611	} elsif ($uni) {	1727	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1613	}	1731	}
1614		1732
1615	$self->_set_text ($text);	1733	$self->_set_text ($text);
1616	$self->update;	1734
1617	$self->check_size;	1735	$self->realloc;
		1736
		1737	1
1618	}	1738	}
1619		1739
1620	sub focus_in {	1740	sub focus_in {
1621	my ($self) = @_;	1741	my ($self) = @_;
1622		1742
…		…
1637	utf8::encode $text;	1757	utf8::encode $text;
1638	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1639		1759
1640	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1641	$self->update;	1761	$self->update;
		1762
		1763	1
1642	}	1764	}
1643		1765
1644	sub mouse_motion {	1766	sub mouse_motion {
1645	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1646	# 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
1647	}	1771	}
1648		1772
1649	sub _draw {	1773	sub _draw {
1650	my ($self) = @_;	1774	my ($self) = @_;
1651		1775
…		…
1728	} else {	1852	} else {
1729	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1730	}	1854	}
1731		1855
1732	} else {	1856	} else {
1733	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1734	}	1860	1
1735
1736	}	1861	}
1737		1862
1738	#############################################################################	1863	#############################################################################
1739		1864
1740	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1749		1874
1750	sub new {	1875	sub new {
1751	my $class = shift;	1876	my $class = shift;
1752		1877
1753	$class->SUPER::new (	1878	$class->SUPER::new (
1754	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1755	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1757	can_hover => 1,	1883	can_hover => 1,
1758	align => 0,	1884	align => 0,
1759	valign => 0,	1885	valign => 0,
…		…
1768	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1769		1895
1770	$self->emit ("activate")	1896	$self->emit ("activate")
1771	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1772	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1773	}	1901	}
1774		1902
1775	sub _draw {	1903	sub _draw {
1776	my ($self) = @_;	1904	my ($self) = @_;
1777		1905
…		…
1806		1934
1807	sub new {	1935	sub new {
1808	my $class = shift;	1936	my $class = shift;
1809		1937
1810	$class->SUPER::new (	1938	$class->SUPER::new (
1811	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1812	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	1945	state => 0,
…		…
1820	}	1949	}
1821		1950
1822	sub size_request {	1951	sub size_request {
1823	my ($self) = @_;	1952	my ($self) = @_;
1824		1953
1825	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1826	}	1955	}
1827		1956
1828	sub button_down {	1957	sub button_down {
1829	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1830		1959
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1834	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1835	}	1968	1
1836	}	1969	}
1837		1970
1838	sub _draw {	1971	sub _draw {
1839	my ($self) = @_;	1972	my ($self) = @_;
1840		1973
1841	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1842		1975
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		1977
1845	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;
1846		1981
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		1983
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		1985
…		…
2115	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2122	vertical => 0,	2257	vertical => 0,
2123	can_hover => 1,	2258	can_hover => 1,
2124	inner_pad => 0.02,	2259	inner_pad => 0.02,
2125	@_	2260	@_
2126	);	2261	);
…		…
2129	$self->update;	2264	$self->update;
2130		2265
2131	$self	2266	$self
2132	}	2267	}
2133		2268
		2269	sub changed { }
		2270
2134	sub set_range {	2271	sub set_range {
2135	my ($self, $range) = @_;	2272	my ($self, $range) = @_;
2136		2273
2137	$self->{range} = $range;	2274	($range, $self->{range}) = ($self->{range}, $range);
2138		2275
2139	$self->update;	2276	$self->update
		2277	if "@$range" ne "@{$self->{range}}";
2140	}	2278	}
2141		2279
2142	sub set_value {	2280	sub set_value {
2143	my ($self, $value) = @_;	2281	my ($self, $value) = @_;
2144		2282
…		…
2163	}	2301	}
2164		2302
2165	sub size_request {	2303	sub size_request {
2166	my ($self) = @_;	2304	my ($self) = @_;
2167		2305
2168	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2307	}
2173		2308
2174	sub button_down {	2309	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2176		2311
2177	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2178		2313
2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180		2315
2181	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2182	}	2317	}
2183		2318
2184	sub mouse_motion {	2319	sub mouse_motion {
2185	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2186		2321
…		…
2190	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2191		2326
2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193		2328
2194	$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
2195	}	2334	1
2196	}	2335	}
2197		2336
2198	sub update {	2337	sub update {
2199	my ($self) = @_;	2338	my ($self) = @_;
2200		2339
…		…
2527		2666
2528	sub new {	2667	sub new {
2529	my $class = shift;	2668	my $class = shift;
2530		2669
2531	my $self = $class->SUPER::new (	2670	my $self = $class->SUPER::new (
2532	state => 0,	2671	state => 0,
2533	connect_activate => \&toggle_flopper,	2672	on_activate => \&toggle_flopper,
2534	@_	2673	@_
2535	);	2674	);
2536		2675
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2676	$self
2543	}	2677	}
2544		2678
2545	sub toggle_flopper {	2679	sub toggle_flopper {
2546	my ($self) = @_;	2680	my ($self) = @_;
2547		2681
2548	# TODO: use animation	2682	$self->{other}->toggle_visibility;
2549	if ($self->{state} = !$self->{state}) {
2550	$CFClient::UI::ROOT->add ($self->{other});
2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2552	$self->_emit ("open");
2553	} else {
2554	$CFClient::UI::ROOT->remove ($self->{other});
2555	$self->_emit ("close");
2556	}
2557
2558	$self->_emit (changed => $self->{state});
2559	}	2683	}
2560		2684
2561	#############################################################################	2685	#############################################################################
2562		2686
2563	package CFClient::UI::Tooltip;	2687	package CFClient::UI::Tooltip;
…		…
2576	}	2700	}
2577		2701
2578	sub set_tooltip_from {	2702	sub set_tooltip_from {
2579	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2580		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
2581	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2582	markup => $widget->{tooltip},	2715	markup => $tooltip,
2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584	fontsize => 0.8,	2717	fontsize => 0.8,
2585	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2586	ellipsise => 0,	2719	ellipsise => 0,
2587	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2598		2731
2599	sub size_allocate {	2732	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2733	my ($self, $w, $h) = @_;
2601		2734
2602	$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	});
2603	}	2754	}
2604		2755
2605	sub _draw {	2756	sub _draw {
2606	my ($self) = @_;	2757	my ($self) = @_;
2607		2758
…		…
2624	glVertex $w, $h;	2775	glVertex $w, $h;
2625	glVertex $w, 0;	2776	glVertex $w, 0;
2626	glEnd;	2777	glEnd;
2627		2778
2628	glTranslate 2 - 0.375, 2 - 0.375;	2779	glTranslate 2 - 0.375, 2 - 0.375;
		2780
2629	$self->SUPER::_draw;	2781	$self->SUPER::_draw;
2630	}	2782	}
2631		2783
2632	#############################################################################	2784	#############################################################################
2633		2785
…		…
2709	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2710	}	2862	}
2711		2863
2712	#############################################################################	2864	#############################################################################
2713		2865
2714	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2715		2867
2716	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2717		2869
2718	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2719	my $class = shift;
2720
2721	my $self = $class->SUPER::new (
2722	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723	@_,
2724	);
2725
2726	$self
2727	}
2728
2729	sub set_items {
2730	my ($self, $items) = @_;
2731
2732	$self->{scrolled}->clear;
2733	return unless $items;
2734
2735	my @items = sort {
2736	($a->{type} <=> $b->{type})
2737	or ($a->{name} cmp $b->{name})
2738	} @$items;
2739
2740	$self->{real_items} = \@items;
2741
2742	my $row = 0;
2743	for my $item (@items) {
2744	CFClient::Item::update_widgets $item;
2745
2746	$self->{scrolled}->add (0, $row, $item->{face_widget});
2747	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2748	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750	$row++;
2751	}
2752
2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754	}
2755
2756	sub size_request {
2757	my ($self) = @_;
2758	($self->{req_w}, $self->{req_h});
2759	}
2760		2871
2761	#############################################################################	2872	#############################################################################
2762		2873
2763	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2764		2875
…		…
2805	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2806	$GRAB = $self;	2917	$GRAB = $self;
2807	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2808		2919
2809	$self->show;	2920	$self->show;
2810	$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);
2811	}	2922	}
2812		2923
2813	sub mouse_motion {	2924	sub mouse_motion {
2814	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2815		2926
2816	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2817	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2818	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2819	}	2932	}
2820		2933
2821	sub button_up {	2934	sub button_up {
2822	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2823		2936
…		…
2825	undef $GRAB;	2938	undef $GRAB;
2826	$self->hide;	2939	$self->hide;
2827		2940
2828	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2829	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2830	}	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});
2831	}	3054	}
2832		3055
2833	#############################################################################	3056	#############################################################################
2834		3057
2835	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2940	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2941	}	3164	}
2942		3165
2943	#############################################################################	3166	#############################################################################
2944		3167
2945	package CFClient::UI::Root;	3168	package CFClient::UI::Inventory;
2946		3169
2947	our @ISA = CFClient::UI::Container::;	3170	our @ISA = CFClient::UI::ScrolledWindow::;
2948
2949	use CFClient::OpenGL;
2950		3171
2951	sub new {	3172	sub new {
2952	my $class = shift;	3173	my $class = shift;
2953		3174
2954	$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),
2955	@_,	3418	@_,
2956	)	3419	)
2957	}	3420	}
2958		3421
2959	sub configure {	3422	# XXX: Do sorting? Argl...
2960	my ($self, $x, $y, $w, $h) = @_;	3423	sub add_spell {
2961
2962	$self->{w} = $w;
2963	$self->{h} = $h;
2964	}
2965
2966	sub check_size {
2967	my ($self) = @_;	3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
2968		3426
2969	$self->size_allocate ($self->{w}, $self->{h})	3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2970	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
2971	}	3481	}
2972		3482
2973	sub size_request {	3483	sub size_request {
2974	my ($self) = @_;	3484	my ($self) = @_;
2975		3485
2976	($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
2977	}	3501	}
2978		3502
2979	sub size_allocate {	3503	sub size_allocate {
2980	my ($self, $w, $h) = @_;	3504	my ($self, $w, $h) = @_;
2981		3505
2982	for my $child ($self->children) {	3506	for my $child ($self->children) {
2983	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)};
2984		3508
2985	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
2986	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
2987		3511
2988	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
2989	if exists $child->{req_y};	3513	$Y = _to_pixel $Y, $H, $self->{h};
2990
2991	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993		3514
2994	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
2995	}	3516	}
2996	}	3517	}
2997		3518
…		…
3008	}	3529	}
3009		3530
3010	sub update {	3531	sub update {
3011	my ($self) = @_;	3532	my ($self) = @_;
3012		3533
3013	$self->check_size;
3014	$::WANT_REFRESH++;	3534	$::WANT_REFRESH++;
3015	}	3535	}
3016		3536
3017	sub add {	3537	sub add {
3018	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3019		3539
3020	for (my @widgets = @children; my $w = pop @widgets; ) {
3021	push @widgets, $w->children;
3022	$w->{root} = $self;
3023	$w->{visible} = 1;
3024	}
3025
3026	for my $child (@children) {
3027	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3028		3541	for @children;
3029	# integerise window positions
3030	$child->{x} = int $child->{x};
3031	$child->{y} = int $child->{y};
3032	}
3033		3542
3034	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3035	}	3544	}
3036		3545
3037	sub remove {	3546	sub remove {
3038	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3039		3548
3040	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3041		3553
3042	while (@children) {	3554	while (@children) {
3043	my $w = pop @children;	3555	my $w = pop @children;
3044	push @children, $w->children;	3556	push @children, $w->children;
3045	$w->set_invisible;	3557	$w->set_invisible;
…		…
3064	while ($self->{refresh_hook}) {	3576	while ($self->{refresh_hook}) {
3065	$_->()	3577	$_->()
3066	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3067	}	3579	}
3068		3580
3069	if ($self->{check_size}) {	3581	if ($self->{realloc}) {
3070	my @queue = ([], []);	3582	my %queue;
		3583	my @queue;
		3584	my $widget;
3071		3585
3072	for (;;) {	3586	outer:
3073	if ($self->{check_size}) {	3587	while () {
3074	# heuristic: check containers last	3588	if (my $realloc = delete $self->{realloc}) {
3075	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3589	for $widget (values %$realloc) {
3076	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	}
3077	}	3596	}
3078		3597
3079	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3598	while () {
		3599	@queue or last outer;
3080		3600
3081	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3601	$widget = pop @{ $queue[-1] || [] }
3082	? @$widget{qw(user_w user_h)}	3602	and last;
3083	: $widget->size_request;
3084
3085	if (delete $widget->{force_alloc}
3086	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088		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}) {
3089	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3090	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3091		3621
3092	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3622	$self->{size_alloc}{$widget+0} = $widget;
3093		3623
3094	$widget->{parent}->check_size
3095	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	}
3096	}	3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3097	}	3634	}
3098	}	3635	}
3099		3636
3100	while ($self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3101	for (values %{delete $self->{size_alloc}}) {	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3102	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)};
3103		3645
3104	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3105	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3106		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
3107	$widget->{w} = $w;	3656	$widget->{w} = $w;
3108	$widget->{h} = $h;	3657	$widget->{h} = $h;
		3658
3109	$widget->emit (size_allocate => $w, $h);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3110	}	3661	}
3111	}	3662	}
3112		3663
3113	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3114	$_->()	3665	$_->()
3115	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3116	}	3667	}
		3668
3117		3669
3118	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3121		3673
…		…
3123	glLoadIdentity;	3675	glLoadIdentity;
3124	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3126	glLoadIdentity;	3678	glLoadIdentity;
3127		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
3128	$self->_draw;	3687	$self->_draw;
3129	}	3688	}
3130		3689
3131	#############################################################################	3690	#############################################################################
3132		3691

Diff Legend

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