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.267 by root, Thu Jun 1 04:10:29 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} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += $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} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= $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	local $draw_x = $draw_x + $self->{x};
		535	local $draw_y = $draw_y + $self->{y};
		536
		537	return if $draw_x + $self->{w} < 0;
		538	return if $draw_x >= $draw_w;
		539	return if $draw_y + $self->{h} < 0;
		540	return if $draw_y >= $draw_h;
455		541
456	glPushMatrix;	542	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	543	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;	544	$self->_draw;
459	glPopMatrix;	545	glPopMatrix;
…		…
471	glVertex $x , $y + $self->{h};	557	glVertex $x , $y + $self->{h};
472	glEnd;	558	glEnd;
473	glDisable GL_BLEND;	559	glDisable GL_BLEND;
474	}	560	}
475		561
476	if ($ENV{PCLIENT_DEBUG}) {	562	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	563	glPushMatrix;
478	glColor 1, 1, 0, 1;	564	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480	glBegin GL_LINE_LOOP;	566	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	567	glVertex 0 , 0;
…		…
492	my ($self) = @_;	578	my ($self) = @_;
493		579
494	warn "no draw defined for $self\n";	580	warn "no draw defined for $self\n";
495	}	581	}
496		582
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 {	583	sub DESTROY {
557	my ($self) = @_;	584	my ($self) = @_;
558		585
559	delete $WIDGET{$self+0};	586	delete $WIDGET{$self+0};
560	#$self->deactivate;	587	#$self->deactivate;
…		…
616	my ($class, %arg) = @_;	643	my ($class, %arg) = @_;
617	$class->SUPER::new (can_events => 0, %arg);	644	$class->SUPER::new (can_events => 0, %arg);
618	}	645	}
619		646
620	sub size_request {	647	sub size_request {
621	(0, 0)	648	my ($self) = @_;
		649
		650	($self->{w} + 0, $self->{h} + 0)
622	}	651	}
623		652
624	sub draw { }	653	sub draw { }
625		654
626	#############################################################################	655	#############################################################################
…		…
655	$self->{children} = [	684	$self->{children} = [
656	sort { $a->{z} <=> $b->{z} }	685	sort { $a->{z} <=> $b->{z} }
657	@{$self->{children}}, @widgets	686	@{$self->{children}}, @widgets
658	];	687	];
659		688
660	$self->check_size (1);	689	$self->realloc;
661	$self->update;
662	}	690	}
663		691
664	sub children {	692	sub children {
665	@{ $_[0]{children} }	693	@{ $_[0]{children} }
666	}	694	}
…		…
671	delete $child->{parent};	699	delete $child->{parent};
672	$child->hide;	700	$child->hide;
673		701
674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	702	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675		703
676	$self->check_size (1);	704	$self->realloc;
677	$self->update;
678	}	705	}
679		706
680	sub clear {	707	sub clear {
681	my ($self) = @_;	708	my ($self) = @_;
682		709
…		…
686	for (@$children) {	713	for (@$children) {
687	delete $_->{parent};	714	delete $_->{parent};
688	$_->hide;	715	$_->hide;
689	}	716	}
690		717
691	$self->check_size;	718	$self->realloc;
692	$self->update;
693	}	719	}
694		720
695	sub find_widget {	721	sub find_widget {
696	my ($self, $x, $y) = @_;	722	my ($self, $x, $y) = @_;
697		723
…		…
784	$self->SUPER::size_allocate ($w, $h);	810	$self->SUPER::size_allocate ($w, $h);
785	$self->update;	811	$self->update;
786	}	812	}
787		813
788	sub _render {	814	sub _render {
		815	my ($self) = @_;
		816
789	$_[0]{children}[0]->draw;	817	$self->{children}[0]->draw;
790	}	818	}
791		819
792	sub render_child {	820	sub render_child {
793	my ($self) = @_;	821	my ($self) = @_;
794		822
795	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	823	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796	glClearColor 0, 0, 0, 0;	824	glClearColor 0, 0, 0, 0;
797	glClear GL_COLOR_BUFFER_BIT;	825	glClear GL_COLOR_BUFFER_BIT;
798		826
		827	{
		828	package CFClient::UI::Base;
		829
		830	($draw_x, $draw_y, $draw_w, $draw_h) =
		831	(0, 0, $self->{w}, $self->{h});
		832	}
		833
799	$self->_render;	834	$self->_render;
800	};	835	};
801	}	836	}
802		837
803	sub _draw {	838	sub _draw {
804	my ($self) = @_;	839	my ($self) = @_;
805		840
806	my ($w, $h) = ($self->w, $self->h);	841	my ($w, $h) = @$self{qw(w h)};
807		842
808	my $tex = $self->{texture}	843	my $tex = $self->{texture}
809	or return;	844	or return;
810		845
811	glEnable GL_TEXTURE_2D;	846	glEnable GL_TEXTURE_2D;
…		…
834	}	869	}
835		870
836	sub size_request {	871	sub size_request {
837	my ($self) = @_;	872	my ($self) = @_;
838		873
839	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	874	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840		875
841	$w = 10 if $self->{scroll_x};	876	$w = 10 if $self->{scroll_x};
842	$h = 10 if $self->{scroll_y};	877	$h = 10 if $self->{scroll_y};
843		878
844	($w, $h)	879	($w, $h)
845	}	880	}
846		881
847	sub size_allocate {	882	sub size_allocate {
848	my ($self, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
849		884
		885	my $child = $self->child;
		886
850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	887	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	888	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852		889
853	$self->child->configure (0, 0, $w, $h);	890	$self->child->configure (0, 0, $w, $h);
854	$self->update;	891	$self->update;
855	}	892	}
856		893
…		…
891	}	928	}
892	}	929	}
893		930
894	sub _render {	931	sub _render {
895	my ($self) = @_;	932	my ($self) = @_;
		933
		934	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		935	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
896		936
897	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	937	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898		938
899	$self->SUPER::_render;	939	$self->SUPER::_render;
900	}	940	}
…		…
999		1039
1000	our @ISA = CFClient::UI::Bin::;	1040	our @ISA = CFClient::UI::Bin::;
1001		1041
1002	use CFClient::OpenGL;	1042	use CFClient::OpenGL;
1003		1043
1004	my @tex =	1044	my $bg =
		1045	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1046	mipmap => 1, wrap => 1;
		1047
		1048	my @border =
