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.248 by root, Sun May 28 01:37:45 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	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
246	return if $self->{parent};	249	return if $self->{parent};
247		250
248	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
249	}	252	}
250		253
251	sub center {
252	my ($self) = @_;
253
254	$CFClient::UI::ROOT->on_post_alloc (
255	"center_$self" => sub {
256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257	},
258	);
259
260	$self->update;
261	}
262
263	sub set_visible {	254	sub set_visible {
264	my ($self) = @_;	255	my ($self) = @_;
265		256
266	return if $self->{visible};	257	return if $self->{visible};
267		258
268	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
270		261
271	$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;
272	}	267	}
273		268
274	sub set_invisible {	269	sub set_invisible {
275	my ($self) = @_;	270	my ($self) = @_;
276		271
277	return unless $self->{visible};	272	return unless $self->{visible};
278		273
279	# broken show/hide model	274	$_->set_invisible for $self->children;
280		275
281	delete $self->{root};	276	delete $self->{root};
282	delete $self->{visible};	277	delete $self->{visible};
283		278
284	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
286		281
287	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
289		284
290	$self->focus_out;	285	$self->focus_out;
291		286
292	$self->emit (visibility_change => 0);	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;
293	}	305	}
294		306
295	sub hide {	307	sub hide {
296	my ($self) = @_;	308	my ($self) = @_;
297		309
…		…
299		311
300	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
301	if $self->{parent};	313	if $self->{parent};
302	}	314	}
303		315
304	sub move {	316	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
306		318
307	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
308	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
309	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
310		322
311	$self->update;	323	$self->update;
312	}	324	}
313		325
314	sub set_size {	326	sub set_size {
315	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
316		328
317	$self->{def_w} = $w;	329	$self->{force_w} = $w;
318	$self->{def_h} = $h;	330	$self->{force_h} = $h;
319		331
320	$self->check_size;	332	$self->realloc;
321	}	333	}
322		334
323	sub size_request {	335	sub size_request {
324	require Carp;	336	require Carp;
325	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
327		339
328	sub configure {	340	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
330		342
331	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
334		348
335	# use alignment to adjust x, y	349	# use alignment to adjust x, y
336		350
337	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	353	}
342		354
343	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	356	$self->{x} = $x;
345	$self->{y} = $y;	357	$self->{y} = $y;
346	$self->update;	358	$self->update;
347	}	359	}
348		360
349	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$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;
351	}	368	}
352	}	369	}
353		370
354	sub size_allocate {	371	sub size_allocate {
355	# nothing to be done	372	# nothing to be done
356	}
357
358	sub reconfigure {
359	my ($self) = @_;
360
361	$self->check_size (1);
362	$self->update;
363	}	373	}
364		374
365	sub children {	375	sub children {
366	}	376	}
367		377
…		…
440	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
441		451
442	$self->focus_in;	452	$self->focus_in;
443	}	453	}
444		454
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
449	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
450		528
451	sub draw {	529	sub draw {
452	my ($self) = @_;	530	my ($self) = @_;
453		531
454	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);
455		543
456	glPushMatrix;	544	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;	546	$self->_draw;
459	glPopMatrix;	547	glPopMatrix;
…		…
471	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
472	glEnd;	560	glEnd;
473	glDisable GL_BLEND;	561	glDisable GL_BLEND;
474	}	562	}
475		563
476	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	565	glPushMatrix;
478	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
492	my ($self) = @_;	580	my ($self) = @_;
493		581
494	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
495	}	583	}
496		584
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516	$self->check_size;
517	}
518
519	sub check_size {
520	my ($self, $forced) = @_;
521
522	$self->{force_alloc} = 1 if $forced;
523	$CFClient::UI::ROOT->{check_size}{$self} = $self;
524	}
525
526	sub update {
527	my ($self) = @_;
528
529	$self->{parent}->update
530	if $self->{parent};
531	}
532
533	sub connect {
534	my ($self, $signal, $cb) = @_;
535
536	push @{ $self->{signal_cb}{$signal} }, $cb;
537	}
538
539	sub _emit {
540	my ($self, $signal, @args) = @_;
541
542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543	}
544
545	sub emit {
546	my ($self, $signal, @args) = @_;
547
548	$self->_emit ($signal, @args)
549	|| $self->$signal (@args);
550	}
551
552	sub visibility_change {
553	#my ($self, $visible) = @_;
554	}
555
556	sub DESTROY {	585	sub DESTROY {
557	my ($self) = @_;	586	my ($self) = @_;
558		587
559	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
560	#$self->deactivate;	589	#$self->deactivate;
…		…
616	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
617	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
618	}	647	}
619		648
620	sub size_request {	649	sub size_request {
621	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
622	}	653	}
623		654
624	sub draw { }	655	sub draw { }
625		656
626	#############################################################################	657	#############################################################################
…		…
655	$self->{children} = [	686	$self->{children} = [
656	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
657	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
658	];	689	];
659		690
660	$self->check_size (1);	691	$self->realloc;
661	$self->update;
662	}	692	}
663		693
664	sub children {	694	sub children {
665	@{ $_[0]{children} }	695	@{ $_[0]{children} }
666	}	696	}
…		…
671	delete $child->{parent};	701	delete $child->{parent};
672	$child->hide;	702	$child->hide;
673		703
674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675		705
676	$self->check_size (1);	706	$self->realloc;
677	$self->update;
678	}	707	}
679		708
680	sub clear {	709	sub clear {
681	my ($self) = @_;	710	my ($self) = @_;
682		711
…		…
686	for (@$children) {	715	for (@$children) {
687	delete $_->{parent};	716	delete $_->{parent};
688	$_->hide;	717	$_->hide;
689	}	718	}
690		719
691	$self->check_size;	720	$self->realloc;
692	$self->update;
693	}	721	}
694		722
695	sub find_widget {	723	sub find_widget {
696	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
697		725
…		…
784	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
785	$self->update;	813	$self->update;
786	}	814	}
787		815
788	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
789	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
790	}	820	}
791		821
792	sub render_child {	822	sub render_child {
793	my ($self) = @_;	823	my ($self) = @_;
794		824
795	$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 {
796	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
797	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
798		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
799	$self->_render;	836	$self->_render;
800	};	837	};
801	}	838	}
802		839
803	sub _draw {	840	sub _draw {
804	my ($self) = @_;	841	my ($self) = @_;
805		842
806	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
807		844
808	my $tex = $self->{texture}	845	my $tex = $self->{texture}
809	or return;	846	or return;
810		847
811	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
834	}	871	}
835		872
836	sub size_request {	873	sub size_request {
837	my ($self) = @_;	874	my ($self) = @_;
838		875
839	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)};
840		877
841	$w = 10 if $self->{scroll_x};	878	$w = 10 if $self->{scroll_x};
842	$h = 10 if $self->{scroll_y};	879	$h = 10 if $self->{scroll_y};
843		880
844	($w, $h)	881	($w, $h)
845	}	882	}
846		883
847	sub size_allocate {	884	sub size_allocate {
848	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
849		886
		887	my $child = $self->child;
		888
850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852		891
853	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
854	$self->update;	893	$self->update;
855	}	894	}
856		895
…		…
891	}	930	}
892	}	931	}
893		932
894	sub _render {	933	sub _render {
895	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};
896		938
897	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898		940
899	$self->SUPER::_render;	941	$self->SUPER::_render;
900	}	942	}
…		…
999		1041
1000	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
1001		1043
1002	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
1003		1045
1004	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 =
1005	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006	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);
1007		1053
1008	sub new {	1054	sub new {
1009	my $class = shift;	1055	my $class = shift;
1010		1056
1011	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1060	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
1017	@_	1064	@_
1018	);	1065	);
1019		1066
1020	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
1021	align => 0,	1068	align => 0,
…		…
1074	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
1075		1122
1076	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
1078		1125
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1128
1084	$self->check_size;	1129	$self->realloc;
		1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1131	};
