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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 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->realloc;
61	}	61	}
62		62
63	return;	63	return;
64	}	64	}
65	}	65	}
…		…
171	sub rescale_widgets {	171	sub rescale_widgets {
172	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
173		173
174	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
175	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
176	$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.]+$/;
177	$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};
178	$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};
179	$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.]+$/;
180	$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};
181	$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
182	}	189	}
183	}	190	}
184		191
185	reconfigure_widgets;	192	reconfigure_widgets;
186	}	193	}
…		…
195		202
196	sub new {	203	sub new {
197	my $class = shift;	204	my $class = shift;
198		205
199	my $self = bless {	206	my $self = bless {
200	x => 0,	207	x => "center",
201	y => 0,	208	y => "center",
202	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
203	can_events => 1,	212	can_events => 1,
204	@_	213	@_
205	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206		217
207	for (keys %$self) {	218	for (keys %$self) {
208	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
209	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
210	}	221	}
211	}	222	}
212		223
213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218	$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};
219	$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};
220	}	234	}
221		235
222	$self	236	$self
223	}	237	}
224		238
…		…
235	return if $self->{parent};	249	return if $self->{parent};
236		250
237	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
238	}	252	}
239		253
240	sub center {
241	my ($self) = @_;
242
243	$CFClient::UI::ROOT->on_post_alloc (
244	"center_$self" => sub {
245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246	},
247	);
248
249	$self->update;
250	}
251
252	sub set_visible {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
254		256
255	return if $self->{visible};	257	return if $self->{visible};
256		258
257	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
258	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
259		261
260	$self->emit (visibility_change => 1);	262	$self->emit (visibility_change => 1);
261		263
262	$self->realloc unless exists $self->{req_w};	264	$self->realloc if !exists $self->{req_w};
263		265
264	$_->set_visible for $self->children;	266	$_->set_visible for $self->children;
265	}	267	}
266		268
267	sub set_invisible {	269	sub set_invisible {
…		…
309		311
310	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
311	if $self->{parent};	313	if $self->{parent};
312	}	314	}
313		315
314	sub move {	316	sub move_abs {
315	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
316		318
317	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
318	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
319	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
320		322
321	$self->update;	323	$self->update;
322	}	324	}
323		325
324	sub set_size {	326	sub set_size {
325	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
326		328
327	$self->{def_w} = $w;	329	$self->{force_w} = $w;
328	$self->{def_h} = $h;	330	$self->{force_h} = $h;
329		331
330	$self->realloc;	332	$self->realloc;
331	}	333	}
332		334
333	sub size_request {	335	sub size_request {
…		…
337		339
338	sub configure {	340	sub configure {
339	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
340		342
341	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
342	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
343	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
344		348
345	# use alignment to adjust x, y	349	# use alignment to adjust x, y
346		350
347	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
348	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
349
350	($w, $h) = ($w2, $h2);
351	}	353	}
352		354
353	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
354	$self->{x} = $x;	356	$self->{x} = $x;
355	$self->{y} = $y;	357	$self->{y} = $y;
356	$self->update;	358	$self->update;
357	}	359	}
358		360
359	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360	return unless $self->{visible};	362	return unless $self->{visible};
361		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
363	}	368	}
364	}	369	}
365		370
366	sub size_allocate {	371	sub size_allocate {
367	# nothing to be done	372	# nothing to be done
368	}	373	}
369		374
370	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
371	}	381	}
372		382
373	sub set_max_size {	383	sub set_max_size {
374	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
375		385
…		…
434		444
435	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
436	unless $FOCUS;	446	unless $FOCUS;
437	}	447	}
438		448
439	sub mouse_motion { }	449	sub mouse_motion { 0 }
440	sub button_up { }	450	sub button_up { 0 }
441	sub key_down { }	451	sub key_down { 0 }
442	sub key_up { }	452	sub key_up { 0 }
443		453
444	sub button_down {	454	sub button_down {
445	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
446		456
447	$self->focus_in;	457	$self->focus_in;
448	}
449		458
450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455		461
456	sub find_widget {	462	sub find_widget {
457	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
458		464
459	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
467		473
468	sub set_parent {	474	sub set_parent {
469	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
470		476
471	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
472
473	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
474
475	$self->realloc;
476	}	479	}
477		480
478	sub connect {	481	sub connect {
479	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
480		483
…		…
499	}	502	}
500		503
501	sub realloc {	504	sub realloc {
502	my ($self) = @_;	505	my ($self) = @_;
503		506
504	return unless $self->{visible};	507	if ($self->{visible}) {
505
506	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
507		509
508	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
509	$self->{root}->update;	511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
510	}	516	}
511		517
512	sub update {	518	sub update {
513	my ($self) = @_;	519	my ($self) = @_;
514		520
515	$self->{parent}->update	521	$self->{parent}->update
516	if $self->{parent};	522	if $self->{parent};
517	}	523	}
518		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		535
519	sub draw {	536	sub draw {
520	my ($self) = @_;	537	my ($self) = @_;
521		538
522	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523		550
524	glPushMatrix;	551	glPushMatrix;
525	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
526	$self->_draw;
527	glPopMatrix;
528		553
529	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
530	my ($x, $y) = @$self{qw(x y)};
531
532	glColor 1, 0.8, 0.5, 0.2;	555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533	glEnable GL_BLEND;	556	glEnable GL_BLEND;
534	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535	glBegin GL_QUADS;	558	glBegin GL_QUADS;
536	glVertex $x , $y;	559	glVertex 0 , 0;
537	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
538	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
539	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
540	glEnd;	563	glEnd;
541	glDisable GL_BLEND;	564	glDisable GL_BLEND;
542	}	565	}
543		566
544	if ($ENV{PCLIENT_DEBUG}) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
545	glPushMatrix;	568	glPushMatrix;
546	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
548	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
549	glVertex 0 , 0;	572	glVertex 0 , 0;
550	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
551	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
552	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
553	glEnd;	576	glEnd;
554	glPopMatrix;	577	glPopMatrix;
555	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
557	}	583	}
558		584
559	sub _draw {	585	sub _draw {
560	my ($self) = @_;	586	my ($self) = @_;
561		587
…		…
599		625
600	if ($color && (@$color < 4 || $color->[3])) {	626	if ($color && (@$color < 4 || $color->[3])) {
601	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
602		628
603	glEnable GL_BLEND;	629	glEnable GL_BLEND;
604	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605	glColor @$color;	631	glColor_premultiply @$color;
606		632
607	glBegin GL_QUADS;	633	glBegin GL_QUADS;
608	glVertex 0 , 0;	634	glVertex 0 , 0;
609	glVertex 0 , $h;	635	glVertex 0 , $h;
610	glVertex $w, $h;	636	glVertex $w, $h;
…		…
625	my ($class, %arg) = @_;	651	my ($class, %arg) = @_;
626	$class->SUPER::new (can_events => 0, %arg);	652	$class->SUPER::new (can_events => 0, %arg);
627	}	653	}
628		654
629	sub size_request {	655	sub size_request {
630	(0, 0)	656	my ($self) = @_;
		657
		658	($self->{w} + 0, $self->{h} + 0)
631	}	659	}
632		660
633	sub draw { }	661	sub draw { }
634		662
635	#############################################################################	663	#############################################################################
…		…
639	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
640		668
641	sub new {	669	sub new {
642	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
643		671
644	my $children = delete $arg{children} || [];	672	my $children = delete $arg{children};
645		673
646	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
647	children => [],	675	children => [],
648	can_events => 0,	676	can_events => 0,
649	%arg,	677	%arg,
650	);	678	);
		679
651	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
652		682
653	$self	683	$self
654	}	684	}
655		685
656	sub add {	686	sub add {
…		…
704	$x -= $self->{x};	734	$x -= $self->{x};
705	$y -= $self->{y};	735	$y -= $self->{y};
706		736
707	my $res;	737	my $res;
708		738
709	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
710	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
711	and return $res;	741	and return $res;
712	}	742	}
713		743
714	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
756	sub size_request {	786	sub size_request {
757	$_[0]{children}[0]->size_request	787	$_[0]{children}[0]->size_request
758	}	788	}
759		789
760	sub size_allocate {	790	sub size_allocate {
761	my ($self, $w, $h, $changed) = @_;	791	my ($self, $w, $h) = @_;
762		792
763	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
764	}	794	}
765		795
766	#############################################################################	796	#############################################################################
		797
		798	# back-buffered drawing area
767		799
768	package CFClient::UI::Window;	800	package CFClient::UI::Window;
769		801
770	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
771		803
…		…
783	$ROOT->on_post_alloc ($self => sub { $self->render_child });	815	$ROOT->on_post_alloc ($self => sub { $self->render_child });
784	$self->SUPER::update;	816	$self->SUPER::update;
785	}	817	}
786		818
787	sub size_allocate {	819	sub size_allocate {
788	my ($self, $w, $h, $changed) = @_;	820	my ($self, $w, $h) = @_;
789		821
790	$self->SUPER::size_allocate ($w, $h, $changed);	822	$self->SUPER::size_allocate ($w, $h);
791	$self->update	823	$self->update;
792	if $changed;
793	}	824	}
794		825
795	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
796	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
797	}	830	}
798		831
799	sub render_child {	832	sub render_child {
800	my ($self) = @_;	833	my ($self) = @_;
801		834
802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
805		838
		839	{
		840	package CFClient::UI::Base;
		841
		842	($draw_x, $draw_y, $draw_w, $draw_h) =
		843	(0, 0, $self->{w}, $self->{h});
		844	}
		845
806	$self->_render;	846	$self->_render;
807	};	847	};
808	}	848	}
809		849
810	sub _draw {	850	sub _draw {
811	my ($self) = @_;	851	my ($self) = @_;
812		852
813	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
814		854
815	my $tex = $self->{texture}	855	my $tex = $self->{texture}
816	or return;	856	or return;
817		857
818	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		860	glEnable GL_BLEND;
		861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
820	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
821		863
822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad (0, 0, $w, $h);
823		865
		866	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
825	}	868	}
826		869
827	#############################################################################	870	#############################################################################
828		871
…		…
841	}	884	}
842		885
843	sub size_request {	886	sub size_request {
844	my ($self) = @_;	887	my ($self) = @_;
845		888
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		890
848	$w = 10 if $self->{scroll_x};	891	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	892	$h = 10 if $self->{scroll_y};
850		893
851	($w, $h)	894	($w, $h)
852	}	895	}
853		896
854	sub size_allocate {	897	sub size_allocate {
855	my ($self, $w, $h, $changed) = @_;	898	my ($self, $w, $h) = @_;
856		899
		900	my $child = $self->child;
		901
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		904
860	$self->child->configure (0, 0, $w, $h);	905	$self->child->configure (0, 0, $w, $h);
861	$self->update;	906	$self->update;
862	}	907	}
863		908
…		…
899	}	944	}
900		945
901	sub _render {	946	sub _render {
902	my ($self) = @_;	947	my ($self) = @_;
903		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		953
906	$self->SUPER::_render;	954	$self->SUPER::_render;
907	}	955	}
908		956
…		…
911	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
912		960
913	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
914		962
915	sub new {	963	sub new {
916	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
917		967
918	my $self;	968	my $self;
919		969
920	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
921	vertical => 1,	971	vertical => 1,
…		…
926	;	976	;
927		977
928	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
930	slider => $slider,	980	slider => $slider,
931	@_,	981	%arg,
932	);	982	);
933		983
934	$self->{vp}->add ($self->{scrolled});
935	$self->add ($self->{vp});
936	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
937		986
938	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
939	}	994	}
940		995
941	sub update {	996	sub update {
942	my ($self) = @_;	997	my ($self) = @_;
943		998
…		…
947	my $child = $self->{vp}->child;	1002	my $child = $self->{vp}->child;
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949	}	1004	}
950		1005
951	sub size_allocate {	1006	sub size_allocate {
952	my ($self, $w, $h, $changed) = @_;	1007	my ($self, $w, $h) = @_;
953		1008
954	$self->SUPER::size_allocate ($w, $h, $changed);	1009	$self->SUPER::size_allocate ($w, $h);
955		1010
956	my $child = $self->{vp}->child;	1011	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1013	}
959		1014
…		…
982		1037
983	if ($self->{bg}) {	1038	if ($self->{bg}) {
984	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
985		1040
986	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
989		1044
990	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
991	glVertex 0 , 0;	1046	glVertex 0 , 0;
992	glVertex 0 , $h;	1047	glVertex 0 , $h;
993	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1006		1061
1007	our @ISA = CFClient::UI::Bin::;	1062	our @ISA = CFClient::UI::Bin::;
1008		1063
1009	use CFClient::OpenGL;	1064	use CFClient::OpenGL;
1010		1065
1011	my @tex =	1066	my $bg =
		1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1068	mipmap => 1, wrap => 1;
		1069
		1070	my @border =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1073
1015	sub new {	1074	sub new {
1016	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1017		1078
1018	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1082	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1083	can_events => 1,
1024	@_	1084	min_w => 16,
		1085	min_h => 16,
		1086	%arg,
1025	);	1087	);
1026		1088
1027	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1028	align => 0,	1090	align => 0,
1029	valign => 1,	1091	valign => 1,
1030	text => $self->{title},	1092	text => $title,
1031	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1032		1095
1033	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034	}	1104	}
1035		1105
1036	sub border {	1106	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1038	}	1108	}
1039		1109
1040	sub size_request {	1110	sub size_request {
1041	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1042		1115
1043	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1044		1117
1045	(	1118	(
1046	$w + $self->border * 2,	1119	$w + $self->border * 2,
1047	$h + $self->border * 2,	1120	$h + $self->border * 2,
1048	)	1121	)
1049	}	1122	}
1050		1123
1051	sub size_allocate {	1124	sub size_allocate {
1052	my ($self, $w, $h, $changed) = @_;	1125	my ($self, $w, $h) = @_;
1053		1126
1054	return unless $changed;	1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
1055		1132
		1133	my $border = $self->border;
		1134
1056	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1057	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1058		1137
1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060	if $self->{title};
1061
1062	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1063	}	1139	}
1064		1140
1065	sub button_down {	1141	sub button_down {
1066	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1067		1143
…		…
1083	my ($ev, $x, $y) = @_;	1159	my ($ev, $x, $y) = @_;
1084		1160
1085	my $dx = $ev->{x} - $ox;	1161	my $dx = $ev->{x} - $ox;
1086	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1087		1163
1088	$self->{user_x} = $wx + $dx * $mx;
1089	$self->{user_y} = $wy + $dy * $my;
1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092	$self->move ($self->{user_x}, $self->{user_y});	1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093	$self->realloc;	1168	$self->realloc;
1094	};	1169	};
1095		1170
1096	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1100	$self->{motion} = sub {	1175	$self->{motion} = sub {
1101	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1102		1177
1103	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1104		1179
1105	$self->{user_x} = $bx + $x - $ox;	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106	$self->{user_y} = $by + $y - $oy;	1181	# HACK: the next line is required to enforce placement
1107		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108	$self->move ($self->{user_x}, $self->{user_y});
1109	$self->realloc;
1110	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1111	}	1188	1
1112	}	1189	}
1113		1190
1114	sub button_up {	1191	sub button_up {
1115	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1116		1193
1117	delete $self->{motion};	1194	!!delete $self->{motion}
1118	}	1195	}
1119		1196
1120	sub mouse_motion {	1197	sub mouse_motion {
1121	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1122		1199
1123	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1124	}	1203	}
1125		1204
1126	sub _draw {	1205	sub _draw {
1127	my ($self) = @_;	1206	my ($self) = @_;
1128		1207
		1208	my $child = $self->{children}[0];
		1209
1129	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1130	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1131		1212
1132	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1133	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134		1215
1135	my $border = $self->border;	1216	my $border = $self->border;
1136		1217
1137	glColor @{ $self->{border_bg} };	1218	glColor @{ $self->{border_bg} };
1138	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1139	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1222	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142		1223
1143	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144	my $bg = $tex[0];	1225	glColor @{ $self->{bg} };
1145		1226
1146	# TODO: repeat texture not scale	1227	# TODO: repeat texture not scale
		1228	# solve this better(?)
1147	my $rep_x = $cw / $bg->{w};	1229	$bg->{s} = $cw / $bg->{w};
1148	my $rep_y = $ch / $bg->{h};	1230	$bg->{t} = $ch / $bg->{h};
1149
1150	glColor @{ $self->{bg} };
1151
1152	$bg->{s} = $rep_x;
1153	$bg->{t} = $rep_y;
1154	$bg->{wrap_mode} = 1;
1155	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156	}	1232	}
1157		1233
1158	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1159		1235
1160	$self->{title}->draw if $self->{title};
1161
1162	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1163	}	1242	}
1164		1243
1165	#############################################################################	1244	#############################################################################
1166		1245
1167	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1241	(sum @$hs),	1320	(sum @$hs),
1242	)	1321	)
1243	}	1322	}
1244		1323
1245	sub size_allocate {	1324	sub size_allocate {
1246	my ($self, $w, $h, $changed) = @_;	1325	my ($self, $w, $h) = @_;
1247		1326
1248	my ($ws, $hs) = $self->get_wh;	1327	my ($ws, $hs) = $self->get_wh;
1249		1328
1250	my $req_w = (sum @$ws) || 1;	1329	my $req_w = (sum @$ws) || 1;
1251	my $req_h = (sum @$hs) || 1;	1330	my $req_h = (sum @$hs) || 1;
…		…
1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1330	)	1409	)
1331	}	1410	}
1332		1411
1333	sub size_allocate {	1412	sub size_allocate {
1334	my ($self, $w, $h, $changed) = @_;	1413	my ($self, $w, $h) = @_;
1335		1414
1336	my $space = $self->{vertical} ? $h : $w;	1415	my $space = $self->{vertical} ? $h : $w;
1337	my $children = $self->{children};	1416	my $children = $self->{children};
1338		1417
1339	my @req;	1418	my @req;
…		…
1422	ellipsise => 3, # end	1501	ellipsise => 3, # end
1423	layout => (new CFClient::Layout),	1502	layout => (new CFClient::Layout),
1424	fontsize => 1,	1503	fontsize => 1,
1425	align => -1,	1504	align => -1,
1426	valign => -1,	1505	valign => -1,
1427	padding => 2,	1506	padding_x => 2,
		1507	padding_y => 2,
1428	can_events => 0,	1508	can_events => 0,
1429	%arg	1509	%arg
1430	);	1510	);
1431		1511
1432	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1469		1549
1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471	$self->{layout}->set_text ($text);	1551	$self->{layout}->set_text ($text);
1472		1552
1473	$self->realloc;	1553	$self->realloc;
		1554	$self->update;
