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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	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
177	$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.]+$/;
178	$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};
179	$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};
180	$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.]+$/;
181	$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};
182	$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};
		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
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
221	}	234	}
222		235
223	$self	236	$self
224	}	237	}
225		238
…		…
236	return if $self->{parent};	249	return if $self->{parent};
237		250
238	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
239	}	252	}
240		253
241	sub center {
242	my ($self) = @_;
243
244	$CFClient::UI::ROOT->on_post_alloc (
245	"center_$self" => sub {
246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247	},
248	);
249
250	$self->update;
251	}
252
253	sub set_visible {	254	sub set_visible {
254	my ($self) = @_;	255	my ($self) = @_;
255		256
256	return if $self->{visible};	257	return if $self->{visible};
257		258
258	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
259	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
260		261
261	$self->emit (visibility_change => 1);	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
262	}	267	}
263		268
264	sub set_invisible {	269	sub set_invisible {
265	my ($self) = @_;	270	my ($self) = @_;
266		271
267	return unless $self->{visible};	272	return unless $self->{visible};
268		273
269	# broken show/hide model	274	$_->set_invisible for $self->children;
270		275
271	delete $self->{root};	276	delete $self->{root};
272	delete $self->{visible};	277	delete $self->{visible};
273		278
274	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
275	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
276		281
277	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
278	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
279		284
280	$self->focus_out;	285	$self->focus_out;
281		286
282	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
283	}	288	}
…		…
306		311
307	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
308	if $self->{parent};	313	if $self->{parent};
309	}	314	}
310		315
311	sub move {	316	sub move_abs {
312	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
313		318
314	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
315	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
316	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
317		322
318	$self->update;	323	$self->update;
319	}	324	}
320		325
321	sub set_size {	326	sub set_size {
322	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
323		328
324	$self->{def_w} = $w;	329	$self->{force_w} = $w;
325	$self->{def_h} = $h;	330	$self->{force_h} = $h;
326		331
327	$self->check_size;	332	$self->realloc;
328	}	333	}
329		334
330	sub size_request {	335	sub size_request {
331	require Carp;	336	require Carp;
332	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
334		339
335	sub configure {	340	sub configure {
336	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
337		342
338	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
339	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
340	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
341		348
342	# use alignment to adjust x, y	349	# use alignment to adjust x, y
343		350
344	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
345	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
346
347	($w, $h) = ($w2, $h2);
348	}	353	}
349		354
350	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
351	$self->{x} = $x;	356	$self->{x} = $x;
352	$self->{y} = $y;	357	$self->{y} = $y;
353	$self->update;	358	$self->update;
354	}	359	}
355		360
356	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$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;
358	}	368	}
359	}	369	}
360		370
361	sub size_allocate {	371	sub size_allocate {
362	# nothing to be done	372	# nothing to be done
363	}
364
365	sub reconfigure {
366	my ($self) = @_;
367
368	$self->check_size (1);
369	$self->update;
370	}	373	}
371		374
372	sub children {	375	sub children {
373	}	376	}
374		377
…		…
447	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
448		451
449	$self->focus_in;	452	$self->focus_in;
450	}	453	}
451		454
452	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
453	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
454	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
455	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
456	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457		528
458	sub draw {	529	sub draw {
459	my ($self) = @_;	530	my ($self) = @_;
460		531
461	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462		543
463	glPushMatrix;	544	glPushMatrix;
464	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
465	$self->_draw;	546	$self->_draw;
466	glPopMatrix;	547	glPopMatrix;
…		…
478	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
479	glEnd;	560	glEnd;
480	glDisable GL_BLEND;	561	glDisable GL_BLEND;
481	}	562	}
482		563
483	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
484	glPushMatrix;	565	glPushMatrix;
485	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
487	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
488	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
499	my ($self) = @_;	580	my ($self) = @_;
500		581
501	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
502	}	583	}
503		584
504	sub find_widget {
505	my ($self, $x, $y) = @_;
506
507	return () unless $self->{can_events};
508
509	return $self
510	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513	()
514	}
515
516	sub set_parent {
517	my ($self, $parent) = @_;
518
519	Scalar::Util::weaken ($self->{parent} = $parent);
520
521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523	$self->check_size;
524	}
525
526	sub check_size {
527	my ($self, $forced) = @_;
528
529	$self->{force_alloc} = 1 if $forced;
530	$CFClient::UI::ROOT->{check_size}{$self} = $self;
531	}
532
533	sub update {
534	my ($self) = @_;
535
536	$self->{parent}->update
537	if $self->{parent};
538	}
539
540	sub connect {
541	my ($self, $signal, $cb) = @_;
542
543	push @{ $self->{signal_cb}{$signal} }, $cb;
544	}
545
546	sub _emit {
547	my ($self, $signal, @args) = @_;
548
549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550	}
551
552	sub emit {
553	my ($self, $signal, @args) = @_;
554
555	$self->_emit ($signal, @args)
556	|| $self->$signal (@args);
557	}
558
559	sub visibility_change {
560	#my ($self, $visible) = @_;
561	}
562
563	sub DESTROY {	585	sub DESTROY {
564	my ($self) = @_;	586	my ($self) = @_;
565		587
566	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
567	#$self->deactivate;	589	#$self->deactivate;
…		…
623	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
624	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
625	}	647	}
626		648
627	sub size_request {	649	sub size_request {
628	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
629	}	653	}
630		654
631	sub draw { }	655	sub draw { }
632		656
633	#############################################################################	657	#############################################################################
…		…
662	$self->{children} = [	686	$self->{children} = [
663	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
664	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
665	];	689	];
666		690
667	$self->check_size (1);	691	$self->realloc;
668	$self->update;
669	}	692	}
670		693
671	sub children {	694	sub children {
672	@{ $_[0]{children} }	695	@{ $_[0]{children} }
673	}	696	}
…		…
678	delete $child->{parent};	701	delete $child->{parent};
679	$child->hide;	702	$child->hide;
680		703
681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682		705
683	$self->check_size (1);	706	$self->realloc;
684	$self->update;
685	}	707	}
686		708
687	sub clear {	709	sub clear {
688	my ($self) = @_;	710	my ($self) = @_;
689		711
…		…
693	for (@$children) {	715	for (@$children) {
694	delete $_->{parent};	716	delete $_->{parent};
695	$_->hide;	717	$_->hide;
696	}	718	}
697		719
698	$self->check_size;	720	$self->realloc;
699	$self->update;
700	}	721	}
701		722
702	sub find_widget {	723	sub find_widget {
703	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
704		725
…		…
791	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
792	$self->update;	813	$self->update;
793	}	814	}
794		815
795	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
796	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
797	}	820	}
798		821
799	sub render_child {	822	sub render_child {
800	my ($self) = @_;	823	my ($self) = @_;
801		824
802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
805		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
806	$self->_render;	836	$self->_render;
807	};	837	};
808	}	838	}
809		839
810	sub _draw {	840	sub _draw {
811	my ($self) = @_;	841	my ($self) = @_;
812		842
813	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
814		844
815	my $tex = $self->{texture}	845	my $tex = $self->{texture}
816	or return;	846	or return;
817		847
818	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
841	}	871	}
842		872
843	sub size_request {	873	sub size_request {
844	my ($self) = @_;	874	my ($self) = @_;
845		875
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		877
848	$w = 10 if $self->{scroll_x};	878	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	879	$h = 10 if $self->{scroll_y};
850		880
851	($w, $h)	881	($w, $h)
852	}	882	}
853		883
854	sub size_allocate {	884	sub size_allocate {
855	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
856		886
		887	my $child = $self->child;
		888
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		891
860	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
861	$self->update;	893	$self->update;
862	}	894	}
863		895
…		…
898	}	930	}
899	}	931	}
900		932
901	sub _render {	933	sub _render {
902	my ($self) = @_;	934	my ($self) = @_;
		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
903		938
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		940
906	$self->SUPER::_render;	941	$self->SUPER::_render;
907	}	942	}
…		…
1006		1041
1007	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
1008		1043
1009	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
1010		1045
1011	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1053
1015	sub new {	1054	sub new {
1016	my $class = shift;	1055	my $class = shift;
1017		1056
1018	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1060	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
1024	@_	1064	@_
1025	);	1065	);
1026		1066
1027	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
1028	align => 0,	1068	align => 0,
…		…
1081	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
1082		1122
1083	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
1084	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
1085		1125
1086	$self->{user_x} = $wx + $dx * $mx;
1087	$self->{user_y} = $wy + $dy * $my;
1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090	$self->move ($self->{user_x}, $self->{user_y});	1128
1091	$self->check_size;	1129	$self->realloc;
		1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092	};	1131	};