1086		1132
1087	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1137	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1093		1139
1094	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1095		1141
1096	$self->{user_x} = $bx + $x - $ox;	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;
1098
1099	$self->move ($self->{user_x}, $self->{user_y});
1100	$self->update;
1101	};	1143	};
1102	}	1144	}
1103	}	1145	}
1104		1146
1105	sub button_up {	1147	sub button_up {
…		…
1124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125		1167
1126	my $border = $self->border;	1168	my $border = $self->border;
1127		1169
1128	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1129	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1130	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133		1175
1134	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1136		1178
1137	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1138	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1139	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1140
1141	glColor @{ $self->{bg} };
1142
1143	$bg->{s} = $rep_x;
1144	$bg->{t} = $rep_y;
1145	$bg->{wrap_mode} = 1;
1146	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147	}	1184	}
1148		1185
1149	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1150		1187
…		…
1180	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1181		1218
1182	$child->set_parent ($self);	1219	$child->set_parent ($self);
1183	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1184		1221
1185	$self->check_size (1);	1222	$self->realloc;
1186	}	1223	}
1187		1224
1188	# 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?
1189	sub clear {	1226	sub clear {
1190	my ($self) = @_;	1227	my ($self) = @_;
…		…
1195	for (@children) {	1232	for (@children) {
1196	delete $_->{parent};	1233	delete $_->{parent};
1197	$_->hide;	1234	$_->hide;
1198	}	1235	}
1199		1236
1200	$self->check_size (1);	1237	$self->realloc;
1201	$self->update;
1202	}	1238	}
1203		1239
1204	sub get_wh {	1240	sub get_wh {
1205	my ($self) = @_;	1241	my ($self) = @_;
1206		1242
…		…
1414	ellipsise => 3, # end	1450	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1416	fontsize => 1,	1452	fontsize => 1,
1417	align => -1,	1453	align => -1,
1418	valign => -1,	1454	valign => -1,
1419	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1420	can_events => 0,	1457	can_events => 0,
1421	%arg	1458	%arg
1422	);	1459	);
1423		1460
1424	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1461		1498
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1464		1501
		1502	$self->realloc;