1005	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1049	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);	1050	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007		1051
1008	sub new {	1052	sub new {
1009	my $class = shift;	1053	my $class = shift;
1010		1054
1011	my $self = $class->SUPER::new (	1055	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1056	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1057	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1058	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1059	can_events => 1,
		1060	min_w => 16,
		1061	min_h => 16,
1017	@_	1062	@_
1018	);	1063	);
1019		1064
1020	$self->{title} &&= new CFClient::UI::Label	1065	$self->{title} &&= new CFClient::UI::Label
1021	align => 0,	1066	align => 0,
…		…
1074	my ($ev, $x, $y) = @_;	1119	my ($ev, $x, $y) = @_;
1075		1120
1076	my $dx = $ev->{x} - $ox;	1121	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1122	my $dy = $ev->{y} - $oy;
1078		1123
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1126
1084	$self->check_size;	1127	$self->realloc;
		1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1129	};
1086		1130
1087	} elsif ($lr ^ $td) {	1131	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1133	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1135	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1136	my ($ev, $x, $y) = @_;
1093		1137
1094	($x, $y) = ($ev->{x}, $ev->{y});	1138	($x, $y) = ($ev->{x}, $ev->{y});
1095		1139
1096	$self->{user_x} = $bx + $x - $ox;	1140	$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	};	1141	};
1102	}	1142	}
1103	}	1143	}
1104		1144
1105	sub button_up {	1145	sub button_up {
…		…
1124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125		1165
1126	my $border = $self->border;	1166	my $border = $self->border;
1127		1167
1128	glColor @{ $self->{border_bg} };	1168	glColor @{ $self->{border_bg} };
1129	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1169	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1130	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1170	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1171	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1172	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133		1173
1134	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1174	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135	my $bg = $tex[0];	1175	glColor @{ $self->{bg} };
1136		1176
1137	# TODO: repeat texture not scale	1177	# TODO: repeat texture not scale
		1178	# solve this better(?)
1138	my $rep_x = $cw / $bg->{w};	1179	$bg->{s} = $cw / $bg->{w};
1139	my $rep_y = $ch / $bg->{h};	1180	$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);	1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147	}	1182	}
1148		1183
1149	glDisable GL_TEXTURE_2D;	1184	glDisable GL_TEXTURE_2D;
1150		1185
…		…
1180	my ($self, $x, $y, $child) = @_;	1215	my ($self, $x, $y, $child) = @_;
1181		1216
1182	$child->set_parent ($self);	1217	$child->set_parent ($self);
1183	$self->{children}[$y][$x] = $child;	1218	$self->{children}[$y][$x] = $child;
1184		1219
1185	$self->check_size (1);	1220	$self->realloc;
1186	}	1221	}
1187		1222
1188	# TODO: move to container class maybe? send children a signal on removal?	1223	# TODO: move to container class maybe? send children a signal on removal?
1189	sub clear {	1224	sub clear {
1190	my ($self) = @_;	1225	my ($self) = @_;
…		…
1195	for (@children) {	1230	for (@children) {
1196	delete $_->{parent};	1231	delete $_->{parent};
1197	$_->hide;	1232	$_->hide;
1198	}	1233	}
1199		1234
1200	$self->check_size (1);	1235	$self->realloc;
1201	$self->update;
1202	}	1236	}
1203		1237
1204	sub get_wh {	1238	sub get_wh {
1205	my ($self) = @_;	1239	my ($self) = @_;
1206		1240
…		…
1414	ellipsise => 3, # end	1448	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1449	layout => (new CFClient::Layout),
1416	fontsize => 1,	1450	fontsize => 1,
1417	align => -1,	1451	align => -1,
1418	valign => -1,	1452	valign => -1,
1419	padding => 2,	1453	padding_x => 2,
		1454	padding_y => 2,
1420	can_events => 0,	1455	can_events => 0,
1421	%arg	1456	%arg
1422	);	1457	);
1423		1458
1424	if (exists $self->{template}) {	1459	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1495	$self->{text} = "T$text";
1461		1496
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1498	$self->{layout}->set_text ($text);
1464		1499
		1500	$self->realloc;
1465	$self->update;	1501	$self->update;
1466	$self->check_size;
1467	}	1502	}
1468		1503
1469	sub set_markup {	1504	sub set_markup {
1470	my ($self, $markup) = @_;	1505	my ($self, $markup) = @_;
1471		1506
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1511
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1512	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1513	$self->{layout}->set_markup ($markup);
1479		1514
		1515	$self->realloc;
1480	$self->update;	1516	$self->update;
1481	$self->check_size;
1482	}	1517	}
1483		1518
1484	sub size_request {	1519	sub size_request {
1485	my ($self) = @_;	1520	my ($self) = @_;
1486		1521
…		…
1500		1535
1501	$w = List::Util::max $w, $w2;	1536	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1537	$h = List::Util::max $h, $h2;
1503	}	1538	}
1504		1539
1505	(	1540	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1541	}
1510		1542
1511	sub size_allocate {	1543	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1513		1545
1514	delete $self->{texture};	1546	delete $self->{texture}
		1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1548	}