1474	}	1555	}
1475		1556
1476	sub set_markup {	1557	sub set_markup {
1477	my ($self, $markup) = @_;	1558	my ($self, $markup) = @_;
1478		1559
…		…
1483		1564
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1566	$self->{layout}->set_markup ($markup);
1486		1567
1487	$self->realloc;	1568	$self->realloc;
		1569	$self->update;
1488	}	1570	}
1489		1571
1490	sub size_request {	1572	sub size_request {
1491	my ($self) = @_;	1573	my ($self) = @_;
1492		1574
…		…
1506		1588
1507	$w = List::Util::max $w, $w2;	1589	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1590	$h = List::Util::max $h, $h2;
1509	}	1591	}
1510		1592
1511	(	1593	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1594	}
1516		1595
1517	sub size_allocate {	1596	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1597	my ($self, $w, $h) = @_;
		1598
		1599	delete $self->{ox};
1519		1600
1520	delete $self->{texture}	1601	delete $self->{texture}
1521	if $changed;	1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1603	}
1523		1604
1524	sub set_fontsize {	1605	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1606	my ($self, $fontsize) = @_;
1526		1607
…		…
1541	$self->{layout}->set_width ($self->{w});	1622	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1623	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1626
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1627	new_from_layout CFClient::Texture $self->{layout}
		1628	};