1465	$self->update;	1503	$self->update;
1466	$self->check_size;
1467	}	1504	}
1468		1505
1469	sub set_markup {	1506	sub set_markup {
1470	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1471		1508
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1513
1477	$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;
1478	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1479		1516
		1517	$self->realloc;
1480	$self->update;	1518	$self->update;
1481	$self->check_size;
1482	}	1519	}
1483		1520
1484	sub size_request {	1521	sub size_request {
1485	my ($self) = @_;	1522	my ($self) = @_;
1486		1523
…		…
1500		1537
1501	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1503	}	1540	}
1504		1541
1505	(	1542	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1543	}
1510		1544
1511	sub size_allocate {	1545	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1513		1547
1514	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1550	}
1516		1551
1517	sub set_fontsize {	1552	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1519		1554
1520	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1556	delete $self->{texture};
1522		1557
1523	$self->update;	1558	$self->realloc;
1524	$self->check_size;
1525	}	1559	}
1526		1560
1527	sub _draw {	1561	sub _draw {
1528	my ($self) = @_;	1562	my ($self) = @_;
1529		1563
…		…
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1573
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1541		1575
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1545		1579
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1549		1583
1550	$tex	1584	$tex
1551	};	1585	};
1552		1586
…		…
1609	sub set_text {	1643	sub set_text {
1610	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1611		1645
1612	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1647	$self->_set_text ($text);
1614	$self->update;	1648
1615	$self->check_size;	1649	$self->realloc;
1616	}	1650	}
1617		1651
1618	sub get_text {	1652	sub get_text {
1619	$_[0]{text}	1653	$_[0]{text}
1620	}	1654	}
…		…
1653	} elsif ($uni) {	1687	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1655	}	1689	}
1656		1690
1657	$self->_set_text ($text);	1691	$self->_set_text ($text);
1658	$self->update;	1692
1659	$self->check_size;	1693	$self->realloc;
1660	}	1694	}
1661		1695
1662	sub focus_in {	1696	sub focus_in {
1663	my ($self) = @_;	1697	my ($self) = @_;
1664		1698
…		…
1791		1825
1792	sub new {	1826	sub new {
1793	my $class = shift;	1827	my $class = shift;
1794		1828
1795	$class->SUPER::new (	1829	$class->SUPER::new (
1796	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1797	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1799	can_hover => 1,	1834	can_hover => 1,
1800	align => 0,	1835	align => 0,
1801	valign => 0,	1836	valign => 0,
…		…
1848		1883
1849	sub new {	1884	sub new {
1850	my $class = shift;	1885	my $class = shift;
1851		1886
1852	$class->SUPER::new (	1887	$class->SUPER::new (
1853	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1854	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1894	state => 0,
…		…
1862	}	1898	}
1863		1899
1864	sub size_request {	1900	sub size_request {
1865	my ($self) = @_;	1901	my ($self) = @_;
1866		1902
1867	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1868	}	1904	}
1869		1905
1870	sub button_down {	1906	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1872		1908
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1877	}	1913	}
1878	}	1914	}
1879		1915
1880	sub _draw {	1916	sub _draw {
1881	my ($self) = @_;	1917	my ($self) = @_;
1882		1918
1883	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1884		1920
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1922
1887	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;
1888		1926
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1928
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1930
…		…
2157	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2164	vertical => 0,	2202	vertical => 0,
2165	can_hover => 1,	2203	can_hover => 1,
2166	inner_pad => 0.02,	2204	inner_pad => 0.02,
2167	@_	2205	@_
2168	);	2206	);
…		…
2171	$self->update;	2209	$self->update;
2172		2210
2173	$self	2211	$self
2174	}	2212	}
2175		2213
		2214	sub changed { }
		2215
2176	sub set_range {	2216	sub set_range {
2177	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2178		2218
2179	($range, $self->{range}) = ($self->{range}, $range);	2219	($range, $self->{range}) = ($self->{range}, $range);
2180		2220
…		…
2206	}	2246	}
2207		2247
2208	sub size_request {	2248	sub size_request {
2209	my ($self) = @_;	2249	my ($self) = @_;
2210		2250
2211	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2252	}
2216		2253
2217	sub button_down {	2254	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2219		2256
…		…
2604	}	2641	}
2605		2642
2606	sub set_tooltip_from {	2643	sub set_tooltip_from {
2607	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2608		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
2609	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2610	markup => $widget->{tooltip},	2656	markup => $tooltip,
2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612	fontsize => 0.8,	2658	fontsize => 0.8,
2613	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2614	ellipsise => 0,	2660	ellipsise => 0,
2615	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2626		2672
2627	sub size_allocate {	2673	sub size_allocate {
2628	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2629		2675
2630	$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	});
2631	}	2695	}
2632		2696
2633	sub _draw {	2697	sub _draw {
2634	my ($self) = @_;	2698	my ($self) = @_;
2635		2699
…		…
2652	glVertex $w, $h;	2716	glVertex $w, $h;
2653	glVertex $w, 0;	2717	glVertex $w, 0;
2654	glEnd;	2718	glEnd;
2655		2719
2656	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2657	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2658	}	2723	}
2659		2724
2660	#############################################################################	2725	#############################################################################
2661		2726
…		…
2737	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2738	}	2803	}
2739		2804
2740	#############################################################################	2805	#############################################################################
2741		2806
2742	package CFClient::UI::Inventory;
2743
2744	our @ISA = CFClient::UI::ScrolledWindow::;
2745
2746	sub new {
2747	my $class = shift;
2748
2749	my $self = $class->SUPER::new (
2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751	@_,
2752	);
2753
2754	$self
2755	}
2756
2757	sub set_items {
2758	my ($self, $items) = @_;
2759
2760	$self->{scrolled}->clear;
2761	return unless $items;
2762
2763	my @items = sort {
2764	($a->{type} <=> $b->{type})
2765	or ($a->{name} cmp $b->{name})
2766	} @$items;
2767
2768	$self->{real_items} = \@items;
2769
2770	my $row = 0;
2771	for my $item (@items) {
2772	CFClient::Item::update_widgets $item;
2773
2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778	$row++;
2779	}
2780	}
2781
2782	#############################################################################
2783
2784	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2785		2808
2786	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2787		2810
2788	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2826	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2827	$GRAB = $self;	2850	$GRAB = $self;
2828	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2829		2852
2830	$self->show;	2853	$self->show;
2831	$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);
2832	}	2855	}
2833		2856
2834	sub mouse_motion {	2857	sub mouse_motion {
2835	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2836		2859
…		…
2961	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2962	}	2985	}
2963		2986
2964	#############################################################################	2987	#############################################################################
2965		2988
2966	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
2967		2990
2968	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970	use CFClient::OpenGL;
2971		2992
2972	sub new {	2993	sub new {
2973	my $class = shift;	2994	my $class = shift;
2974		2995
2975	$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 (
2976	visible => 1,	3290	visible => 1,
2977	@_,	3291	@_,
2978	)	3292	);
2979	}
2980		3293
2981	sub configure {	3294	Scalar::Util::weaken ($self->{root} = $self);
2982	my ($self, $x, $y, $w, $h) = @_;
2983		3295
2984	$self->{w} = $w;	3296	$self
2985	$self->{h} = $h;
2986	}
2987
2988	sub check_size {
2989	my ($self) = @_;
2990
2991	$self->size_allocate ($self->{w}, $self->{h})
2992	if $self->{w};
2993	}	3297	}
2994		3298
2995	sub size_request {	3299	sub size_request {
2996	my ($self) = @_;	3300	my ($self) = @_;
2997		3301
2998	($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
2999	}	3317	}
3000		3318
3001	sub size_allocate {	3319	sub size_allocate {
3002	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
3003		3321
3004	for my $child ($self->children) {	3322	for my $child ($self->children) {
3005	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)};
3006		3324
3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
3008	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
3009		3327
3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
3011	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
3012
3013	delete @$child{qw(req_x req_y)};
3014
3015	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017		3330
3018	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
3019	}	3332	}
3020	}	3333	}
3021		3334
…		…
3032	}	3345	}
3033		3346
3034	sub update {	3347	sub update {
3035	my ($self) = @_;	3348	my ($self) = @_;
3036		3349
3037	$self->check_size;
3038	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3039	}	3351	}
3040		3352
3041	sub add {	3353	sub add {
3042	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3043		3355
3044	for my $child (@children) {
3045	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3046		3357	for @children;
3047	# integerise window positions
3048	$child->{x} = int $child->{x};
3049	$child->{y} = int $child->{y};
3050	}
3051		3358
3052	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3053
3054	for (my @widgets = @children; my $w = pop @widgets; ) {
3055	push @widgets, $w->children;
3056	$w->set_visible;
3057	}
3058
3059	}	3360	}
3060		3361
3061	sub remove {	3362	sub remove {
3062	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3063		3364
3064	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3065		3369
3066	while (@children) {	3370	while (@children) {
3067	my $w = pop @children;	3371	my $w = pop @children;
3068	push @children, $w->children;	3372	push @children, $w->children;
3069	$w->set_invisible;	3373	$w->set_invisible;
…		…
3088	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3089	$_->()	3393	$_->()
3090	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3091	}	3395	}
3092		3396
3093	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
		3398	my %queue;
3094	my @queue;	3399	my @queue;
		3400	my $widget;
3095		3401
3096	for (;;) {	3402	outer:
3097	if ($self->{check_size}) {	3403	while () {
3098	#TODO use array-of-depth approach	3404	if (my $realloc = delete $self->{realloc}) {
		3405	for $widget (values %$realloc) {
		3406	$widget->{visible} or next; # do not resize invisible widgets
3099		3407
3100	@queue = sort { $a->{visible} <=> $b->{visible} }	3408	$queue{$widget+0}++ and next; # duplicates are common
3101	@queue, values %{delete $self->{check_size}};	3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3102	}	3412	}
3103		3413
		3414	while () {
		3415	@queue or last outer;
		3416
3104	my $widget = pop @queue || last;	3417	$widget = pop @{ $queue[-1] || [] }
3105		3418	and last;
3106	defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109	? @$widget{qw(def_w def_h)}
3110	: $widget->size_request;
3111
3112	if (delete $widget->{force_alloc}
3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115		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}) {
3116	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3117	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3118		3437
3119	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3120		3439
3121	$widget->{parent}->check_size
3122	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	}
3123	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3124	}	3450	}
3125	}	3451	}
3126		3452
3127	while ($self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3128	for (values %{delete $self->{size_alloc}}) {	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3129	my ($widget, $w, $h) = @$_;	3455	values %$size_alloc;
		3456
		3457	while () {
		3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130		3461
3131	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3132	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3133		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
3134	$widget->{w} = $w;	3472	$widget->{w} = $w;
3135	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3136	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3137	}	3477	}
3138	}	3478	}
3139		3479
3140	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3141	$_->()	3481	$_->()
3142	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3143	}	3483	}
		3484
3144		3485
3145	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3148		3489
…		…
3150	glLoadIdentity;	3491	glLoadIdentity;
3151	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3153	glLoadIdentity;	3494	glLoadIdentity;
3154		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
3155	$self->_draw;	3503	$self->_draw;
3156	}	3504	}
3157		3505
3158	#############################################################################	3506	#############################################################################
3159		3507

Diff Legend

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