1093		1132
1094	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1098	$self->{motion} = sub {	1137	$self->{motion} = sub {
1099	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1100		1139
1101	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1102		1141
1103	$self->{user_x} = $bx + $x - $ox;	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104	$self->{user_y} = $by + $y - $oy;
1105
1106	$self->move ($self->{user_x}, $self->{user_y});
1107	$self->update;
1108	};	1143	};
1109	}	1144	}
1110	}	1145	}
1111		1146
1112	sub button_up {	1147	sub button_up {
…		…
1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132		1167
1133	my $border = $self->border;	1168	my $border = $self->border;
1134		1169
1135	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1136	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1137	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140		1175
1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1143		1178
1144	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1145	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1146	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1147
1148	glColor @{ $self->{bg} };
1149
1150	$bg->{s} = $rep_x;
1151	$bg->{t} = $rep_y;
1152	$bg->{wrap_mode} = 1;
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1184	}
1155		1185
1156	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1157		1187
…		…
1187	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1188		1218
1189	$child->set_parent ($self);	1219	$child->set_parent ($self);
1190	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1191		1221
1192	$self->check_size (1);	1222	$self->realloc;
1193	}	1223	}
1194		1224
1195	# TODO: move to container class maybe? send children a signal on removal?	1225	# TODO: move to container class maybe? send children a signal on removal?
1196	sub clear {	1226	sub clear {
1197	my ($self) = @_;	1227	my ($self) = @_;
…		…
1202	for (@children) {	1232	for (@children) {
1203	delete $_->{parent};	1233	delete $_->{parent};
1204	$_->hide;	1234	$_->hide;
1205	}	1235	}
1206		1236
1207	$self->check_size (1);	1237	$self->realloc;
1208	$self->update;
1209	}	1238	}
1210		1239
1211	sub get_wh {	1240	sub get_wh {
1212	my ($self) = @_;	1241	my ($self) = @_;
1213		1242
…		…
1421	ellipsise => 3, # end	1450	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1423	fontsize => 1,	1452	fontsize => 1,
1424	align => -1,	1453	align => -1,
1425	valign => -1,	1454	valign => -1,
1426	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1427	can_events => 0,	1457	can_events => 0,
1428	%arg	1458	%arg
1429	);	1459	);
1430		1460
1431	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1467	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1468		1498
1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1471		1501
		1502	$self->realloc;