1547		1629
		1630	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1633	: ($self->{w} - $tex->{w}) * 0.5);
1551		1634
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1637	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1638	};
1558		1639
1559	glEnable GL_TEXTURE_2D;	1640	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1642
…		…
1599		1680
1600	delete $self->{cur_h};	1681	delete $self->{cur_h};
1601		1682
1602	return if $self->{text} eq $text;	1683	return if $self->{text} eq $text;
1603		1684
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1685	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1686	$self->{text} = $text;
1608		1687
1609	$text =~ s/./*/g if $self->{hidden};	1688	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1689	$self->{layout}->set_text ("$text ");
1611		1690
1612	$self->_emit (changed => $self->{text});	1691	$self->_emit (changed => $self->{text});
		1692	$self->update;
1613	}	1693	}
1614		1694
1615	sub set_text {	1695	sub set_text {
1616	my ($self, $text) = @_;	1696	my ($self, $text) = @_;
1617		1697
…		…
1656	$self->{cursor} = length $text;	1736	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1737	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1738	$self->_emit ('escape');
1659	} elsif ($uni) {	1739	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1740	substr $text, $self->{cursor}++, 0, chr $uni;
		1741	} else {
		1742	return 0;
1661	}	1743	}
1662		1744
1663	$self->_set_text ($text);	1745	$self->_set_text ($text);
1664		1746
1665	$self->realloc;	1747	$self->realloc;
		1748
		1749	1
1666	}	1750	}
1667		1751
1668	sub focus_in {	1752	sub focus_in {
1669	my ($self) = @_;	1753	my ($self) = @_;
1670		1754
…		…
1685	utf8::encode $text;	1769	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1770	$self->{cursor} = length substr $text, 0, $idx;
1687		1771
1688	$self->_set_text ($self->{text});	1772	$self->_set_text ($self->{text});
1689	$self->update;	1773	$self->update;
		1774
		1775	1
1690	}	1776	}
1691		1777
1692	sub mouse_motion {	1778	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1779	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1781
		1782	0
1695	}	1783	}
1696		1784
1697	sub _draw {	1785	sub _draw {
1698	my ($self) = @_;	1786	my ($self) = @_;
1699		1787
1700	local $self->{fg} = $self->{fg};	1788	local $self->{fg} = $self->{fg};
1701		1789
1702	if ($FOCUS == $self) {	1790	if ($FOCUS == $self) {
1703	glColor @{$self->{active_bg}};	1791	glColor_premultiply @{$self->{active_bg}};
1704	$self->{fg} = $self->{active_fg};	1792	$self->{fg} = $self->{active_fg};
1705	} else {	1793	} else {
1706	glColor @{$self->{bg}};	1794	glColor_premultiply @{$self->{bg}};
1707	}	1795	}
1708		1796
1709	glEnable GL_BLEND;	1797	glEnable GL_BLEND;
1710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1798	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711	glBegin GL_QUADS;	1799	glBegin GL_QUADS;
1712	glVertex 0 , 0;	1800	glVertex 0 , 0;
1713	glVertex 0 , $self->{h};	1801	glVertex 0 , $self->{h};
1714	glVertex $self->{w}, $self->{h};	1802	glVertex $self->{w}, $self->{h};
1715	glVertex $self->{w}, 0;	1803	glVertex $self->{w}, 0;
…		…
1776	} else {	1864	} else {
1777	$self->set_text ($self->{history_saveback});	1865	$self->set_text ($self->{history_saveback});
1778	}	1866	}
1779		1867
1780	} else {	1868	} else {
1781	$self->SUPER::key_down ($ev);	1869	return $self->SUPER::key_down ($ev)
		1870	}
		1871
1782	}	1872	1
1783
1784	}	1873	}
1785		1874
1786	#############################################################################	1875	#############################################################################
1787		1876
1788	package CFClient::UI::Button;	1877	package CFClient::UI::Button;
…		…
1797		1886
1798	sub new {	1887	sub new {
1799	my $class = shift;	1888	my $class = shift;
1800		1889
1801	$class->SUPER::new (	1890	$class->SUPER::new (
1802	padding => 4,	1891	padding_x => 4,
		1892	padding_y => 4,
1803	fg => [1, 1, 1],	1893	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1894	active_fg => [0, 0, 1],
1805	can_hover => 1,	1895	can_hover => 1,
1806	align => 0,	1896	align => 0,
1807	valign => 0,	1897	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1906	my ($self, $ev, $x, $y) = @_;
1817		1907
1818	$self->emit ("activate")	1908	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1909	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1910	&& $y >= 0 && $y < $self->{h};
		1911
		1912	1
1821	}	1913	}
1822		1914
1823	sub _draw {	1915	sub _draw {
1824	my ($self) = @_;	1916	my ($self) = @_;
1825		1917
…		…
1854		1946
1855	sub new {	1947	sub new {
1856	my $class = shift;	1948	my $class = shift;
1857		1949
1858	$class->SUPER::new (	1950	$class->SUPER::new (
1859	padding => 2,	1951	padding_x => 2,
		1952	padding_y => 2,
1860	fg => [1, 1, 1],	1953	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1954	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1955	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1956	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1957	state => 0,
…		…
1868	}	1961	}
1869		1962
1870	sub size_request {	1963	sub size_request {
1871	my ($self) = @_;	1964	my ($self) = @_;
1872		1965
1873	($self->{padding} * 2 + 6) x 2	1966	(6) x 2
1874	}	1967	}
1875		1968
1876	sub button_down {	1969	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1970	my ($self, $ev, $x, $y) = @_;
1878		1971
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1974	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1975	$self->_emit (changed => $self->{state});
		1976	} else {
		1977	return 0
		1978	}
		1979
1883	}	1980	1
1884	}	1981	}
1885		1982
1886	sub _draw {	1983	sub _draw {
1887	my ($self) = @_;	1984	my ($self) = @_;
1888		1985
1889	$self->SUPER::_draw;	1986	$self->SUPER::_draw;
1890		1987
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1988	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1989
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1990	my ($w, $h) = @$self{qw(w h)};
		1991
		1992	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1993
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1994	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1995
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1996	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1997
…		…
2053		2152
2054	my $h1 = $self->{h} * (1 - $ycut1);	2153	my $h1 = $self->{h} * (1 - $ycut1);
2055	my $h2 = $self->{h} * (1 - $ycut2);	2154	my $h2 = $self->{h} * (1 - $ycut2);
2056		2155
2057	glEnable GL_BLEND;	2156	glEnable GL_BLEND;
2058	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059	glEnable GL_TEXTURE_2D;	2159	glEnable GL_TEXTURE_2D;
2060	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061		2161
2062	glBindTexture GL_TEXTURE_2D, $t1->{name};	2162	glBindTexture GL_TEXTURE_2D, $t1->{name};
2063	glBegin GL_QUADS;	2163	glBegin GL_QUADS;
…		…
2163	fg => [1, 1, 1],	2263	fg => [1, 1, 1],
2164	active_fg => [0, 0, 0],	2264	active_fg => [0, 0, 0],
2165	bg => [0, 0, 0, 0.2],	2265	bg => [0, 0, 0, 0.2],
2166	active_bg => [1, 1, 1, 0.5],	2266	active_bg => [1, 1, 1, 0.5],
2167	range => [0, 0, 100, 10, 0],	2267	range => [0, 0, 100, 10, 0],
2168	req_w => $::WIDTH / 80,	2268	min_w => $::WIDTH / 80,
2169	req_h => $::WIDTH / 80,	2269	min_h => $::WIDTH / 80,
2170	vertical => 0,	2270	vertical => 0,
2171	can_hover => 1,	2271	can_hover => 1,
2172	inner_pad => 0.02,	2272	inner_pad => 0.02,
2173	@_	2273	@_
2174	);	2274	);
…		…
2214	}	2314	}
2215		2315
2216	sub size_request {	2316	sub size_request {
2217	my ($self) = @_;	2317	my ($self) = @_;
2218		2318
2219	my $w = $self->{req_w};	2319	($self->{req_w}, $self->{req_h})
2220	my $h = $self->{req_h};
2221
2222	$self->{vertical} ? ($h, $w) : ($w, $h)
2223	}	2320	}
2224		2321
2225	sub button_down {	2322	sub button_down {
2226	my ($self, $ev, $x, $y) = @_;	2323	my ($self, $ev, $x, $y) = @_;
2227		2324
2228	$self->SUPER::button_down ($ev, $x, $y);	2325	$self->SUPER::button_down ($ev, $x, $y);
2229		2326
2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231		2328
2232	$self->mouse_motion ($ev, $x, $y);	2329	$self->mouse_motion ($ev, $x, $y)
2233	}	2330	}
2234		2331
2235	sub mouse_motion {	2332	sub mouse_motion {
2236	my ($self, $ev, $x, $y) = @_;	2333	my ($self, $ev, $x, $y) = @_;
2237		2334
…		…
2241	my (undef, $lo, $hi, $page) = @{$self->{range}};	2338	my (undef, $lo, $hi, $page) = @{$self->{range}};
2242		2339
2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2340	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244		2341
2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2342	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2343	} else {
		2344	return 0;
		2345	}
		2346
2246	}	2347	1
2247	}	2348	}
2248		2349
2249	sub update {	2350	sub update {
2250	my ($self) = @_;	2351	my ($self) = @_;
2251		2352
2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2353	delete $self->{knob_w};
		2354	$self->SUPER::update;
		2355	}
		2356
		2357	sub _draw {
		2358	my ($self) = @_;
		2359
		2360	unless ($self->{knob_w}) {
2253	$self->set_value ($self->{range}[0]);	2361	$self->set_value ($self->{range}[0]);
2254		2362
2255	my ($value, $lo, $hi, $page) = @{$self->{range}};	2363	my ($value, $lo, $hi, $page) = @{$self->{range}};
2256	my $range = ($hi - $page - $lo) || 1e-100;	2364	my $range = ($hi - $page - $lo) || 1e-100;
2257		2365
…		…
2263	$value = ($value - $lo) / $range;	2371	$value = ($value - $lo) / $range;
2264	$value = $value * $self->{scale} + $self->{offset};	2372	$value = $value * $self->{scale} + $self->{offset};
2265		2373
2266	$self->{knob_x} = $value - $knob_w * 0.5;	2374	$self->{knob_x} = $value - $knob_w * 0.5;
2267	$self->{knob_w} = $knob_w;	2375	$self->{knob_w} = $knob_w;
2268	});	2376	}
2269
2270	$self->SUPER::update;
2271	}
2272
2273	sub _draw {
2274	my ($self) = @_;
2275		2377
2276	$self->SUPER::_draw ();	2378	$self->SUPER::_draw ();
2277		2379
2278	glScale $self->{w}, $self->{h};	2380	glScale $self->{w}, $self->{h};
2279		2381
…		…
2377	$self->{fontsize} = $fontsize;	2479	$self->{fontsize} = $fontsize;
2378	$self->reflow;	2480	$self->reflow;
2379	}	2481	}
2380		2482
2381	sub size_allocate {	2483	sub size_allocate {
2382	my ($self, $w, $h, $changed) = @_;	2484	my ($self, $w, $h) = @_;
2383		2485
2384	$self->SUPER::size_allocate ($w, $h, $changed);	2486	$self->SUPER::size_allocate ($w, $h);
2385
2386	return unless $changed;
2387		2487
2388	$self->{layout}->set_font ($self->{font}) if $self->{font};	2488	$self->{layout}->set_font ($self->{font}) if $self->{font};
2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390	$self->{layout}->set_width ($self->{children}[0]{w});	2490	$self->{layout}->set_width ($self->{children}[0]{w});
2391		2491
…		…
2614	}	2714	}
2615		2715
2616	sub set_tooltip_from {	2716	sub set_tooltip_from {
2617	my ($self, $widget) = @_;	2717	my ($self, $widget) = @_;
2618		2718
		2719	my $tooltip = $widget->{tooltip};
		2720
		2721	if ($ENV{CFPLUS_DEBUG} & 2) {
		2722	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2724	. "req $widget->{req_w} $widget->{req_h}\n"
		2725	. "visible $widget->{visible}";
		2726	}
		2727
2619	$self->add (new CFClient::UI::Label	2728	$self->add (new CFClient::UI::Label
2620	markup => $widget->{tooltip},	2729	markup => $tooltip,
2621	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622	fontsize => 0.8,	2731	fontsize => 0.8,
2623	fg => [0, 0, 0, 1],	2732	fg => [0, 0, 0, 1],
2624	ellipsise => 0,	2733	ellipsise => 0,
2625	font => ($widget->{tooltip_font} || $::FONT_PROP),	2734	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2742
2634	($w + 4, $h + 4)	2743	($w + 4, $h + 4)
2635	}	2744	}
2636		2745
2637	sub size_allocate {	2746	sub size_allocate {
2638	my ($self, $w, $h, $changed) = @_;	2747	my ($self, $w, $h) = @_;
2639		2748
2640	return unless $changed;
2641
2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2749	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2750	}
		2751
		2752	sub visibility_change {
		2753	my ($self, $visible) = @_;
		2754
		2755	return unless $visible;
		2756
		2757	$self->{root}->on_post_alloc ("move_$self" => sub {
		2758	my $widget = $self->{owner}
		2759	or return;
		2760
		2761	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2762
		2763	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2764	if $x + $self->{w} > $::WIDTH;
		2765
		2766	$self->move_abs ($x, $y);
		2767	});
2643	}	2768	}
2644		2769
2645	sub _draw {	2770	sub _draw {
2646	my ($self) = @_;	2771	my ($self) = @_;
2647		2772
…		…
2664	glVertex $w, $h;	2789	glVertex $w, $h;
2665	glVertex $w, 0;	2790	glVertex $w, 0;
2666	glEnd;	2791	glEnd;
2667		2792
2668	glTranslate 2 - 0.375, 2 - 0.375;	2793	glTranslate 2 - 0.375, 2 - 0.375;
		2794
2669	$self->SUPER::_draw;	2795	$self->SUPER::_draw;
2670	}	2796	}
2671		2797
2672	#############################################################################	2798	#############################################################################
2673		2799
…		…
2749	$self->SUPER::DESTROY;	2875	$self->SUPER::DESTROY;
2750	}	2876	}
2751		2877
2752	#############################################################################	2878	#############################################################################
2753		2879
2754	package CFClient::UI::Inventory;	2880	package CFClient::UI::Buttonbar;
2755		2881
2756	our @ISA = CFClient::UI::ScrolledWindow::;	2882	our @ISA = CFClient::UI::HBox::;
2757		2883
2758	sub new {	2884	# TODO: should actualyl wrap buttons and other goodies.
2759	my $class = shift;
2760
2761	my $self = $class->SUPER::new (
2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763	@_,
2764	);
2765
2766	$self
2767	}
2768
2769	sub set_items {
2770	my ($self, $items) = @_;
2771
2772	$self->{scrolled}->clear;
2773	return unless $items;
2774
2775	my @items = sort {
2776	($a->{type} <=> $b->{type})
2777	or ($a->{name} cmp $b->{name})
2778	} @$items;
2779
2780	$self->{real_items} = \@items;
2781
2782	my $row = 0;
2783	for my $item (@items) {
2784	CFClient::Item::update_widgets $item;
2785
2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790	$row++;
2791	}
2792	}
2793		2885
2794	#############################################################################	2886	#############################################################################
2795		2887
2796	package CFClient::UI::Menu;	2888	package CFClient::UI::Menu;
2797		2889
…		…
2838	# maybe save $GRAB? must be careful about events...	2930	# maybe save $GRAB? must be careful about events...
2839	$GRAB = $self;	2931	$GRAB = $self;
2840	$self->{button} = $ev->{button};	2932	$self->{button} = $ev->{button};
2841		2933
2842	$self->show;	2934	$self->show;
2843	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2935	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844	}	2936	}
2845		2937
2846	sub mouse_motion {	2938	sub mouse_motion {
2847	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2848		2940
2849	# TODO: should use vbox->find_widget or so	2941	# TODO: should use vbox->find_widget or so
2850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851	$self->{hover} = $self->{item}{$HOVER};	2943	$self->{hover} = $self->{item}{$HOVER};
		2944
		2945	0
2852	}	2946	}
2853		2947
2854	sub button_up {	2948	sub button_up {
2855	my ($self, $ev, $x, $y) = @_;	2949	my ($self, $ev, $x, $y) = @_;
2856		2950
…		…
2858	undef $GRAB;	2952	undef $GRAB;
2859	$self->hide;	2953	$self->hide;
2860		2954
2861	$self->_emit ("popdown");	2955	$self->_emit ("popdown");
2862	$self->{hover}[1]->() if $self->{hover};	2956	$self->{hover}[1]->() if $self->{hover};
		2957	} else {
		2958	return 0
		2959	}
		2960
		2961	1
		2962	}
		2963
		2964	#############################################################################
		2965
		2966	package CFClient::UI::Multiplexer;
		2967
		2968	our @ISA = CFClient::UI::Container::;
		2969
		2970	sub new {
		2971	my $class = shift;
		2972
		2973	my $self = $class->SUPER::new (
		2974	@_,
		2975	);
		2976
		2977	$self->{current} = $self->{children}[0]
		2978	if @{ $self->{children} };
		2979
		2980	$self
		2981	}
		2982
		2983	sub add {
		2984	my ($self, @widgets) = @_;
		2985
		2986	$self->SUPER::add (@widgets);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990	}
		2991
		2992	sub set_current_page {
		2993	my ($self, $page_or_widget) = @_;
		2994
		2995	my $widget = ref $page_or_widget
		2996	? $page_or_widget
		2997	: $self->{children}[$page_or_widget];
		2998
		2999	$self->{current} = $widget;
		3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3001
		3002	$self->_emit (page_changed => $self->{current});
		3003
		3004	$self->realloc;
		3005	}
		3006
		3007	sub visible_children {
		3008	$_[0]{current}
		3009	}
		3010
		3011	sub size_request {
		3012	my ($self) = @_;
		3013
		3014	$self->{current}->size_request
		3015	}
		3016
		3017	sub size_allocate {
		3018	my ($self, $w, $h) = @_;
		3019
		3020	$self->{current}->configure (0, 0, $w, $h);
		3021	}
		3022
		3023	sub _draw {
		3024	my ($self) = @_;
		3025
		3026	$self->{current}->draw;
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::Notebook;
		3032
		3033	our @ISA = CFClient::UI::VBox::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (
		3039	buttonbar => (new CFClient::UI::Buttonbar),
		3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3041	# filter => # will be put between multiplexer and $self
		3042	@_,
		3043	);
2863	}	3044
		3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3046	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3047
		3048	$self
		3049	}
		3050
		3051	sub add {
		3052	my ($self, $title, $widget, $tooltip) = @_;
		3053
		3054	Scalar::Util::weaken $self;
		3055
		3056	$self->{buttonbar}->add (new CFClient::UI::Button
		3057	markup => $title,
		3058	tooltip => $tooltip,
		3059	on_activate => sub { $self->set_current_page ($widget) },
		3060	);
		3061
		3062	$self->{multiplexer}->add ($widget);
		3063	}
		3064
		3065	sub set_current_page {
		3066	my ($self, $page) = @_;
		3067
		3068	$self->{multiplexer}->set_current_page ($page);
		3069	$self->_emit (page_changed => $self->{multiplexer}{current});
2864	}	3070	}
2865		3071
2866	#############################################################################	3072	#############################################################################
2867		3073
2868	package CFClient::UI::Statusbox;	3074	package CFClient::UI::Statusbox;
…		…
2973	$self->SUPER::reconfigure;	3179	$self->SUPER::reconfigure;
2974	}	3180	}
2975		3181
2976	#############################################################################	3182	#############################################################################
2977		3183
		3184	package CFClient::UI::Inventory;
		3185
		3186	our @ISA = CFClient::UI::ScrolledWindow::;
		3187
		3188	sub new {
		3189	my $class = shift;
		3190
		3191	my $self = $class->SUPER::new (
		3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3193	@_,
		3194	);
		3195
		3196	$self
		3197	}
		3198
		3199	sub set_items {
		3200	my ($self, $items) = @_;
		3201
		3202	$self->{child}->clear;
		3203	return unless $items;
		3204
		3205	my @items = sort {
		3206	($a->{type} <=> $b->{type})
		3207	or ($a->{name} cmp $b->{name})
		3208	} @$items;
		3209
		3210	$self->{real_items} = \@items;
		3211
		3212	my $row = 0;
		3213	for my $item (@items) {
		3214	CFClient::Item::update_widgets $item;
		3215
		3216	$self->{child}->add (0, $row, $item->{face_widget});
		3217	$self->{child}->add (1, $row, $item->{desc_widget});
		3218	$self->{child}->add (2, $row, $item->{weight_widget});
		3219
		3220	$row++;
		3221	}
		3222	}
		3223
		3224	#############################################################################
		3225
		3226	package CFClient::UI::BindEditor;
		3227
		3228	our @ISA = CFClient::UI::FancyFrame::;
		3229
		3230	sub new {
		3231	my $class = shift;
		3232
		3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3234
		3235	$self->add (my $vb = new CFClient::UI::VBox);
		3236
		3237
		3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3239	text => "start recording",
		3240	tooltip => "Start/Stops recording of actions."
		3241	."All subsequent actions after the recording started will be captured."
		3242	."The actions are displayed after the record was stopped."
		3243	."To bind the action you have to click on the 'Bind' button",
		3244	on_activate => sub {
		3245	unless ($self->{recording}) {
		3246	$self->start;
		3247	} else {
		3248	$self->stop;
		3249	}
		3250	});
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Actions:");
		3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3254
		3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3256	$vb->add (my $hb = new CFClient::UI::HBox);
		3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3258	$hb->add (new CFClient::UI::Button
		3259	text => "bind",
		3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3261	on_activate => sub {
		3262	$self->ask_for_bind;
		3263	});
		3264
		3265	$vb->add (my $hb = new CFClient::UI::HBox);
		3266	$hb->add (new CFClient::UI::Button
		3267	text => "ok",
		3268	expand => 1,
		3269	tooltip => "This closes the binding editor and saves the binding",
		3270	on_activate => sub {
		3271	$self->hide;
		3272	$self->commit;
		3273	});
		3274
		3275	$hb->add (new CFClient::UI::Button
		3276	text => "cancel",
		3277	expand => 1,
		3278	tooltip => "This closes the binding editor without saving",
		3279	on_activate => sub {
		3280	$self->hide;
		3281	$self->{binding_cancel}->()
		3282	if $self->{binding_cancel};
		3283	});
		3284
		3285	$self->update_binding_widgets;
		3286
		3287	$self
		3288	}
		3289
		3290	sub commit {
		3291	my ($self) = @_;
		3292	my ($mod, $sym, $cmds) = $self->get_binding;
		3293	if ($sym != 0 && @$cmds > 0) {
		3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3295	."'. Don't forget 'Save Config'!");
		3296	$self->{binding_change}->($mod, $sym, $cmds)
		3297	if $self->{binding_change};
		3298	} else {
		3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3300	$self->{binding_cancel}->()
		3301	if $self->{binding_cancel};
		3302	}
		3303	}
		3304
		3305	sub start {
		3306	my ($self) = @_;
		3307
		3308	$self->{rec_btn}->set_text ("stop recording");
		3309	$self->{recording} = 1;
		3310	$self->clear_command_list;
		3311	$::CONN->start_record if $::CONN;
		3312	}
		3313
		3314	sub stop {
		3315	my ($self) = @_;
		3316
		3317	$self->{rec_btn}->set_text ("start recording");
		3318	$self->{recording} = 0;
		3319
		3320	my $rec;
		3321	$rec = $::CONN->stop_record if $::CONN;
		3322	return unless ref $rec eq 'ARRAY';
		3323	$self->set_command_list ($rec);
		3324	}
		3325
		3326
		3327	sub ask_for_bind_and_commit {
		3328	my ($self) = @_;
		3329	$self->ask_for_bind (1);
		3330	}
		3331
		3332	sub ask_for_bind {
		3333	my ($self, $commit) = @_;
		3334
		3335	CFClient::Binder::open_binding_dialog (sub {
		3336	my ($mod, $sym) = @_;
		3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3338	$self->update_binding_widgets;
		3339	$self->commit if $commit;
		3340	});
		3341	}
		3342
		3343	# $mod and $sym are the modifiers and key symbol
		3344	# $cmds is a array ref of strings (the commands)
		3345	# $cb is the callback that is executed on OK
		3346	# $ccb is the callback that is executed on CANCEL and
		3347	# when the binding was unsuccessful on OK
		3348	sub set_binding {
		3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3350
		3351	$self->clear_command_list;
		3352	$self->{recording} = 0;
		3353	$self->{rec_btn}->set_text ("start recording");
		3354
		3355	$self->{binding} = [$mod, $sym];
		3356	$self->{commands} = $cmds;
		3357
		3358	$self->{binding_change} = $cb;
		3359	$self->{binding_cancel} = $ccb;
		3360
		3361	$self->update_binding_widgets;
		3362	}
		3363
		3364	# this is a shortcut method that asks for a binding
		3365	# and then just binds it.
		3366	sub do_quick_binding {
		3367	my ($self, $cmds) = @_;
		3368	$self->set_binding (undef, undef, $cmds, sub {
		3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3370	});
		3371	$self->ask_for_bind (1);
		3372	}
		3373
		3374	sub update_binding_widgets {
		3375	my ($self) = @_;
		3376	my ($mod, $sym, $cmds) = $self->get_binding;
		3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3378	$self->set_command_list ($cmds);
		3379	}
		3380
		3381	sub get_binding {
		3382	my ($self) = @_;
		3383	return (
		3384	$self->{binding}->[0],
		3385	$self->{binding}->[1],
		3386	[ grep { defined $_ } @{$self->{commands}} ]
		3387	);
		3388	}
		3389
		3390	sub clear_command_list {
		3391	my ($self) = @_;
		3392	$self->{cmdbox}->clear ();
		3393	}
		3394
		3395	sub set_command_list {
		3396	my ($self, $cmds) = @_;
		3397
		3398	$self->{cmdbox}->clear ();
		3399	$self->{commands} = $cmds;
		3400
		3401	my $idx = 0;
		3402
		3403	for (@$cmds) {
		3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3405
		3406	my $i = $idx;
		3407	$hb->add (new CFClient::UI::Label text => $_);
		3408	$hb->add (new CFClient::UI::Button
		3409	text => "delete",
		3410	tooltip => "Deletes the action from the record",
		3411	on_activate => sub {
		3412	$self->{cmdbox}->remove ($hb);
		3413	$cmds->[$i] = undef;
		3414	});
		3415
		3416
		3417	$idx++
		3418	}
		3419	}
		3420
		3421	#############################################################################
		3422
		3423	package CFClient::UI::SpellList;
		3424
		3425	our @ISA = CFClient::UI::Table::;
		3426
		3427	sub new {
		3428	my $class = shift;
		3429
		3430	my $self = $class->SUPER::new (
		3431	binding => [],
		3432	commands => [],
		3433	@_,
		3434	)
		3435	}
		3436
		3437	# XXX: Do sorting? Argl...
		3438	sub add_spell {
		3439	my ($self, $spell) = @_;
		3440	$self->{spells}->{$spell->{name}} = $spell;
		3441
		3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3443	face => $spell->{face},
		3444	can_hover => 1,
		3445	can_events => 1,
		3446	tooltip => $spell->{message});
		3447
		3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => $spell->{name},
		3450	can_hover => 1,
		3451	can_events => 1,
		3452	tooltip => $spell->{message},
		3453	expand => 1);
		3454
		3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3458	expand => 1);
		3459
		3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3461	text => "bind to key",
		3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3463	}
		3464
		3465	sub rebuild_spell_list {
		3466	my ($self) = @_;
		3467	$self->{tbl_idx} = 0;
		3468	$self->add_spell ($_) for values %{$self->{spells}};
		3469	}
		3470
		3471	sub remove_spell {
		3472	my ($self, $spell) = @_;
		3473	delete $self->{spells}->{$spell->{name}};
		3474	$self->rebuild_spell_list;
		3475	}
		3476
		3477	#############################################################################
		3478
2978	package CFClient::UI::Root;	3479	package CFClient::UI::Root;
2979		3480
2980	our @ISA = CFClient::UI::Container::;	3481	our @ISA = CFClient::UI::Container::;
2981		3482
2982	use CFClient::OpenGL;	3483	use CFClient::OpenGL;
…		…
2992	Scalar::Util::weaken ($self->{root} = $self);	3493	Scalar::Util::weaken ($self->{root} = $self);
2993		3494
2994	$self	3495	$self
2995	}	3496	}
2996		3497
2997	sub configure {
2998	my ($self, $x, $y, $w, $h) = @_;
2999
3000	$self->{w} = $w;
3001	$self->{h} = $h;
3002	}
3003
3004	sub reconfigure {
3005	my ($self) = @_;
3006
3007	$self->SUPER::reconfigure;
3008
3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
3010	if $self->{w};
3011	}
3012
3013	sub size_request {	3498	sub size_request {
3014	my ($self) = @_;	3499	my ($self) = @_;
3015		3500
3016	($self->{w}, $self->{h})	3501	($self->{w}, $self->{h})
3017	}	3502	}
3018		3503
		3504	sub _to_pixel {
		3505	my ($coord, $size, $max) = @_;
		3506
		3507	$coord =
		3508	$coord eq "center" ? ($max - $size) * 0.5
		3509	: $coord eq "max" ? $max
		3510	: $coord;
		3511
		3512	$coord = 0 if $coord < 0;
		3513	$coord = $max - $size if $coord > $max - $size;
		3514
		3515	int $coord + 0.5
		3516	}
		3517
3019	sub size_allocate {	3518	sub size_allocate {
3020	my ($self, $w, $h, $changed) = @_;	3519	my ($self, $w, $h) = @_;
3021		3520
3022	for my $child ($self->children) {	3521	for my $child ($self->children) {
3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024		3523
3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3524	$X = $child->{force_x} if exists $child->{force_x};
3026	if exists $child->{req_x};	3525	$Y = $child->{force_y} if exists $child->{force_y};
3027		3526
3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3527	$X = _to_pixel $X, $W, $self->{w};
3029	if exists $child->{req_y};	3528	$Y = _to_pixel $Y, $H, $self->{h};
3030
3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3529
3036	$child->configure ($X, $Y, $W, $H);	3530	$child->configure ($X, $Y, $W, $H);
3037	}	3531	}
3038	}	3532	}
3039		3533
…		…
3056	}	3550	}
3057		3551
3058	sub add {	3552	sub add {
3059	my ($self, @children) = @_;	3553	my ($self, @children) = @_;
3060		3554
3061	for my $child (@children) {
3062	$child->{is_toplevel} = 1;	3555	$_->{is_toplevel} = 1
3063		3556	for @children;
3064	# integerise window positions
3065	$child->{x} = int $child->{x};
3066	$child->{y} = int $child->{y};
3067	}
3068		3557
3069	$self->SUPER::add (@children);	3558	$self->SUPER::add (@children);
3070	}	3559	}
3071		3560
3072	sub remove {	3561	sub remove {
3073	my ($self, @children) = @_;	3562	my ($self, @children) = @_;
3074		3563
3075	$self->SUPER::remove (@children);	3564	$self->SUPER::remove (@children);
		3565
		3566	delete $self->{is_toplevel}
		3567	for @children;
3076		3568
3077	while (@children) {	3569	while (@children) {
3078	my $w = pop @children;	3570	my $w = pop @children;
3079	push @children, $w->children;	3571	push @children, $w->children;
3080	$w->set_invisible;	3572	$w->set_invisible;
…		…
3100	$_->()	3592	$_->()
3101	for values %{delete $self->{refresh_hook}};	3593	for values %{delete $self->{refresh_hook}};
3102	}	3594	}
3103		3595
3104	if ($self->{realloc}) {	3596	if ($self->{realloc}) {
		3597	my %queue;
3105	my @queue;	3598	my @queue;
		3599	my $widget;
3106		3600
		3601	outer:
3107	while () {	3602	while () {
3108	if ($self->{realloc}) {	3603	if (my $realloc = delete $self->{realloc}) {
3109	#TODO use array-of-depth approach	3604	for $widget (values %$realloc) {
		3605	$widget->{visible} or next; # do not resize invisible widgets
3110		3606
3111	@queue = sort { $a->{visible} <=> $b->{visible} }	3607	$queue{$widget+0}++ and next; # duplicates are common
3112	@queue, values %{delete $self->{realloc}};	3608
		3609	push @{ $queue[$widget->{visible}] }, $widget;
		3610	}
3113	}	3611	}
3114		3612
		3613	while () {
		3614	@queue or last outer;
		3615
		3616	$widget = pop @{ $queue[-1] || [] }
		3617	and last;
		3618
		3619	pop @queue;
		3620	}
		3621
		3622	delete $queue{$widget+0};
		3623
		3624	my ($w, $h) = $widget->size_request;
		3625
		3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3628
		3629	$w = $widget->{force_w} if exists $widget->{force_w};
		3630	$h = $widget->{force_h} if exists $widget->{force_h};
		3631
		3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3633	|| delete $widget->{force_realloc}) {
		3634	$widget->{req_w} = $w;
		3635	$widget->{req_h} = $h;
		3636
		3637	$self->{size_alloc}{$widget+0} = $widget;
		3638
		3639	if (my $parent = $widget->{parent}) {
		3640	$self->{realloc}{$parent+0} = $parent
		3641	unless $queue{$parent+0};
		3642
		3643	$parent->{force_size_alloc} = 1;
		3644	$self->{size_alloc}{$parent+0} = $parent;
		3645	}
		3646	}
		3647
		3648	delete $self->{realloc}{$widget+0};
		3649	}
		3650	}
		3651
		3652	while (my $size_alloc = delete $self->{size_alloc}) {
		3653	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3654	values %$size_alloc;
		3655
		3656	while () {
3115	my $widget = pop @queue || last;	3657	my $widget = pop @queue || last;
3116		3658
3117	$widget->{visible} or last; # do not resize invisible widgets	3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120	? @$widget{qw(def_w def_h)}
3121	: $widget->size_request;
3122
3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125	$widget->{req_w} = $w;
3126	$widget->{req_h} = $h;
3127
3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130	push @queue, $widget->{parent}
3131	if $widget->{parent};
3132	}
3133	}
3134
3135	while (my $size_alloc = delete $self->{size_alloc}) {
3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137	values %$size_alloc;
3138
3139	while () {
3140	my ($widget, $w, $h) = @{ pop @queue or last };
3141		3660
3142	$w = 0 if $w < 0;	3661	$w = 0 if $w < 0;
3143	$h = 0 if $h < 0;	3662	$h = 0 if $h < 0;
3144		3663
		3664	$w = int $w + 0.5;
		3665	$h = int $h + 0.5;
		3666
		3667	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3668	$widget->{old_w} = $widget->{w};
		3669	$widget->{old_h} = $widget->{h};
		3670
3145	$widget->{w} = $w;	3671	$widget->{w} = $w;
3146	$widget->{h} = $h;	3672	$widget->{h} = $h;
		3673
3147	$widget->emit (size_allocate => $w, $h, 1);	3674	$widget->emit (size_allocate => $w, $h);
		3675	}
3148	}	3676	}
3149	}	3677	}
3150		3678
3151	while ($self->{post_alloc_hook}) {	3679	while ($self->{post_alloc_hook}) {
3152	$_->()	3680	$_->()
3153	for values %{delete $self->{post_alloc_hook}};	3681	for values %{delete $self->{post_alloc_hook}};
3154	}	3682	}
		3683
3155		3684
3156	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3685	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3686	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158	glClear GL_COLOR_BUFFER_BIT;	3687	glClear GL_COLOR_BUFFER_BIT;
3159		3688
…		…
3161	glLoadIdentity;	3690	glLoadIdentity;
3162	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163	glMatrixMode GL_MODELVIEW;	3692	glMatrixMode GL_MODELVIEW;
3164	glLoadIdentity;	3693	glLoadIdentity;
3165		3694
		3695	{
		3696	package CFClient::UI::Base;
		3697
		3698	($draw_x, $draw_y, $draw_w, $draw_h) =
		3699	(0, 0, $self->{w}, $self->{h});
		3700	}
		3701
3166	$self->_draw;	3702	$self->_draw;
3167	}	3703	}
3168		3704
3169	#############################################################################	3705	#############################################################################
3170		3706

Diff Legend

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