1516		1549
1517	sub set_fontsize {	1550	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1551	my ($self, $fontsize) = @_;
1519		1552
1520	$self->{fontsize} = $fontsize;	1553	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1554	delete $self->{texture};
1522		1555
1523	$self->update;	1556	$self->realloc;
1524	$self->check_size;
1525	}	1557	}
1526		1558
1527	sub _draw {	1559	sub _draw {
1528	my ($self) = @_;	1560	my ($self) = @_;
1529		1561
…		…
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1571
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1572	my $tex = new_from_layout CFClient::Texture $self->{layout};
1541		1573
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1576	: ($self->{w} - $tex->{w}) * 0.5);
1545		1577
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1580	: ($self->{h} - $tex->{h}) * 0.5);
1549		1581
1550	$tex	1582	$tex
1551	};	1583	};
1552		1584
…		…
1609	sub set_text {	1641	sub set_text {
1610	my ($self, $text) = @_;	1642	my ($self, $text) = @_;
1611		1643
1612	$self->{cursor} = length $text;	1644	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1645	$self->_set_text ($text);
1614	$self->update;	1646
1615	$self->check_size;	1647	$self->realloc;
1616	}	1648	}
1617		1649
1618	sub get_text {	1650	sub get_text {
1619	$_[0]{text}	1651	$_[0]{text}
1620	}	1652	}
…		…
1653	} elsif ($uni) {	1685	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1686	substr $text, $self->{cursor}++, 0, chr $uni;
1655	}	1687	}
1656		1688
1657	$self->_set_text ($text);	1689	$self->_set_text ($text);
1658	$self->update;	1690
1659	$self->check_size;	1691	$self->realloc;
1660	}	1692	}
1661		1693
1662	sub focus_in {	1694	sub focus_in {
1663	my ($self) = @_;	1695	my ($self) = @_;
1664		1696
…		…
1791		1823
1792	sub new {	1824	sub new {
1793	my $class = shift;	1825	my $class = shift;
1794		1826
1795	$class->SUPER::new (	1827	$class->SUPER::new (
1796	padding => 4,	1828	padding_x => 4,
		1829	padding_y => 4,
1797	fg => [1, 1, 1],	1830	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1831	active_fg => [0, 0, 1],
1799	can_hover => 1,	1832	can_hover => 1,
1800	align => 0,	1833	align => 0,
1801	valign => 0,	1834	valign => 0,
…		…
1848		1881
1849	sub new {	1882	sub new {
1850	my $class = shift;	1883	my $class = shift;
1851		1884
1852	$class->SUPER::new (	1885	$class->SUPER::new (
1853	padding => 2,	1886	padding_x => 2,
		1887	padding_y => 2,
1854	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1889	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1890	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1891	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1892	state => 0,
…		…
1862	}	1896	}
1863		1897
1864	sub size_request {	1898	sub size_request {
1865	my ($self) = @_;	1899	my ($self) = @_;
1866		1900
1867	($self->{padding} * 2 + 6) x 2	1901	(6) x 2
1868	}	1902	}
1869		1903
1870	sub button_down {	1904	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1872		1906
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1909	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1910	$self->_emit (changed => $self->{state});
1877	}	1911	}
1878	}	1912	}
1879		1913
1880	sub _draw {	1914	sub _draw {
1881	my ($self) = @_;	1915	my ($self) = @_;
1882		1916
1883	$self->SUPER::_draw;	1917	$self->SUPER::_draw;
1884		1918
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1919	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1920
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1921	my ($w, $h) = @$self{qw(w h)};
		1922
		1923	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1924
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1925	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1926
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1927	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1928
…		…
2157	fg => [1, 1, 1],	2193	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2194	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2195	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2196	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2197	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2198	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2199	min_h => $::WIDTH / 80,
2164	vertical => 0,	2200	vertical => 0,
2165	can_hover => 1,	2201	can_hover => 1,
2166	inner_pad => 0.02,	2202	inner_pad => 0.02,
2167	@_	2203	@_
2168	);	2204	);
…		…
2171	$self->update;	2207	$self->update;
2172		2208
2173	$self	2209	$self
2174	}	2210	}
2175		2211
		2212	sub changed { }
		2213
2176	sub set_range {	2214	sub set_range {
2177	my ($self, $range) = @_;	2215	my ($self, $range) = @_;
2178		2216
2179	($range, $self->{range}) = ($self->{range}, $range);	2217	($range, $self->{range}) = ($self->{range}, $range);
2180		2218
…		…
2206	}	2244	}
2207		2245
2208	sub size_request {	2246	sub size_request {
2209	my ($self) = @_;	2247	my ($self) = @_;
2210		2248
2211	my $w = $self->{req_w};	2249	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2250	}
2216		2251
2217	sub button_down {	2252	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2253	my ($self, $ev, $x, $y) = @_;
2219		2254
…		…
2604	}	2639	}
2605		2640
2606	sub set_tooltip_from {	2641	sub set_tooltip_from {
2607	my ($self, $widget) = @_;	2642	my ($self, $widget) = @_;
2608		2643
		2644	my $tooltip = $widget->{tooltip};
		2645
		2646	if ($ENV{CFPLUS_DEBUG} & 2) {
		2647	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2648	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2649	. "req $widget->{req_w} $widget->{req_h}\n"
		2650	. "visible $widget->{visible}";
		2651	}
		2652
2609	$self->add (new CFClient::UI::Label	2653	$self->add (new CFClient::UI::Label
2610	markup => $widget->{tooltip},	2654	markup => $tooltip,
2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2655	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612	fontsize => 0.8,	2656	fontsize => 0.8,
2613	fg => [0, 0, 0, 1],	2657	fg => [0, 0, 0, 1],
2614	ellipsise => 0,	2658	ellipsise => 0,
2615	font => ($widget->{tooltip_font} || $::FONT_PROP),	2659	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2626		2670
2627	sub size_allocate {	2671	sub size_allocate {
2628	my ($self, $w, $h) = @_;	2672	my ($self, $w, $h) = @_;
2629		2673
2630	$self->SUPER::size_allocate ($w - 4, $h - 4);	2674	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2675	}
		2676
		2677	sub visibility_change {
		2678	my ($self, $visible) = @_;
		2679
		2680	return unless $visible;
		2681
		2682	$self->{root}->on_post_alloc ("move_$self" => sub {
		2683	my $widget = $self->{owner}
		2684	or return;
		2685
		2686	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2687
		2688	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2689	if $x + $self->{w} > $::WIDTH;
		2690
		2691	$self->move_abs ($x, $y);
		2692	});
2631	}	2693	}
2632		2694
2633	sub _draw {	2695	sub _draw {
2634	my ($self) = @_;	2696	my ($self) = @_;
2635		2697
…		…
2652	glVertex $w, $h;	2714	glVertex $w, $h;
2653	glVertex $w, 0;	2715	glVertex $w, 0;
2654	glEnd;	2716	glEnd;
2655		2717
2656	glTranslate 2 - 0.375, 2 - 0.375;	2718	glTranslate 2 - 0.375, 2 - 0.375;
		2719
2657	$self->SUPER::_draw;	2720	$self->SUPER::_draw;
2658	}	2721	}
2659		2722
2660	#############################################################################	2723	#############################################################################
2661		2724
…		…
2737	$self->SUPER::DESTROY;	2800	$self->SUPER::DESTROY;
2738	}	2801	}
2739		2802
2740	#############################################################################	2803	#############################################################################
2741		2804
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;	2805	package CFClient::UI::Menu;
2785		2806
2786	our @ISA = CFClient::UI::FancyFrame::;	2807	our @ISA = CFClient::UI::FancyFrame::;
2787		2808
2788	use CFClient::OpenGL;	2809	use CFClient::OpenGL;
…		…
2826	# maybe save $GRAB? must be careful about events...	2847	# maybe save $GRAB? must be careful about events...
2827	$GRAB = $self;	2848	$GRAB = $self;
2828	$self->{button} = $ev->{button};	2849	$self->{button} = $ev->{button};
2829		2850
2830	$self->show;	2851	$self->show;
2831	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2852	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832	}	2853	}
2833		2854
2834	sub mouse_motion {	2855	sub mouse_motion {
2835	my ($self, $ev, $x, $y) = @_;	2856	my ($self, $ev, $x, $y) = @_;
2836		2857
…		…
2961	$self->SUPER::reconfigure;	2982	$self->SUPER::reconfigure;
2962	}	2983	}
2963		2984
2964	#############################################################################	2985	#############################################################################
2965		2986
2966	package CFClient::UI::Root;	2987	package CFClient::UI::Inventory;
2967		2988
2968	our @ISA = CFClient::UI::Container::;	2989	our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970	use CFClient::OpenGL;
2971		2990
2972	sub new {	2991	sub new {
2973	my $class = shift;	2992	my $class = shift;
2974		2993
2975	$class->SUPER::new (	2994	my $self = $class->SUPER::new (
		2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2996	@_,
		2997	);
		2998
		2999	$self
		3000	}
		3001
		3002	sub set_items {
		3003	my ($self, $items) = @_;
		3004
		3005	$self->{scrolled}->clear;
		3006	return unless $items;
		3007
		3008	my @items = sort {
		3009	($a->{type} <=> $b->{type})
		3010	or ($a->{name} cmp $b->{name})
		3011	} @$items;
		3012
		3013	$self->{real_items} = \@items;
		3014
		3015	my $row = 0;
		3016	for my $item (@items) {
		3017	CFClient::Item::update_widgets $item;
		3018
		3019	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3020	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3021	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3022
		3023	$row++;
		3024	}
		3025	}
		3026
		3027	#############################################################################
		3028
		3029	package CFClient::UI::BindEditor;
		3030
		3031	our @ISA = CFClient::UI::FancyFrame::;
		3032
		3033	sub new {
		3034	my $class = shift;
		3035
		3036	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3037
		3038	$self->add (my $vb = new CFClient::UI::VBox);
		3039
		3040
		3041	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3042	text => "start recording",
		3043	tooltip => "Start/Stops recording of actions."
		3044	."All subsequent actions after the recording started will be captured."
		3045	."The actions are displayed after the record was stopped."
		3046	."To bind the action you have to click on the 'Bind' button",
		3047	on_activate => sub {
		3048	unless ($self->{recording}) {
		3049	$self->start;
		3050	} else {
		3051	$self->stop;
		3052	}
		3053	});
		3054
		3055	$vb->add (new CFClient::UI::Label text => "Actions:");
		3056	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3057
		3058	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3059	$vb->add (my $hb = new CFClient::UI::HBox);
		3060	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3061	$hb->add (new CFClient::UI::Button
		3062	text => "bind",
		3063	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3064	on_activate => sub {
		3065	$self->ask_for_bind;
		3066	});
		3067
		3068	$vb->add (my $hb = new CFClient::UI::HBox);
		3069	$hb->add (new CFClient::UI::Button
		3070	text => "ok",
		3071	expand => 1,
		3072	tooltip => "This closes the binding editor and saves the binding",
		3073	on_activate => sub {
		3074	$self->hide;
		3075	$self->commit;
		3076	});
		3077
		3078	$hb->add (new CFClient::UI::Button
		3079	text => "cancel",
		3080	expand => 1,
		3081	tooltip => "This closes the binding editor without saving",
		3082	on_activate => sub {
		3083	$self->hide;
		3084	$self->{binding_cancel}->()
		3085	if $self->{binding_cancel};
		3086	});
		3087
		3088	$self->update_binding_widgets;
		3089
		3090	$self
		3091	}
		3092
		3093	sub commit {
		3094	my ($self) = @_;
		3095	my ($mod, $sym, $cmds) = $self->get_binding;
		3096	if ($sym != 0 && @$cmds > 0) {
		3097	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3098	."'. Don't forget 'Save Config'!");
		3099	$self->{binding_change}->($mod, $sym, $cmds)
		3100	if $self->{binding_change};
		3101	} else {
		3102	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3103	$self->{binding_cancel}->()
		3104	if $self->{binding_cancel};
		3105	}
		3106	}
		3107
		3108	sub start {
		3109	my ($self) = @_;
		3110
		3111	$self->{rec_btn}->set_text ("stop recording");
		3112	$self->{recording} = 1;
		3113	$self->clear_command_list;
		3114	$::CONN->start_record if $::CONN;
		3115	}
		3116
		3117	sub stop {
		3118	my ($self) = @_;
		3119
		3120	$self->{rec_btn}->set_text ("start recording");
		3121	$self->{recording} = 0;
		3122
		3123	my $rec;
		3124	$rec = $::CONN->stop_record if $::CONN;
		3125	return unless ref $rec eq 'ARRAY';
		3126	$self->set_command_list ($rec);
		3127	}
		3128
		3129	# if $commit is true, the binding will be set after the user entered a key combo
		3130	sub ask_for_bind {
		3131	my ($self, $commit) = @_;
		3132
		3133	CFClient::Binder::open_binding_dialog (sub {
		3134	my ($mod, $sym) = @_;
		3135	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3136	$self->update_binding_widgets;
		3137	$self->commit if $commit;
		3138	});
		3139	}
		3140
		3141	# $mod and $sym are the modifiers and key symbol
		3142	# $cmds is a array ref of strings (the commands)
		3143	# $cb is the callback that is executed on OK
		3144	# $ccb is the callback that is executed on CANCEL and
		3145	# when the binding was unsuccessful on OK
		3146	sub set_binding {
		3147	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3148
		3149	$self->clear_command_list;
		3150	$self->{recording} = 0;
		3151	$self->{rec_btn}->set_text ("start recording");
		3152
		3153	$self->{binding} = [$mod, $sym];
		3154	$self->{commands} = $cmds;
		3155
		3156	$self->{binding_change} = $cb;
		3157	$self->{binding_cancel} = $ccb;
		3158
		3159	$self->update_binding_widgets;
		3160	}
		3161
		3162	# this is a shortcut method that asks for a binding
		3163	# and then just binds it.
		3164	sub do_quick_binding {
		3165	my ($self, $cmds) = @_;
		3166	$self->set_binding (undef, undef, $cmds, sub {
		3167	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3168	});
		3169	$self->ask_for_bind (1);
		3170	}
		3171
		3172	sub update_binding_widgets {
		3173	my ($self) = @_;
		3174	my ($mod, $sym, $cmds) = $self->get_binding;
		3175	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3176	$self->set_command_list ($cmds);
		3177	}
		3178
		3179	sub get_binding {
		3180	my ($self) = @_;
		3181	return (
		3182	$self->{binding}->[0],
		3183	$self->{binding}->[1],
		3184	[ grep { defined $_ } @{$self->{commands}} ]
		3185	);
		3186	}
		3187
		3188	sub clear_command_list {
		3189	my ($self) = @_;
		3190	$self->{cmdbox}->clear ();
		3191	}
		3192
		3193	sub set_command_list {
		3194	my ($self, $cmds) = @_;
		3195
		3196	$self->{cmdbox}->clear ();
		3197	$self->{commands} = $cmds;
		3198
		3199	my $idx = 0;
		3200
		3201	for (@$cmds) {
		3202	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3203
		3204	my $i = $idx;
		3205	$hb->add (new CFClient::UI::Label text => $_);
		3206	$hb->add (new CFClient::UI::Button
		3207	text => "delete",
		3208	tooltip => "Deletes the action from the record",
		3209	on_activate => sub {
		3210	$self->{cmdbox}->remove ($hb);
		3211	$cmds->[$i] = undef;
		3212	});
		3213
		3214
		3215	$idx++
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::SpellList;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (new CFClient::UI::ScrolledWindow
		3231	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3232
		3233	$self;
		3234	}
		3235
		3236	# XXX: Do sorting? Argl...
		3237	sub add_spell {
		3238	my ($self, $spell) = @_;
		3239	$self->{spells}->{$spell->{name}} = $spell;
		3240
		3241	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3242	face => $spell->{face},
		3243	can_hover => 1,
		3244	can_events => 1,
		3245	tooltip => $spell->{message});
		3246
		3247	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3248	text => $spell->{name},
		3249	can_hover => 1,
		3250	can_events => 1,
		3251	tooltip => $spell->{message},
		3252	expand => 1);
		3253
		3254	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3255	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3256	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3257	expand => 1);
		3258
		3259	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3260	text => "bind to key",
		3261	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3262	}
		3263
		3264	sub rebuild_spell_list {
		3265	my ($self) = @_;
		3266	$self->{tbl_idx} = 0;
		3267	$self->add_spell ($_) for values %{$self->{spells}};
		3268	}
		3269
		3270	sub remove_spell {
		3271	my ($self, $spell) = @_;
		3272	delete $self->{spells}->{$spell->{name}};
		3273	$self->rebuild_spell_list;
		3274	}
		3275
		3276	#############################################################################
		3277
		3278	package CFClient::UI::Root;
		3279
		3280	our @ISA = CFClient::UI::Container::;
		3281
		3282	use CFClient::OpenGL;
		3283
		3284	sub new {
		3285	my $class = shift;
		3286
		3287	my $self = $class->SUPER::new (
2976	visible => 1,	3288	visible => 1,
2977	@_,	3289	@_,
2978	)	3290	);
2979	}
2980		3291
2981	sub configure {	3292	Scalar::Util::weaken ($self->{root} = $self);
2982	my ($self, $x, $y, $w, $h) = @_;
2983		3293
2984	$self->{w} = $w;	3294	$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	}	3295	}
2994		3296
2995	sub size_request {	3297	sub size_request {
2996	my ($self) = @_;	3298	my ($self) = @_;
2997		3299
2998	($self->{w}, $self->{h})	3300	($self->{w}, $self->{h})
		3301	}
		3302
		3303	sub _to_pixel {
		3304	my ($coord, $size, $max) = @_;
		3305
		3306	$coord =
		3307	$coord eq "center" ? ($max - $size) * 0.5
		3308	: $coord eq "max" ? $max
		3309	: $coord;
		3310
		3311	$coord = 0 if $coord < 0;
		3312	$coord = $max - $size if $coord > $max - $size;
		3313
		3314	int $coord + 0.5
2999	}	3315	}
3000		3316
3001	sub size_allocate {	3317	sub size_allocate {
3002	my ($self, $w, $h) = @_;	3318	my ($self, $w, $h) = @_;
3003		3319
3004	for my $child ($self->children) {	3320	for my $child ($self->children) {
3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3321	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006		3322
3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3323	$X = $child->{force_x} if exists $child->{force_x};
3008	if exists $child->{req_x};	3324	$Y = $child->{force_y} if exists $child->{force_y};
3009		3325
3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3326	$X = _to_pixel $X, $W, $self->{w};
3011	if exists $child->{req_y};	3327	$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		3328
3018	$child->configure ($X, $Y, $W, $H);	3329	$child->configure ($X, $Y, $W, $H);
3019	}	3330	}
3020	}	3331	}
3021		3332
…		…
3032	}	3343	}
3033		3344
3034	sub update {	3345	sub update {
3035	my ($self) = @_;	3346	my ($self) = @_;
3036		3347
3037	$self->check_size;
3038	$::WANT_REFRESH++;	3348	$::WANT_REFRESH++;
3039	}	3349	}
3040		3350
3041	sub add {	3351	sub add {
3042	my ($self, @children) = @_;	3352	my ($self, @children) = @_;
3043		3353
3044	for my $child (@children) {
3045	$child->{is_toplevel} = 1;	3354	$_->{is_toplevel} = 1
3046		3355	for @children;
3047	# integerise window positions
3048	$child->{x} = int $child->{x};
3049	$child->{y} = int $child->{y};
3050	}
3051		3356
3052	$self->SUPER::add (@children);	3357	$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	}	3358	}
3060		3359
3061	sub remove {	3360	sub remove {
3062	my ($self, @children) = @_;	3361	my ($self, @children) = @_;
3063		3362
3064	$self->SUPER::remove (@children);	3363	$self->SUPER::remove (@children);
		3364
		3365	delete $self->{is_toplevel}
		3366	for @children;
3065		3367
3066	while (@children) {	3368	while (@children) {
3067	my $w = pop @children;	3369	my $w = pop @children;
3068	push @children, $w->children;	3370	push @children, $w->children;
3069	$w->set_invisible;	3371	$w->set_invisible;
…		…
3088	while ($self->{refresh_hook}) {	3390	while ($self->{refresh_hook}) {
3089	$_->()	3391	$_->()
3090	for values %{delete $self->{refresh_hook}};	3392	for values %{delete $self->{refresh_hook}};
3091	}	3393	}
3092		3394
3093	if ($self->{check_size}) {	3395	if ($self->{realloc}) {
		3396	my %queue;
3094	my @queue;	3397	my @queue;
		3398	my $widget;
3095		3399
3096	for (;;) {	3400	outer:
3097	if ($self->{check_size}) {	3401	while () {
3098	#TODO use array-of-depth approach	3402	if (my $realloc = delete $self->{realloc}) {
		3403	for $widget (values %$realloc) {
		3404	$widget->{visible} or next; # do not resize invisible widgets
3099		3405
3100	@queue = sort { $a->{visible} <=> $b->{visible} }	3406	$queue{$widget+0}++ and next; # duplicates are common
3101	@queue, values %{delete $self->{check_size}};	3407
		3408	push @{ $queue[$widget->{visible}] }, $widget;
		3409	}
3102	}	3410	}
3103		3411
		3412	while () {
		3413	@queue or last outer;
		3414
3104	my $widget = pop @queue || last;	3415	$widget = pop @{ $queue[-1] || [] }
3105		3416	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		3417
		3418	pop @queue;
		3419	}
		3420
		3421	delete $queue{$widget+0};
		3422
		3423	my ($w, $h) = $widget->size_request;
		3424
		3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3427
		3428	$w = $widget->{force_w} if exists $widget->{force_w};
		3429	$h = $widget->{force_h} if exists $widget->{force_h};
		3430
		3431	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3432	|| delete $widget->{force_realloc}) {
3116	$widget->{req_w} = $w;	3433	$widget->{req_w} = $w;
3117	$widget->{req_h} = $h;	3434	$widget->{req_h} = $h;
3118		3435
3119	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3436	$self->{size_alloc}{$widget+0} = $widget;
3120		3437
3121	$widget->{parent}->check_size
3122	if $widget->{parent};	3438	if (my $parent = $widget->{parent}) {
		3439	$self->{realloc}{$parent+0} = $parent
		3440	unless $queue{$parent+0};
		3441
		3442	$parent->{force_size_alloc} = 1;
		3443	$self->{size_alloc}{$parent+0} = $parent;
		3444	}
3123	}	3445	}
		3446
		3447	delete $self->{realloc}{$widget+0};
3124	}	3448	}
3125	}	3449	}
3126		3450
3127	while ($self->{size_alloc}) {	3451	while (my $size_alloc = delete $self->{size_alloc}) {
3128	for (values %{delete $self->{size_alloc}}) {	3452	my @queue = sort { $b->{visible} <=> $a->{visible} }
3129	my ($widget, $w, $h) = @$_;	3453	values %$size_alloc;
		3454
		3455	while () {
		3456	my $widget = pop @queue || last;
		3457
		3458	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130		3459
3131	$w = 0 if $w < 0;	3460	$w = 0 if $w < 0;
3132	$h = 0 if $h < 0;	3461	$h = 0 if $h < 0;
3133		3462
		3463	$w = int $w + 0.5;
		3464	$h = int $h + 0.5;
		3465
		3466	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3467	$widget->{old_w} = $widget->{w};
		3468	$widget->{old_h} = $widget->{h};
		3469
3134	$widget->{w} = $w;	3470	$widget->{w} = $w;
3135	$widget->{h} = $h;	3471	$widget->{h} = $h;
		3472
3136	$widget->emit (size_allocate => $w, $h);	3473	$widget->emit (size_allocate => $w, $h);
		3474	}
3137	}	3475	}
3138	}	3476	}
3139		3477
3140	while ($self->{post_alloc_hook}) {	3478	while ($self->{post_alloc_hook}) {
3141	$_->()	3479	$_->()
3142	for values %{delete $self->{post_alloc_hook}};	3480	for values %{delete $self->{post_alloc_hook}};
3143	}	3481	}
		3482
3144		3483
3145	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147	glClear GL_COLOR_BUFFER_BIT;	3486	glClear GL_COLOR_BUFFER_BIT;
3148		3487
…		…
3150	glLoadIdentity;	3489	glLoadIdentity;
3151	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152	glMatrixMode GL_MODELVIEW;	3491	glMatrixMode GL_MODELVIEW;
3153	glLoadIdentity;	3492	glLoadIdentity;
3154		3493
		3494	{
		3495	package CFClient::UI::Base;
		3496
		3497	($draw_x, $draw_y, $draw_w, $draw_h) =
		3498	(0, 0, $self->{w}, $self->{h});
		3499	}
		3500
3155	$self->_draw;	3501	$self->_draw;
3156	}	3502	}
3157		3503
3158	#############################################################################	3504	#############################################################################
3159		3505

Diff Legend

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