1472	$self->update;	1503	$self->update;
1473	$self->check_size;
1474	}	1504	}
1475		1505
1476	sub set_markup {	1506	sub set_markup {
1477	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1478		1508
…		…
1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483		1513
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1486		1516
		1517	$self->realloc;
1487	$self->update;	1518	$self->update;
1488	$self->check_size;
1489	}	1519	}
1490		1520
1491	sub size_request {	1521	sub size_request {
1492	my ($self) = @_;	1522	my ($self) = @_;
1493		1523
…		…
1507		1537
1508	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1510	}	1540	}
1511		1541
1512	(	1542	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1543	}
1517		1544
1518	sub size_allocate {	1545	sub size_allocate {
1519	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1520		1547
1521	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1550	}
1523		1551
1524	sub set_fontsize {	1552	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1526		1554
1527	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1528	delete $self->{texture};	1556	delete $self->{texture};
1529		1557
1530	$self->update;	1558	$self->realloc;
1531	$self->check_size;
1532	}	1559	}
1533		1560
1534	sub _draw {	1561	sub _draw {
1535	my ($self) = @_;	1562	my ($self) = @_;
1536		1563
…		…
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1573
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1548		1575
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1552		1579
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1556		1583
1557	$tex	1584	$tex
1558	};	1585	};
1559		1586
…		…
1616	sub set_text {	1643	sub set_text {
1617	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1618		1645
1619	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1620	$self->_set_text ($text);	1647	$self->_set_text ($text);
1621	$self->update;	1648
1622	$self->check_size;	1649	$self->realloc;
1623	}	1650	}
1624		1651
1625	sub get_text {	1652	sub get_text {
1626	$_[0]{text}	1653	$_[0]{text}
1627	}	1654	}
…		…
1660	} elsif ($uni) {	1687	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1662	}	1689	}
1663		1690
1664	$self->_set_text ($text);	1691	$self->_set_text ($text);
1665	$self->update;	1692
1666	$self->check_size;	1693	$self->realloc;
1667	}	1694	}
1668		1695
1669	sub focus_in {	1696	sub focus_in {
1670	my ($self) = @_;	1697	my ($self) = @_;
1671		1698
…		…
1798		1825
1799	sub new {	1826	sub new {
1800	my $class = shift;	1827	my $class = shift;
1801		1828
1802	$class->SUPER::new (	1829	$class->SUPER::new (
1803	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1804	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1806	can_hover => 1,	1834	can_hover => 1,
1807	align => 0,	1835	align => 0,
1808	valign => 0,	1836	valign => 0,
…		…
1855		1883
1856	sub new {	1884	sub new {
1857	my $class = shift;	1885	my $class = shift;
1858		1886
1859	$class->SUPER::new (	1887	$class->SUPER::new (
1860	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1861	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1894	state => 0,
…		…
1869	}	1898	}
1870		1899
1871	sub size_request {	1900	sub size_request {
1872	my ($self) = @_;	1901	my ($self) = @_;
1873		1902
1874	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1875	}	1904	}
1876		1905
1877	sub button_down {	1906	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1879		1908
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1884	}	1913	}
1885	}	1914	}
1886		1915
1887	sub _draw {	1916	sub _draw {
1888	my ($self) = @_;	1917	my ($self) = @_;
1889		1918
1890	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1891		1920
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1922
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1926
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1928
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1930
…		…
2164	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2171	vertical => 0,	2202	vertical => 0,
2172	can_hover => 1,	2203	can_hover => 1,
2173	inner_pad => 0.02,	2204	inner_pad => 0.02,
2174	@_	2205	@_
2175	);	2206	);
…		…
2178	$self->update;	2209	$self->update;
2179		2210
2180	$self	2211	$self
2181	}	2212	}
2182		2213
		2214	sub changed { }
		2215
2183	sub set_range {	2216	sub set_range {
2184	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2185		2218
2186	($range, $self->{range}) = ($self->{range}, $range);	2219	($range, $self->{range}) = ($self->{range}, $range);
2187		2220
…		…
2213	}	2246	}
2214		2247
2215	sub size_request {	2248	sub size_request {
2216	my ($self) = @_;	2249	my ($self) = @_;
2217		2250
2218	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2219	my $h = $self->{req_h};
2220
2221	$self->{vertical} ? ($h, $w) : ($w, $h)
2222	}	2252	}
2223		2253
2224	sub button_down {	2254	sub button_down {
2225	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2226		2256
…		…
2611	}	2641	}
2612		2642
2613	sub set_tooltip_from {	2643	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2615		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2616	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2656	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2658	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2660	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2672
2634	sub size_allocate {	2673	sub size_allocate {
2635	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2636		2675
2637	$self->SUPER::size_allocate ($w - 4, $h - 4);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2677	}
		2678
		2679	sub visibility_change {
		2680	my ($self, $visible) = @_;
		2681
		2682	return unless $visible;
		2683
		2684	$self->{root}->on_post_alloc ("move_$self" => sub {
		2685	my $widget = $self->{owner}
		2686	or return;
		2687
		2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2689
		2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2691	if $x + $self->{w} > $::WIDTH;
		2692
		2693	$self->move_abs ($x, $y);
		2694	});
2638	}	2695	}
2639		2696
2640	sub _draw {	2697	sub _draw {
2641	my ($self) = @_;	2698	my ($self) = @_;
2642		2699
…		…
2659	glVertex $w, $h;	2716	glVertex $w, $h;
2660	glVertex $w, 0;	2717	glVertex $w, 0;
2661	glEnd;	2718	glEnd;
2662		2719
2663	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2664	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2665	}	2723	}
2666		2724
2667	#############################################################################	2725	#############################################################################
2668		2726
…		…
2744	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2745	}	2803	}
2746		2804
2747	#############################################################################	2805	#############################################################################
2748		2806
2749	package CFClient::UI::Inventory;
2750
2751	our @ISA = CFClient::UI::ScrolledWindow::;
2752
2753	sub new {
2754	my $class = shift;
2755
2756	my $self = $class->SUPER::new (
2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758	@_,
2759	);
2760
2761	$self
2762	}
2763
2764	sub set_items {
2765	my ($self, $items) = @_;
2766
2767	$self->{scrolled}->clear;
2768	return unless $items;
2769
2770	my @items = sort {
2771	($a->{type} <=> $b->{type})
2772	or ($a->{name} cmp $b->{name})
2773	} @$items;
2774
2775	$self->{real_items} = \@items;
2776
2777	my $row = 0;
2778	for my $item (@items) {
2779	CFClient::Item::update_widgets $item;
2780
2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785	$row++;
2786	}
2787	}
2788
2789	#############################################################################
2790
2791	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2792		2808
2793	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2794		2810
2795	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2833	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2834	$GRAB = $self;	2850	$GRAB = $self;
2835	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2836		2852
2837	$self->show;	2853	$self->show;
2838	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839	}	2855	}
2840		2856
2841	sub mouse_motion {	2857	sub mouse_motion {
2842	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2843		2859
…		…
2968	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2969	}	2985	}
2970		2986
2971	#############################################################################	2987	#############################################################################
2972		2988
2973	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
2974		2990
2975	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977	use CFClient::OpenGL;
2978		2992
2979	sub new {	2993	sub new {
2980	my $class = shift;	2994	my $class = shift;
2981		2995
2982	$class->SUPER::new (	2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2998	@_,
		2999	);
		3000
		3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
		3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3150
		3151	$self->clear_command_list;
		3152	$self->{recording} = 0;
		3153	$self->{rec_btn}->set_text ("start recording");
		3154
		3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
		3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
		3173
		3174	sub update_binding_widgets {
		3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
		3280	package CFClient::UI::Root;
		3281
		3282	our @ISA = CFClient::UI::Container::;
		3283
		3284	use CFClient::OpenGL;
		3285
		3286	sub new {
		3287	my $class = shift;
		3288
		3289	my $self = $class->SUPER::new (
2983	visible => 1,	3290	visible => 1,
2984	@_,	3291	@_,
2985	)	3292	);
2986	}
2987		3293
2988	sub configure {	3294	Scalar::Util::weaken ($self->{root} = $self);
2989	my ($self, $x, $y, $w, $h) = @_;
2990		3295
2991	$self->{w} = $w;	3296	$self
2992	$self->{h} = $h;
2993	}
2994
2995	sub check_size {
2996	my ($self) = @_;
2997
2998	$self->size_allocate ($self->{w}, $self->{h})
2999	if $self->{w};
3000	}	3297	}
3001		3298
3002	sub size_request {	3299	sub size_request {
3003	my ($self) = @_;	3300	my ($self) = @_;
3004		3301
3005	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
		3303	}
		3304
		3305	sub _to_pixel {
		3306	my ($coord, $size, $max) = @_;
		3307
		3308	$coord =
		3309	$coord eq "center" ? ($max - $size) * 0.5
		3310	: $coord eq "max" ? $max
		3311	: $coord;
		3312
		3313	$coord = 0 if $coord < 0;
		3314	$coord = $max - $size if $coord > $max - $size;
		3315
		3316	int $coord + 0.5
3006	}	3317	}
3007		3318
3008	sub size_allocate {	3319	sub size_allocate {
3009	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
3010		3321
3011	for my $child ($self->children) {	3322	for my $child ($self->children) {
3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013		3324
3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
3015	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
3016		3327
3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
3018	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
3019
3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024		3330
3025	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
3026	}	3332	}
3027	}	3333	}
3028		3334
…		…
3039	}	3345	}
3040		3346
3041	sub update {	3347	sub update {
3042	my ($self) = @_;	3348	my ($self) = @_;
3043		3349
3044	$self->check_size;
3045	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3046	}	3351	}
3047		3352
3048	sub add {	3353	sub add {
3049	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3050		3355
3051	for my $child (@children) {
3052	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3053		3357	for @children;
3054	# integerise window positions
3055	$child->{x} = int $child->{x};
3056	$child->{y} = int $child->{y};
3057	}
3058		3358
3059	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3060
3061	for (my @widgets = @children; my $w = pop @widgets; ) {
3062	push @widgets, $w->children;
3063	$w->set_visible;
3064	}
3065
3066	}	3360	}
3067		3361
3068	sub remove {	3362	sub remove {
3069	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3070		3364
3071	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3072		3369
3073	while (@children) {	3370	while (@children) {
3074	my $w = pop @children;	3371	my $w = pop @children;
3075	push @children, $w->children;	3372	push @children, $w->children;
3076	$w->set_invisible;	3373	$w->set_invisible;
…		…
3095	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3096	$_->()	3393	$_->()
3097	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3098	}	3395	}
3099		3396
3100	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
		3398	my %queue;
3101	my @queue;	3399	my @queue;
		3400	my $widget;
3102		3401
		3402	outer:
3103	while () {	3403	while () {
3104	if ($self->{check_size}) {	3404	if (my $realloc = delete $self->{realloc}) {
3105	#TODO use array-of-depth approach	3405	for $widget (values %$realloc) {
		3406	$widget->{visible} or next; # do not resize invisible widgets
3106		3407
3107	@queue = sort { $a->{visible} <=> $b->{visible} }	3408	$queue{$widget+0}++ and next; # duplicates are common
3108	@queue, values %{delete $self->{check_size}};	3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3109	}	3412	}
3110		3413
		3414	while () {
		3415	@queue or last outer;
		3416
3111	my $widget = pop @queue || last;	3417	$widget = pop @{ $queue[-1] || [] }
3112		3418	and last;
3113	defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116	? @$widget{qw(def_w def_h)}
3117	: $widget->size_request;
3118
3119	if (delete $widget->{force_alloc}
3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122		3419
		3420	pop @queue;
		3421	}
		3422
		3423	delete $queue{$widget+0};
		3424
		3425	my ($w, $h) = $widget->size_request;
		3426
		3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3429
		3430	$w = $widget->{force_w} if exists $widget->{force_w};
		3431	$h = $widget->{force_h} if exists $widget->{force_h};
		3432
		3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3434	|| delete $widget->{force_realloc}) {
3123	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3124	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3125		3437
3126	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3127		3439
3128	$widget->{parent}->check_size
3129	if $widget->{parent};	3440	if (my $parent = $widget->{parent}) {
		3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
3130	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3131	}	3450	}
3132	}	3451	}
3133		3452
3134	while (my $size_alloc = delete $self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3136	values %$size_alloc;	3455	values %$size_alloc;
3137		3456
3138	while () {	3457	while () {
3139	my ($widget, $w, $h) = @{ pop @queue or last };	3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140		3461
3141	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3142	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3143		3464
		3465	$w = int $w + 0.5;
		3466	$h = int $h + 0.5;
		3467
		3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
		3471
3144	$widget->{w} = $w;	3472	$widget->{w} = $w;
3145	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3146	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3147	}	3477	}
3148	}	3478	}
3149		3479
3150	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3151	$_->()	3481	$_->()
3152	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3153	}	3483	}
		3484
3154		3485
3155	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3158		3489
…		…
3160	glLoadIdentity;	3491	glLoadIdentity;
3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3163	glLoadIdentity;	3494	glLoadIdentity;
3164		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3165	$self->_draw;	3503	$self->_draw;
3166	}	3504	}
3167		3505
3168	#############################################################################	3506	#############################################################################
3169		3507

Diff Legend

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