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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
423	my ($self) = @_;	457	my ($self) = @_;
424		458
425	return if $FOCUS == $self;	459	return if $FOCUS == $self;
426	return unless $self->{can_focus};	460	return unless $self->{can_focus};
427		461
428	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
429		463
430	$focus->update if $focus;	464	$self->update;
431	$FOCUS->update;
432		465
433	0	466	0
434	}	467	}
435		468
436	sub invoke_focus_out {	469	sub invoke_focus_out {
437	my ($self) = @_;	470	my ($self) = @_;
438		471
439	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
440		473
441	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
442		475
443	$focus->update if $focus; #?	476	$self->update;
444		477
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	479	unless $FOCUS;
447		480
448	0	481	0
449	}	482	}
450		483
451	sub grab_focus {	484	sub grab_focus {
452	my ($self) = @_;	485	my ($self) = @_;
453		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
466		501
467	1	502	0
468	}	503	}
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
479	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
539	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
540		607
541	# update screen rectangle	608	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		611
547	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		615
…		…
573	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
576	glEnd;	641	glEnd;
577	glPopMatrix;	642	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	644	}
580		645
581	$self->_draw;	646	$self->_draw;
582	glPopMatrix;	647	glPopMatrix;
583	}	648	}
…		…
586	my ($self) = @_;	651	my ($self) = @_;
587		652
588	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
589	}	654	}
590		655
		656	my $cntx;#d#
591	sub DESTROY {	657	sub DESTROY {
592	my ($self) = @_;	658	my ($self) = @_;
593		659
594	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
595		661
596	eval { $self->destroy };	662	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
598	}	666	}
599		667
600	#############################################################################	668	#############################################################################
601		669
602	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
603		671
604	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
605		673
606	use strict;	674	use strict;
607	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
608		676
609	sub new {	677	sub new {
610	my $class = shift;	678	my $class = shift;
611		679
612	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
643	}	711	}
644	}	712	}
645		713
646	#############################################################################	714	#############################################################################
647		715
648	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
649		717
650	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
651		719
652	sub new {	720	sub new {
653	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
655	}	723	}
…		…
662		730
663	sub draw { }	731	sub draw { }
664		732
665	#############################################################################	733	#############################################################################
666		734
667	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
668		736
669	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
670		738
671	sub new {	739	sub new {
672	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
673		741
674	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
683	if $children;	751	if $children;
684		752
685	$self	753	$self
686	}	754	}
687		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
688	sub add {	764	sub add {
689	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
690		766
691	$_->set_parent ($self)	767	$_->set_parent ($self)
692	for @widgets;	768	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
753	}	829	}
754		830
755	#############################################################################	831	#############################################################################
756		832
757	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
758		834
759	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
760		836
761	sub new {	837	sub new {
762	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
763		839
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		841
766	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
767	}	843	}
768		844
769	sub add {	845	sub add {
…		…
776	sub remove {	852	sub remove {
777	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
778		854
779	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
780		856
781	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	858	unless @{$self->{children}};
783	}	859	}
784		860
785	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
786		862
…		…
798		874
799	#############################################################################	875	#############################################################################
800		876
801	# back-buffered drawing area	877	# back-buffered drawing area
802		878
803	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
804		880
805	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
806		882
807	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
808		884
809	sub new {	885	sub new {
810	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
811		887
812	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
834	}	910	}
835		911
836	sub render_child {	912	sub render_child {
837	my ($self) = @_;	913	my ($self) = @_;
838		914
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
842		918
843	{	919	{
844	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
845		921
846	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
848	}	926	}
849
850	$self->_render;
851	};	927	};
852	}	928	}
853		929
854	sub _draw {	930	sub _draw {
855	my ($self) = @_;	931	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		932
859	my $tex = $self->{texture}	933	my $tex = $self->{texture}
860	or return;	934	or return;
861		935
862	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
865		939
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
867		941
868	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
869	}	943	}
870		944
871	#############################################################################	945	#############################################################################
872		946
873	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
874		948
		949	use List::Util qw(min max);
		950
875	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
876		952
877	sub new {	953	sub new {
878	my $class = shift;	954	my $class = shift;
879		955
880	$class->SUPER::new (	956	$class->SUPER::new (
…		…
910	}	986	}
911		987
912	sub set_offset {	988	sub set_offset {
913	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
914		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
915	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
916	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
917		997
		998	$self->emit (changed => $x, $y);
918	$self->update;	999	$self->update;
		1000	}
919	}	1001	}
920		1002
921	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
922	sub coord2local {	1004	sub coord2local {
923	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1024	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1026	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1028	}
947	}	1029	}
948		1030
949	sub _render {	1031	sub _render {
950	my ($self) = @_;	1032	my ($self) = @_;
951		1033
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1034	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1036
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1038
957	$self->SUPER::_render;	1039	$self->SUPER::_render;
958	}	1040	}
959		1041
960	#############################################################################	1042	#############################################################################
961		1043
962	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
963		1045
964	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
965		1047
966	sub new {	1048	sub new {
967	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
968		1050
969	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
970		1052
971	my $self;	1053	my $self;
972		1054
973	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
974	vertical => 1,	1065	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1067	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1070	},
979	;	1071	;
980		1072
981	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
983	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
984	%arg,	1081	%arg,
985	);	1082	);
986		1083
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
		1098	$self->SUPER::add_at (0, 0, $self->{vp});
		1099
988	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
989		1101
990	$self	1102	$self
991	}	1103	}
		1104
		1105	#TODO# update range on size_allocate depending on child
992		1106
993	sub add {	1107	sub add {
994	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
995		1109
996	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
997	}	1111	}
998		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
999	sub update {	1137	sub update {
1000	my ($self) = @_;	1138	my ($self) = @_;
1001		1139
1002	$self->SUPER::update;	1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
1003		1143
1004	# todo: overwrite size_allocate of child	1144	sub invoke_mouse_wheel {
1005	my $child = $self->{vp}->child;	1145	my ($self, $ev) = @_;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1146
		1147	return 0 unless $ev->{dy}; # only vertical movements for now
		1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev);
		1150
		1151	1
		1152	}
		1153
		1154	sub invoke_button_down {
		1155	my ($self, $ev, $x, $y) = @_;
		1156
		1157	if ($ev->{button} == 2) {
		1158	$self->grab_focus;
		1159
		1160	my $ox = $self->{vp}{view_x} + $ev->{x};
		1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
		1165
		1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
		1169
		1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1007	}	1195	}
1008		1196
1009	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1011		1199
1012	my $child = $self->{vp}->child;	1200	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1202	}
1017		1203
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1204	#############################################################################
1022		1205
1023	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1024		1207
1025	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1026		1209
1027	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1028		1211
1029	sub new {	1212	sub new {
1030	my $class = shift;	1213	my $class = shift;
1031		1214
1032	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1059	}	1242	}
1060		1243
1061	#############################################################################	1244	#############################################################################
1062		1245
1063	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1064		1247
1065	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1066		1249
1067	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1068		1351
1069	my $bg =	1352	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1072		1355
1073	my @border =	1356	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
1076		1363
1077	sub new {	1364	sub new {
1078	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1079		1366
1080	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1369	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1370	border => 0.6,
1084	can_events => 1,	1371	can_events => 1,
1085	min_w => 16,	1372	min_w => 64,
1086	min_h => 16,	1373	min_h => 32,
1087	%arg,	1374	%arg,
1088	);	1375	);
1089		1376
1090	$self->{title_widget} = new CFClient::UI::Label	1377	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1378	align => 0,
1092	valign => 1,	1379	valign => 1,
1093	text => $self->{title},	1380	text => $self->{title},
1094	fontsize => $self->{border},	1381	fontsize => $self->{border},
1095	if exists $self->{title};	1382	if exists $self->{title};
1096		1383
1097	if ($self->{has_close_button}) {	1384	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1385	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1386	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1387	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1388	on_activate => sub { $self->emit ("delete") };
1102		1389
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1390	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1391	}
1105		1392
1106	$self	1393	$self
1107	}	1394	}
1108		1395
1109	sub add {	1396	sub add {
1110	my ($self, @widgets) = @_;	1397	my ($self, @widgets) = @_;
1111		1398
1112	$self->SUPER::add (@widgets);	1399	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1400	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1401	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1402	}
1116		1403
1117	sub border {	1404	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1405	int $_[0]{border} * $::FONTSIZE
1119	}	1406	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1439	$self->child->configure ($border, $border, $w, $h);
1153		1440
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1441	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1442	if $self->{close_button};
1156		1443
		1444	1
		1445	}
		1446
		1447	sub invoke_delete {
		1448	my ($self) = @_;
		1449
		1450	$self->hide;
		1451
1157	1	1452	1
1158	}	1453	}
1159		1454
1160	sub invoke_button_down {	1455	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1456	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1514	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1515
1221	! ! $self->{motion}	1516	! ! $self->{motion}
1222	}	1517	}
1223		1518
		1519	sub invoke_visibility_change {
		1520	my ($self, $visible) = @_;
		1521
		1522	delete $self->{motion} unless $visible;
		1523
		1524	0
		1525	}
		1526
1224	sub _draw {	1527	sub _draw {
1225	my ($self) = @_;	1528	my ($self) = @_;
1226		1529
1227	my $child = $self->{children}[0];	1530	my $child = $self->{children}[0];
1228		1531
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1537
1235	my $border = $self->border;	1538	my $border = $self->border;
1236		1539
1237	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1559
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1245		1562
1246	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1582	if $self->{close_button};
1266	}	1583	}
1267		1584
1268	#############################################################################	1585	#############################################################################
1269		1586
1270	package CFClient::UI::Table;	1587	package CFPlus::UI::Table;
1271		1588
1272	our @ISA = CFClient::UI::Base::;	1589	our @ISA = CFPlus::UI::Base::;
1273		1590
1274	use List::Util qw(max sum);	1591	use List::Util qw(max sum);
1275		1592
1276	use CFClient::OpenGL;	1593	use CFPlus::OpenGL;
1277		1594
1278	sub new {	1595	sub new {
1279	my $class = shift;	1596	my $class = shift;
1280		1597
1281	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1282	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1283	@_,	1602	@_,
1284	)	1603	)
1285	}	1604	}
1286		1605
1287	sub children {	1606	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1608	}
1290		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1291	sub add {	1611	sub add {
1292	my ($self, $x, $y, $child) = @_;	1612	my $self = shift;
1293		1613
		1614	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1615	$self->add_at (@_);
		1616	}
		1617
		1618	sub add_at {
		1619	my $self = shift;
		1620
		1621	while (@_) {
		1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1294	$child->set_parent ($self);	1624	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
		1626	}
1296		1627
		1628	$self->{force_realloc} = 1;
		1629	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1630	$self->realloc;
1298	}	1631	}
1299		1632
1300	sub remove {	1633	sub remove {
1301	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1302		1635
1303	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ || [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1304	}	1641	}
1305		1642
1306	# TODO: move to container class maybe? send children a signal on removal?	1643	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {	1644	sub clear {
1308	my ($self) = @_;	1645	my ($self) = @_;
…		…
1357	my ($ws, $hs) = $self->get_wh;	1694	my ($ws, $hs) = $self->get_wh;
1358		1695
1359	my $req_w = (sum @$ws) || 1;	1696	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1697	my $req_h = (sum @$hs) || 1;
1361		1698
1362	# TODO: nicer code && do row_expand	1699	# TODO: nicer code
1363	my @col_expand = @{$self->{col_expand}};	1700	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1701	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1702	my $col_expand = (sum @col_expand) || 1;
1366		1703
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1704	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1705
1371	CFClient::UI::harmonize $ws;	1706	CFPlus::UI::harmonize $ws;
		1707
		1708	my @row_expand = @{$self->{row_expand}};
		1709	@row_expand = (1) x @$ws unless @row_expand;
		1710	my $row_expand = (sum @row_expand) || 1;
		1711
		1712	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1713
1372	CFClient::UI::harmonize $hs;	1714	CFPlus::UI::harmonize $hs;
1373		1715
1374	my $y;	1716	my $y;
1375		1717
1376	for my $r (0 .. $#{$self->{children}}) {	1718	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1719	my $row = $self->{children}[$r]
…		…
1420	}	1762	}
1421	}	1763	}
1422		1764
1423	#############################################################################	1765	#############################################################################
1424		1766
1425	package CFClient::UI::Box;	1767	package CFPlus::UI::Fixed;
1426		1768
		1769	use List::Util qw(min max);
		1770
1427	our @ISA = CFClient::UI::Container::;	1771	our @ISA = CFPlus::UI::Container::;
		1772
		1773	sub add {
		1774	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1775
		1776	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1777	$self->SUPER::add ($child);
		1778	}
		1779
		1780	sub _scale($$$) {
		1781	my ($mode, $val, $max) = @_;
		1782
		1783	$mode eq "abs" ? $val
		1784	: $mode eq "rel" ? $val * $max
		1785	: 0
		1786	}
		1787
		1788	sub size_request {
		1789	my ($self) = @_;
		1790
		1791	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1792
		1793	# determine overall size by querying abs widgets
		1794	for my $child ($self->visible_children) {
		1795	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1796
		1797	if ($pos eq "abs") {
		1798	$w = _scale $size, $w, $child->{req_w};
		1799	$h = _scale $size, $h, $child->{req_h};
		1800
		1801	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1802	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1803	}
		1804	}
		1805
		1806	my $W = $x2 - $x1;
		1807	my $H = $y2 - $y1;
		1808
		1809	# now layout remaining widgets
		1810	for my $child ($self->visible_children) {
		1811	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1812
		1813	if ($pos ne "abs") {
		1814	$x = _scale $pos, $x, $W;
		1815	$y = _scale $pos, $x, $H;
		1816	$w = _scale $size, $w, $child->{req_w};
		1817	$h = _scale $size, $h, $child->{req_h};
		1818
		1819	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1820	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1821	}
		1822	}
		1823
		1824	my $W = $x2 - $x1;
		1825	my $H = $y2 - $y1;
		1826
		1827	($W, $H)
		1828	}
		1829
		1830	sub invoke_size_allocate {
		1831	my ($self, $W, $H) = @_;
		1832
		1833	for my $child ($self->visible_children) {
		1834	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1835
		1836	$x = _scale $pos, $x, $W;
		1837	$y = _scale $pos, $x, $H;
		1838	$w = _scale $size, $w, $child->{req_w};
		1839	$h = _scale $size, $h, $child->{req_h};
		1840
		1841	$child->configure ($x, $y, $w, $h);
		1842	}
		1843
		1844	1
		1845	}
		1846
		1847	#############################################################################
		1848
		1849	package CFPlus::UI::Box;
		1850
		1851	our @ISA = CFPlus::UI::Container::;
1428		1852
1429	sub size_request {	1853	sub size_request {
1430	my ($self) = @_;	1854	my ($self) = @_;
1431		1855
1432	$self->{vertical}	1856	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1889	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1890	for 0 .. $#children;
1467	}	1891	}
1468	}	1892	}
1469		1893
1470	CFClient::UI::harmonize \@req;	1894	CFPlus::UI::harmonize \@req;
1471		1895
1472	my $pos = 0;	1896	my $pos = 0;
1473	for (0 .. $#children) {	1897	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1898	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1899	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1904	1
1481	}	1905	}
1482		1906
1483	#############################################################################	1907	#############################################################################
1484		1908
1485	package CFClient::UI::HBox;	1909	package CFPlus::UI::HBox;
1486		1910
1487	our @ISA = CFClient::UI::Box::;	1911	our @ISA = CFPlus::UI::Box::;
1488		1912
1489	sub new {	1913	sub new {
1490	my $class = shift;	1914	my $class = shift;
1491		1915
1492	$class->SUPER::new (	1916	$class->SUPER::new (
…		…
1495	)	1919	)
1496	}	1920	}
1497		1921
1498	#############################################################################	1922	#############################################################################
1499		1923
1500	package CFClient::UI::VBox;	1924	package CFPlus::UI::VBox;
1501		1925
1502	our @ISA = CFClient::UI::Box::;	1926	our @ISA = CFPlus::UI::Box::;
1503		1927
1504	sub new {	1928	sub new {
1505	my $class = shift;	1929	my $class = shift;
1506		1930
1507	$class->SUPER::new (	1931	$class->SUPER::new (
…		…
1510	)	1934	)
1511	}	1935	}
1512		1936
1513	#############################################################################	1937	#############################################################################
1514		1938
1515	package CFClient::UI::Label;	1939	package CFPlus::UI::Label;
1516		1940
1517	our @ISA = CFClient::UI::DrawBG::;	1941	our @ISA = CFPlus::UI::DrawBG::;
1518		1942
1519	use CFClient::OpenGL;	1943	use CFPlus::OpenGL;
1520		1944
1521	sub new {	1945	sub new {
1522	my ($class, %arg) = @_;	1946	my ($class, %arg) = @_;
1523		1947
1524	my $self = $class->SUPER::new (	1948	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1951	#active_bg => none
1528	#font => default_font	1952	#font => default_font
1529	#text => initial text	1953	#text => initial text
1530	#markup => initial narkup	1954	#markup => initial narkup
1531	#max_w => maximum pixel width	1955	#max_w => maximum pixel width
		1956	#style => 0, # render flags
1532	ellipsise => 3, # end	1957	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1958	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1959	fontsize => 1,
1535	align => -1,	1960	align => -1,
1536	valign => -1,	1961	valign => -1,
1537	padding_x => 2,	1962	padding_x => 2,
1538	padding_y => 2,	1963	padding_y => 2,
1539	can_events => 0,	1964	can_events => 0,
1540	%arg	1965	%arg
1541	);	1966	);
1542		1967
1543	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1969	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1970	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1971	$self->{template} = $layout;
1547	}	1972	}
1548		1973
1549	if (exists $self->{markup}) {	1974	if (exists $self->{markup}) {
…		…
1553	}	1978	}
1554		1979
1555	$self	1980	$self
1556	}	1981	}
1557		1982
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1983	sub update {
1569	my ($self) = @_;	1984	my ($self) = @_;
1570		1985
1571	delete $self->{texture};	1986	delete $self->{texture};
1572	$self->SUPER::update;	1987	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1998	my ($self, $text) = @_;
1584		1999
1585	return if $self->{text} eq "T$text";	2000	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	2001	$self->{text} = "T$text";
1587		2002
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	2003	$self->{layout}->set_text ($text);
1590		2004
1591	delete $self->{size_req};	2005	delete $self->{size_req};
1592	$self->realloc;	2006	$self->realloc;
1593	$self->update;	2007	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	2013	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	2014	$self->{text} = "M$markup";
1601		2015
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2016	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		2017
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	2018	$self->{layout}->set_markup ($markup);
1606		2019
1607	delete $self->{size_req};	2020	delete $self->{size_req};
1608	$self->realloc;	2021	$self->realloc;
1609	$self->update;	2022	$self->update;
…		…
1621		2034
1622	my ($w, $h) = $self->{layout}->size;	2035	my ($w, $h) = $self->{layout}->size;
1623		2036
1624	if (exists $self->{template}) {	2037	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	2038	$self->{template}->set_font ($self->{font}) if $self->{font};
		2039	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2040	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		2041
1628	my ($w2, $h2) = $self->{template}->size;	2042	my ($w2, $h2) = $self->{template}->size;
1629		2043
1630	$w = List::Util::max $w, $w2;	2044	$w = List::Util::max $w, $w2;
…		…
1654		2068
1655	sub set_fontsize {	2069	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	2070	my ($self, $fontsize) = @_;
1657		2071
1658	$self->{fontsize} = $fontsize;	2072	$self->{fontsize} = $fontsize;
		2073	delete $self->{size_req};
1659	delete $self->{texture};	2074	delete $self->{texture};
1660		2075
1661	$self->realloc;	2076	$self->realloc;
1662	}	2077	}
1663		2078
1664	sub reconfigure {	2079	sub reconfigure {
1665	my ($self) = @_;	2080	my ($self) = @_;
1666		2081
1667	delete $self->{size_req};	2082	delete $self->{size_req};
		2083	delete $self->{texture};
1668		2084
1669	$self->SUPER::reconfigure;	2085	$self->SUPER::reconfigure;
1670	}	2086	}
1671		2087
1672	sub _draw {	2088	sub _draw {
1673	my ($self) = @_;	2089	my ($self) = @_;
1674		2090
1675	$self->SUPER::_draw; # draw background, if applicable	2091	$self->SUPER::_draw; # draw background, if applicable
1676		2092
1677	my $tex = $self->{texture} ||= do {	2093	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2094	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2095	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2096	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2097	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2098	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2099	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2100
1685	new_from_layout CFClient::Texture $self->{layout}	2101	[$self->{layout}->size]
1686	};	2102	};
1687		2103
1688	unless (exists $self->{ox}) {	2104	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2105	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2106	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2107	: ($self->{w} - $size->[0]) * 0.5);
1692		2108
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2109	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2110	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2111	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2112	};
1697		2113
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2114	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2115	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		2116
1703	if ($tex->{format} == GL_ALPHA) {	2117	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	2118	}
1714		2119
1715	#############################################################################	2120	#############################################################################
1716		2121
1717	package CFClient::UI::EntryBase;	2122	package CFPlus::UI::EntryBase;
1718		2123
1719	our @ISA = CFClient::UI::Label::;	2124	our @ISA = CFPlus::UI::Label::;
1720		2125
1721	use CFClient::OpenGL;	2126	use CFPlus::OpenGL;
1722		2127
1723	sub new {	2128	sub new {
1724	my $class = shift;	2129	my $class = shift;
1725		2130
1726	$class->SUPER::new (	2131	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2135	active_fg => [0, 0, 0],
1731	can_hover => 1,	2136	can_hover => 1,
1732	can_focus => 1,	2137	can_focus => 1,
1733	valign => 0,	2138	valign => 0,
1734	can_events => 1,	2139	can_events => 1,
		2140	ellipsise => 0,
1735	#text => ...	2141	#text => ...
1736	#hidden => "*",	2142	#hidden => "*",
1737	@_	2143	@_
1738	)	2144	)
1739	}	2145	}
…		…
1784	my $sym = $ev->{sym};	2190	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2191	my $uni = $ev->{unicode};
1786		2192
1787	my $text = $self->get_text;	2193	my $text = $self->get_text;
1788		2194
		2195	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2196
1789	if ($uni == 8) {	2197	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2198	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2199	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2200	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2201	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2202	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2203	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2204	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2205	} elsif ($sym == CFPlus::SDLK_HOME) {
		2206	# what a hack
		2207	$self->{cursor} =
		2208	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2209	? length $1
		2210	: 0;
		2211	} elsif ($sym == CFPlus::SDLK_END) {
		2212	# uh, again
		2213	$self->{cursor} =
		2214	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2215	? $self->{cursor} + length $1
		2216	: length $self->{text};
		2217	} elsif ($uni == 21) { # ctrl-u
		2218	$text = "";
1798	$self->{cursor} = 0;	2219	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2220	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2221	$self->emit ('escape');
1803	} elsif ($uni) {	2222	} elsif ($uni == 0x0d) {
		2223	substr $text, $self->{cursor}++, 0, "\012";
		2224	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2225	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2226	} else {
1806	return 0;	2227	return 0;
1807	}	2228	}
1808		2229
1809	$self->_set_text ($text);	2230	$self->_set_text ($text);
1810		2231
1811	$self->realloc;	2232	$self->realloc;
		2233	$self->update;
1812		2234
1813	1	2235	1
1814	}	2236	}
1815		2237
1816	sub invoke_focus_in {	2238	sub invoke_focus_in {
…		…
1828		2250
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2251	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2252
1831	# byte-index to char-index	2253	# byte-index to char-index
1832	my $text = $self->{text};	2254	my $text = $self->{text};
1833	utf8::encode $text;	2255	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2256	$self->{cursor} = length $text;
1835		2257
1836	$self->_set_text ($self->{text});	2258	$self->_set_text ($self->{text});
1837	$self->update;	2259	$self->update;
1838		2260
1839	1	2261	1
…		…
1878	utf8::encode $text;	2300	utf8::encode $text;
1879		2301
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2302	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2303	}
1882		2304
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2305	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2306	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2307	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2308	glEnd;
1888	}	2309	}
1889	}	2310	}
1890		2311
		2312	#############################################################################
		2313
1891	package CFClient::UI::Entry;	2314	package CFPlus::UI::Entry;
1892		2315
1893	our @ISA = CFClient::UI::EntryBase::;	2316	our @ISA = CFPlus::UI::EntryBase::;
1894		2317
1895	use CFClient::OpenGL;	2318	use CFPlus::OpenGL;
1896		2319
1897	sub invoke_key_down {	2320	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2321	my ($self, $ev) = @_;
1899		2322
1900	my $sym = $ev->{sym};	2323	my $sym = $ev->{sym};
1901		2324
1902	if ($sym == 13) {	2325	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2326	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2327	my $txt = $self->get_text;
1905		2328
1906	$self->{history_pointer} = -1;	2329	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2330	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2331	$self->emit (activate => $txt);
1909	$self->update;	2332	$self->update;
1910		2333
1911	} elsif ($sym == CFClient::SDLK_UP) {	2334	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2335	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2336	$self->{history_saveback} = $self->get_text;
1914	}	2337	}
1915	if (@{$self->{history} || []} > 0) {	2338	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2339	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2341	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2342	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2344	}
1922		2345
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2347	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2348	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2349
1927	if ($self->{history_pointer} >= 0) {	2350	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2351	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2360	1
1938	}	2361	}
1939		2362
1940	#############################################################################	2363	#############################################################################
1941		2364
		2365	package CFPlus::UI::TextEdit;
		2366
		2367	our @ISA = CFPlus::UI::EntryBase::;
		2368
		2369	use CFPlus::OpenGL;
		2370
		2371	sub move_cursor_ver {
		2372	my ($self, $dy) = @_;
		2373
		2374	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2375
		2376	$y += $dy;
		2377
		2378	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2379	$self->{cursor} = $index;
		2380	delete $self->{cur_h};
		2381	$self->update;
		2382	return;
		2383	}
		2384	}
		2385
		2386	sub invoke_key_down {
		2387	my ($self, $ev) = @_;
		2388
		2389	my $sym = $ev->{sym};
		2390
		2391	if ($sym == CFPlus::SDLK_UP) {
		2392	$self->move_cursor_ver (-1);
		2393	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2394	$self->move_cursor_ver (+1);
		2395	} else {
		2396	return $self->SUPER::invoke_key_down ($ev)
		2397	}
		2398
		2399	1
		2400	}
		2401
		2402	#############################################################################
		2403
1942	package CFClient::UI::Button;	2404	package CFPlus::UI::Button;
1943		2405
1944	our @ISA = CFClient::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
1945		2407
1946	use CFClient::OpenGL;	2408	use CFPlus::OpenGL;
1947		2409
1948	my @tex =	2410	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
1951		2413
1952	sub new {	2414	sub new {
1953	my $class = shift;	2415	my $class = shift;
1954		2416
1955	$class->SUPER::new (	2417	$class->SUPER::new (
1956	padding_x => 4,	2418	padding_x => 4,
1957	padding_y => 4,	2419	padding_y => 4,
1958	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
1959	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
1960	can_hover => 1,	2422	can_hover => 1,
1961	align => 0,	2423	align => 0,
1962	valign => 0,	2424	valign => 0,
1963	can_events => 1,	2425	can_events => 1,
1964	@_	2426	@_
…		…
1982		2444
1983	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
1984	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
1986		2448
		2449	my $tex = $tex[$GRAB == $self];
1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988		2451
1989	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
1990		2453
1991	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
1992	}	2455	}
1993		2456
1994	#############################################################################	2457	#############################################################################
1995		2458
		2459	package CFPlus::UI::CheckBox;
		2460
		2461	our @ISA = CFPlus::UI::DrawBG::;
		2462
		2463	my @tex =
		2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2466
		2467	use CFPlus::OpenGL;
		2468
		2469	sub new {
		2470	my $class = shift;
		2471
		2472	$class->SUPER::new (
		2473	padding_x => 2,
		2474	padding_y => 2,
		2475	fg => [1, 1, 1],
		2476	active_fg => [1, 1, 0],
		2477	bg => [0, 0, 0, 0.2],
		2478	active_bg => [1, 1, 1, 0.5],
		2479	state => 0,
		2480	can_hover => 1,
		2481	@_
		2482	)
		2483	}
		2484
		2485	sub size_request {
		2486	my ($self) = @_;
		2487
		2488	(6) x 2
		2489	}
		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
		2499	sub invoke_button_down {
		2500	my ($self, $ev, $x, $y) = @_;
		2501
		2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2504	$self->toggle;
		2505	} else {
		2506	return 0
		2507	}
		2508
		2509	1
		2510	}
		2511
		2512	sub _draw {
		2513	my ($self) = @_;
		2514
		2515	$self->SUPER::_draw;
		2516
		2517	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2518
		2519	my ($w, $h) = @$self{qw(w h)};
		2520
		2521	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2522
		2523	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2524
		2525	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2526
		2527	glEnable GL_TEXTURE_2D;
		2528	$tex->draw_quad_alpha (0, 0, $s, $s);
		2529	glDisable GL_TEXTURE_2D;
		2530	}
		2531
		2532	#############################################################################
		2533
		2534	package CFPlus::UI::Image;
		2535
		2536	our @ISA = CFPlus::UI::Base::;
		2537
		2538	use CFPlus::OpenGL;
		2539
		2540	our %texture_cache;
		2541
		2542	sub new {
		2543	my $class = shift;
		2544
		2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	@_,
		2548	);
		2549
		2550	$self->{path} || $self->{tex}
		2551	or Carp::croak "'path' or 'tex' attributes required";
		2552
		2553	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2554	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2555
		2556	CFPlus::weaken $texture_cache{$self->{path}};
		2557
		2558	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2559
		2560	$self
		2561	}
		2562
		2563	sub STORABLE_freeze {
		2564	my ($self, $cloning) = @_;
		2565
		2566	$self->{path}
		2567	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2568
		2569	$self->{path}
		2570	}
		2571
		2572	sub STORABLE_attach {
		2573	my ($self, $cloning, $path) = @_;
		2574
		2575	$self->new (path => $path)
		2576	}
		2577
		2578	sub size_request {
		2579	my ($self) = @_;
		2580
		2581	($self->{tex}{w}, $self->{tex}{h})
		2582	}
		2583
		2584	sub _draw {
		2585	my ($self) = @_;
		2586
		2587	my $tex = $self->{tex};
		2588
		2589	my ($w, $h) = ($self->{w}, $self->{h});
		2590
		2591	if ($self->{rot90}) {
		2592	glRotate 90, 0, 0, 1;
		2593	glTranslate 0, -$self->{w}, 0;
		2594
		2595	($w, $h) = ($h, $w);
		2596	}
		2597
		2598	glEnable GL_TEXTURE_2D;
		2599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2600
		2601	$tex->draw_quad (0, 0, $w, $h);
		2602
		2603	glDisable GL_TEXTURE_2D;
		2604	}
		2605
		2606	#############################################################################
		2607
1996	package CFClient::UI::ImageButton;	2608	package CFPlus::UI::ImageButton;
1997		2609
1998	our @ISA = CFClient::UI::Image::;	2610	our @ISA = CFPlus::UI::Image::;
1999		2611
2000	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
2001		2613
2002	my %textures;	2614	my %textures;
2003		2615
2004	sub new {	2616	sub new {
2005	my $class = shift;	2617	my $class = shift;
…		…
2027	1	2639	1
2028	}	2640	}
2029		2641
2030	#############################################################################	2642	#############################################################################
2031		2643
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2644	package CFPlus::UI::VGauge;
2101		2645
2102	our @ISA = CFClient::UI::Base::;	2646	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2647
2163	use List::Util qw(min max);	2648	use List::Util qw(min max);
2164		2649
2165	use CFClient::OpenGL;	2650	use CFPlus::OpenGL;
2166		2651
2167	my %tex = (	2652	my %tex = (
2168	food => [	2653	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2654	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2655	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2656	],
2172	grace => [	2657	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2658	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2659	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2660	],
2176	hp => [	2661	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2662	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2663	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2664	],
2180	mana => [	2665	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2666	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2667	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2668	],
2184	);	2669	);
2185		2670
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2671	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2731	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2732	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2733
2249	my $h1 = $self->{h} * (1 - $ycut1);	2734	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2735	my $h2 = $self->{h} * (1 - $ycut2);
		2736	my $h3 = $self->{h};
		2737
		2738	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2739
2252	glEnable GL_BLEND;	2740	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2741	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2742	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2743	glEnable GL_TEXTURE_2D;
…		…
2274		2762
2275	if ($t3) {	2763	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2764	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2765	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2766	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2767	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2768	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2769	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2770	glEnd;
2283	}	2771	}
2284		2772
2285	glDisable GL_BLEND;	2773	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2287	}	2775	}
2288		2776
2289	#############################################################################	2777	#############################################################################
2290		2778
2291	package CFClient::UI::Gauge;	2779	package CFPlus::UI::Gauge;
2292		2780
2293	our @ISA = CFClient::UI::VBox::;	2781	our @ISA = CFPlus::UI::VBox::;
2294		2782
2295	sub new {	2783	sub new {
2296	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2297		2785
2298	my $self = $class->SUPER::new (	2786	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2788	can_hover => 1,
2301	can_events => 1,	2789	can_events => 1,
2302	%arg,	2790	%arg,
2303	);	2791	);
2304		2792
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2793	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2794	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2795	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2796
2309	$self	2797	$self
2310	}	2798	}
2311		2799
2312	sub set_fontsize {	2800	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2821	$self->{value}->set_text ($val);
2334	}	2822	}
2335		2823
2336	#############################################################################	2824	#############################################################################
2337		2825
2338	package CFClient::UI::Slider;	2826	package CFPlus::UI::Slider;
2339		2827
2340	use strict;	2828	use strict;
2341		2829
2342	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2343		2831
2344	our @ISA = CFClient::UI::DrawBG::;	2832	our @ISA = CFPlus::UI::DrawBG::;
2345		2833
2346	my @tex =	2834	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2835	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2836	qw(s1_slider.png s1_slider_bg.png);
2349		2837
2350	sub new {	2838	sub new {
2351	my $class = shift;	2839	my $class = shift;
2352		2840
…		…
2441	}	2929	}
2442		2930
2443	1	2931	1
2444	}	2932	}
2445		2933
		2934	sub invoke_mouse_wheel {
		2935	my ($self, $ev) = @_;
		2936
		2937	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2938
		2939	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2940
		2941	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2942
		2943	! ! $delta
		2944	}
		2945
2446	sub update {	2946	sub update {
2447	my ($self) = @_;	2947	my ($self) = @_;
2448		2948
2449	delete $self->{knob_w};	2949	delete $self->{knob_w};
2450	$self->SUPER::update;	2950	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2997	glDisable GL_TEXTURE_2D;
2498	}	2998	}
2499		2999
2500	#############################################################################	3000	#############################################################################
2501		3001
2502	package CFClient::UI::ValSlider;	3002	package CFPlus::UI::ValSlider;
2503		3003
2504	our @ISA = CFClient::UI::HBox::;	3004	our @ISA = CFPlus::UI::HBox::;
2505		3005
2506	sub new {	3006	sub new {
2507	my ($class, %arg) = @_;	3007	my ($class, %arg) = @_;
2508		3008
2509	my $range = delete $arg{range};	3009	my $range = delete $arg{range};
2510		3010
2511	my $self = $class->SUPER::new (	3011	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3012	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3013	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	3014	to_value => sub { shift },
2515	from_value => sub { shift },	3015	from_value => sub { shift },
2516	%arg,	3016	%arg,
2517	);	3017	);
2518		3018
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	3038	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	3039	sub set_value { shift->{slider}->set_value (@_) }
2540		3040
2541	#############################################################################	3041	#############################################################################
2542		3042
2543	package CFClient::UI::TextScroller;	3043	package CFPlus::UI::TextScroller;
2544		3044
2545	our @ISA = CFClient::UI::HBox::;	3045	our @ISA = CFPlus::UI::HBox::;
2546		3046
2547	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2548		3048
2549	sub new {	3049	sub new {
2550	my $class = shift;	3050	my $class = shift;
2551		3051
2552	my $self = $class->SUPER::new (	3052	my $self = $class->SUPER::new (
2553	fontsize => 1,	3053	fontsize => 1,
2554	can_events => 0,	3054	can_events => 1,
2555	indent => 0,	3055	indent => 0,
2556	#font => default_font	3056	#font => default_font
2557	@_,	3057	@_,
2558		3058
2559	layout => (new CFClient::Layout 1),	3059	layout => (new CFPlus::Layout),
2560	par => [],	3060	par => [],
		3061	max_par => 0,
2561	height => 0,	3062	height => 0,
2562	children => [	3063	children => [
2563	(new CFClient::UI::Empty expand => 1),	3064	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3065	(new CFPlus::UI::Slider vertical => 1),
2565	],	3066	],
2566	);	3067	);
2567		3068
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3069	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3070
…		…
2575		3076
2576	$self->{fontsize} = $fontsize;	3077	$self->{fontsize} = $fontsize;
2577	$self->reflow;	3078	$self->reflow;
2578	}	3079	}
2579		3080
2580	sub visible_children {	3081	sub size_request {
2581	my ($self) = @_;	3082	my ($self) = @_;
2582		3083
2583	@{$self->{children}}[0,1]	3084	my ($empty, $slider) = @{ $self->{children} };
		3085
		3086	local $self->{children} = [$empty, $slider];
		3087	$self->SUPER::size_request
2584	}	3088	}
2585		3089
2586	sub invoke_size_allocate {	3090	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	3091	my ($self, $w, $h) = @_;
2588		3092
…		…
2594	$self->{layout}->set_width ($empty->{w});	3098	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3099	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		3100
2597	$self->reflow;	3101	$self->reflow;
2598		3102
		3103	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	3104	$self->SUPER::invoke_size_allocate ($w, $h)
		3105	}
		3106
		3107	sub invoke_mouse_wheel {
		3108	my ($self, $ev) = @_;
		3109
		3110	return 0 unless $ev->{dy}; # only vertical movements
		3111
		3112	$self->{children}[1]->emit (mouse_wheel => $ev);
		3113
		3114	1
2600	}	3115	}
2601		3116
2602	sub get_layout {	3117	sub get_layout {
2603	my ($self, $para) = @_;	3118	my ($self, $para) = @_;
2604		3119
…		…
2632		3147
2633	# todo: base offset on lines or so, not on pixels	3148	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	3149	$self->{children}[1]->set_value ($offset);
2635	}	3150	}
2636		3151
		3152	sub current_paragraph {
		3153	my ($self) = @_;
		3154
		3155	$self->{top_paragraph} - 1
		3156	}
		3157
		3158	sub scroll_to {
		3159	my ($self, $para) = @_;
		3160
		3161	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3162
		3163	$self->{scroll_to} = $para;
		3164	$self->update;
		3165	}
		3166
2637	sub clear {	3167	sub clear {
2638	my ($self) = @_;	3168	my ($self) = @_;
2639		3169
2640	my (undef, undef, @other) = @{ $self->{children} };	3170	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	3171	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	3174	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3175	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	3176	}
2647		3177
2648	sub add_paragraph {	3178	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	3179	my $self = shift;
2650		3180
2651	my ($text, @w) = ref $para ? @$para : $para;	3181	for my $para (@_) {
2652
2653	$para = {	3182	$para = {
		3183	fg => [1, 1, 1, 1],
		3184	indent => 0,
		3185	markup => "",
		3186	widget => [],
		3187	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	3188	w => 1e10,
2655	wrapped => 1,	3189	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	3190	};
2661		3191
2662	$self->add (@w) if @w;	3192	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	3193	push @{$self->{par}}, $para;
		3194	}
		3195
		3196	if (my $max = $self->{max_par}) {
		3197	shift @{$self->{par}} while @{$self->{par}} > $max;
		3198	}
2664		3199
2665	$self->{need_reflow}++;	3200	$self->{need_reflow}++;
2666	$self->update;	3201	$self->update;
2667	}	3202	}
2668		3203
2669	sub scroll_to_bottom {	3204	sub scroll_to_bottom {
2670	my ($self) = @_;	3205	my ($self) = @_;
2671		3206
2672	$self->{scroll_to_bottom} = 1;	3207	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	3208	$self->update;
2674	}	3209	}
2675		3210
		3211	sub force_uptodate {
		3212	my ($self) = @_;
		3213
		3214	if (delete $self->{need_reflow}) {
		3215	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3216
		3217	my $height = 0;
		3218
		3219	for my $para (@{$self->{par}}) {
		3220	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3221	my $layout = $self->get_layout ($para);
		3222	my ($w, $h) = $layout->size;
		3223
		3224	$para->{w} = $w + $para->{indent};
		3225	$para->{h} = $h;
		3226	$para->{wrapped} = $layout->has_wrapped;
		3227	}
		3228
		3229	$para->{y} = $height;
		3230	$height += $para->{h};
		3231	}
		3232
		3233	$self->{height} = $height;
		3234	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3235
		3236	delete $self->{texture};
		3237	}
		3238
		3239	if (my $paridx = delete $self->{scroll_to}) {
		3240	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3241	}
		3242	}
		3243
2676	sub update {	3244	sub update {
2677	my ($self) = @_;	3245	my ($self) = @_;
2678		3246
2679	$self->SUPER::update;	3247	$self->SUPER::update;
2680		3248
2681	return unless $self->{h} > 0;	3249	return unless $self->{h} > 0;
2682		3250
2683	delete $self->{texture};	3251	delete $self->{texture};
2684		3252
2685	$ROOT->on_post_alloc ($self => sub {	3253	$ROOT->on_post_alloc ($self => sub {
		3254	$self->force_uptodate;
		3255
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3256	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3257
2688	if (delete $self->{need_reflow}) {
2689	my $height = 0;
2690
2691	for my $para (@{$self->{par}}) {
2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693	my $layout = $self->get_layout ($para);
2694	my ($w, $h) = $layout->size;
2695
2696	$para->{w} = $w + $para->{indent};
2697	$para->{h} = $h;
2698	$para->{wrapped} = $layout->has_wrapped;
2699	}
2700
2701	$height += $para->{h};
2702	}
2703
2704	$self->{height} = $height;
2705
2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708	delete $self->{texture};
2709	}
2710
2711	if (delete $self->{scroll_to_bottom}) {
2712	$self->{children}[1]->set_value (1e10);
2713	}
2714
2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3258	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3259	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3260	glClear GL_COLOR_BUFFER_BIT;
2718		3261
		3262	package CFPlus::UI::Base;
		3263	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3264	(0, 0, $self->{w}, $self->{h});
		3265
		3266	my $top = int $self->{children}[1]{range}[0];
		3267
		3268	my $paridx = 0;
		3269	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3270	my $top = int $self->{children}[1]{range}[0];
2720		3271
2721	my $y0 = $top;	3272	my $y0 = $top;
2722	my $y1 = $top + $H;	3273	my $y1 = $top + $H;
2723		3274
2724	my $y = 0;
2725
2726	glEnable GL_BLEND;
2727	#TODO# not correct in windows where rgba is forced off
2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730	for my $para (@{$self->{par}}) {	3275	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3276	my $h = $para->{h};
		3277	my $y = $para->{y};
2732		3278
2733	if ($y0 < $y + $h && $y < $y1) {	3279	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3280	my $layout = $self->get_layout ($para);
2736		3281
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3282	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3283
2742	if (my @w = @{ $para->{widget} }) {	3284	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3285	my @s = $layout->get_shapes;
2744		3286
2745	for (@w) {	3287	for (@w) {
…		…
2751	$_->draw;	3293	$_->draw;
2752	}	3294	}
2753	}	3295	}
2754	}	3296	}
2755		3297
2756	$y += $h;	3298	$paridx++;
		3299	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3300	}
2758		3301
2759	glDisable GL_BLEND;	3302	$self->{top_paragraph} = $top_paragraph;
2760	};	3303	};
2761	});	3304	});
2762	}	3305	}
2763		3306
2764	sub reconfigure {	3307	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3325	$self->{children}[1]->draw;
2783	}	3326	}
2784		3327
2785	#############################################################################	3328	#############################################################################
2786		3329
2787	package CFClient::UI::Animator;	3330	package CFPlus::UI::Animator;
2788		3331
2789	use CFClient::OpenGL;	3332	use CFPlus::OpenGL;
2790		3333
2791	our @ISA = CFClient::UI::Bin::;	3334	our @ISA = CFPlus::UI::Bin::;
2792		3335
2793	sub moveto {	3336	sub moveto {
2794	my ($self, $x, $y) = @_;	3337	my ($self, $x, $y) = @_;
2795		3338
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3339	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3367	glPopMatrix;
2825	}	3368	}
2826		3369
2827	#############################################################################	3370	#############################################################################
2828		3371
2829	package CFClient::UI::Flopper;	3372	package CFPlus::UI::Flopper;
2830		3373
2831	our @ISA = CFClient::UI::Button::;	3374	our @ISA = CFPlus::UI::Button::;
2832		3375
2833	sub new {	3376	sub new {
2834	my $class = shift;	3377	my $class = shift;
2835		3378
2836	my $self = $class->SUPER::new (	3379	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3391	$self->{other}->toggle_visibility;
2849	}	3392	}
2850		3393
2851	#############################################################################	3394	#############################################################################
2852		3395
2853	package CFClient::UI::Tooltip;	3396	package CFPlus::UI::Tooltip;
2854		3397
2855	our @ISA = CFClient::UI::Bin::;	3398	our @ISA = CFPlus::UI::Bin::;
2856		3399
2857	use CFClient::OpenGL;	3400	use CFPlus::OpenGL;
2858		3401
2859	sub new {	3402	sub new {
2860	my $class = shift;	3403	my $class = shift;
2861		3404
2862	$class->SUPER::new (	3405	$class->SUPER::new (
…		…
2865	)	3408	)
2866	}	3409	}
2867		3410
2868	sub set_tooltip_from {	3411	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3412	my ($self, $widget) = @_;
		3413
		3414	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3415	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3416
2871	my $tooltip = $widget->{tooltip};	3417	my $tooltip = $widget->{tooltip};
2872		3418
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3419	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3420	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3424	}
2879		3425
2880	$tooltip =~ s/^\n+//;	3426	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3427	$tooltip =~ s/\n+$//;
2882		3428
2883	$self->add (new CFClient::UI::Label	3429	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3430	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3431	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3432	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3433	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3434	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3435	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3436	);
2891	}	3437	}
2892		3438
…		…
2911		3457
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3458	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3459	my $widget = $self->{owner}
2914	or return;	3460	or return;
2915		3461
		3462	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3463	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3464
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3465	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3466	if $x + $self->{w} > $self->{root}{w};
2920		3467
2921	$self->move_abs ($x, $y);	3468	$self->move_abs ($x, $y);
		3469	} else {
		3470	$self->hide;
		3471	}
2922	});	3472	});
2923	}	3473	}
2924		3474
2925	sub _draw {	3475	sub _draw {
2926	my ($self) = @_;	3476	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3500	$self->SUPER::_draw;
2951	}	3501	}
2952		3502
2953	#############################################################################	3503	#############################################################################
2954		3504
2955	package CFClient::UI::Face;	3505	package CFPlus::UI::Face;
2956		3506
2957	our @ISA = CFClient::UI::Base::;	3507	our @ISA = CFPlus::UI::DrawBG::;
2958		3508
2959	use CFClient::OpenGL;	3509	use CFPlus::OpenGL;
2960		3510
2961	sub new {	3511	sub new {
2962	my $class = shift;	3512	my $class = shift;
2963		3513
2964	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
2965	aspect => 1,	3517	aspect => 1,
2966	can_events => 0,	3518	can_events => 0,
2967	@_,	3519	@_,
2968	);	3520	);
2969		3521
2970	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
2972		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2973	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3528	parked => 1,
2976	interval => $self->{animspeed},
2977	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
2978	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
2979	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
2980	},	3537	},
2981	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
2982	}	3542	}
2983		3543
2984	$self	3544	$self
2985	}	3545	}
2986		3546
		3547	sub update_timer {
		3548	my ($self) = @_;
		3549
		3550	return unless $self->{timer};
		3551
		3552	if ($self->{visible}) {
		3553	$self->{timer}->at (
		3554	$self->{anim_start}
		3555	+ $self->{animspeed}
		3556	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3557	);
		3558	$self->{timer}->start;
		3559	} else {
		3560	$self->{timer}->stop;
		3561	}
		3562	}
		3563
		3564	sub update_face {
		3565	my ($self) = @_;
		3566
		3567	return unless $::CONN;
		3568
		3569	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3570	if ($anim && @$anim) {
		3571	delete $self->{wait_face};
		3572	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3573	}
		3574	}
		3575	}
		3576
2987	sub size_request {	3577	sub size_request {
2988	(32, 8)	3578	my ($self) = @_;
		3579
		3580	if ($::CONN) {
		3581	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3582	if (my $tex = $::CONN->{texture}[$faceid]) {
		3583	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3584	} else {
		3585	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3586	$self->realloc;
		3587	});
		3588	}
		3589	}
		3590	}
		3591
		3592	($self->{size_w} || 8, $self->{size_h} || 8)
2989	}	3593	}
2990		3594
2991	sub update {	3595	sub update {
2992	my ($self) = @_;	3596	my ($self) = @_;
2993		3597
2994	return unless $self->{visible};	3598	return unless $self->{visible};
2995		3599
2996	$self->SUPER::update;	3600	$self->SUPER::update;
2997	}	3601	}
2998		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
2999	sub _draw {	3611	sub _draw {
3000	my ($self) = @_;	3612	my ($self) = @_;
3001		3613
3002	return unless $::CONN;	3614	return unless $::CONN;
3003		3615
3004	my $face;	3616	$self->SUPER::_draw;
3005		3617
3006	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
3008		3619	or return;
3009	$face = $anim->[ $self->{frame} % @$anim ]
3010	if $anim && @$anim;
3011	}
3012		3620
3013	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
3014		3622
3015	if ($tex) {	3623	if ($tex) {
3016	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
3017	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018	glColor 0, 0, 0, 1;	3626	glColor 0, 0, 0, 1;
…		…
3022	}	3630	}
3023		3631
3024	sub destroy {	3632	sub destroy {
3025	my ($self) = @_;	3633	my ($self) = @_;
3026		3634
3027	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
3028	if $self->{timer};	3636	if $self->{timer};
3029		3637
3030	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
3031	}	3639	}
3032		3640
3033	#############################################################################	3641	#############################################################################
3034		3642
3035	package CFClient::UI::Buttonbar;	3643	package CFPlus::UI::Buttonbar;
3036		3644
3037	our @ISA = CFClient::UI::HBox::;	3645	our @ISA = CFPlus::UI::HBox::;
3038		3646
3039	# TODO: should actualyl wrap buttons and other goodies.	3647	# TODO: should actually wrap buttons and other goodies.
3040		3648
3041	#############################################################################	3649	#############################################################################
3042		3650
3043	package CFClient::UI::Menu;	3651	package CFPlus::UI::Menu;
3044		3652
3045	our @ISA = CFClient::UI::FancyFrame::;	3653	our @ISA = CFPlus::UI::Toplevel::;
3046		3654
3047	use CFClient::OpenGL;	3655	use CFPlus::OpenGL;
3048		3656
3049	sub new {	3657	sub new {
3050	my $class = shift;	3658	my $class = shift;
3051		3659
3052	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
3053	items => [],	3661	items => [],
3054	z => 100,	3662	z => 100,
3055	@_,	3663	@_,
3056	);	3664	);
3057		3665
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3666	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3667
3060	for my $item (@{ $self->{items} }) {	3668	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3669	my ($widget, $cb, $tooltip) = @$item;
3062		3670
3063	# handle various types of items, only text for now	3671	# handle various types of items, only text for now
3064	if (!ref $widget) {	3672	if (!ref $widget) {
		3673	if ($widget =~ /\t/) {
		3674	my ($left, $right) = split /\t/, $widget, 2;
		3675
3065	$widget = new CFClient::UI::Label	3676	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3677	can_hover => 1,
3067	can_events => 1,	3678	can_events => 1,
		3679	tooltip => $tooltip,
		3680	children => [
		3681	(new CFPlus::UI::Label markup => $left, expand => 1),
		3682	(new CFPlus::UI::Label markup => $right, align => +1),
		3683	],
		3684	;
		3685
		3686	} else {
		3687	$widget = new CFPlus::UI::Label
		3688	can_hover => 1,
		3689	can_events => 1,
3068	markup => $widget,	3690	markup => $widget,
3069	tooltip => $tooltip	3691	tooltip => $tooltip;
		3692	}
3070	}	3693	}
3071		3694
3072	$self->{item}{$widget} = $item;	3695	$self->{item}{$widget} = $item;
3073		3696
3074	$self->{vbox}->add ($widget);	3697	$self->{vbox}->add ($widget);
…		…
3117	1	3740	1
3118	}	3741	}
3119		3742
3120	#############################################################################	3743	#############################################################################
3121		3744
3122	package CFClient::UI::Multiplexer;	3745	package CFPlus::UI::Multiplexer;
3123		3746
3124	our @ISA = CFClient::UI::Container::;	3747	our @ISA = CFPlus::UI::Container::;
3125		3748
3126	sub new {	3749	sub new {
3127	my $class = shift;	3750	my $class = shift;
3128		3751
3129	my $self = $class->SUPER::new (	3752	my $self = $class->SUPER::new (
…		…
3143		3766
3144	$self->{current} = $self->{children}[0]	3767	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3768	if @{ $self->{children} };
3146	}	3769	}
3147		3770
		3771	sub get_current_page {
		3772	my ($self) = @_;
		3773
		3774	$self->{current}
		3775	}
		3776
3148	sub set_current_page {	3777	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3778	my ($self, $page_or_widget) = @_;
3150		3779
3151	my $widget = ref $page_or_widget	3780	my $widget = ref $page_or_widget
3152	? $page_or_widget	3781	? $page_or_widget
…		…
3184	$self->{current}->draw;	3813	$self->{current}->draw;
3185	}	3814	}
3186		3815
3187	#############################################################################	3816	#############################################################################
3188		3817
3189	package CFClient::UI::Notebook;	3818	package CFPlus::UI::Notebook;
3190		3819
3191	our @ISA = CFClient::UI::VBox::;	3820	our @ISA = CFPlus::UI::VBox::;
3192		3821
3193	sub new {	3822	sub new {
3194	my $class = shift;	3823	my $class = shift;
3195		3824
3196	my $self = $class->SUPER::new (	3825	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3826	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3827	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3828	# filter => # will be put between multiplexer and $self
3200	@_,	3829	@_,
3201	);	3830	);
3202		3831
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3832	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3836	}
3208		3837
3209	sub add {	3838	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3839	my ($self, $title, $widget, $tooltip) = @_;
3211		3840
3212	Scalar::Util::weaken $self;	3841	CFPlus::weaken $self;
3213		3842
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3843	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3844	markup => $title,
3216	tooltip => $tooltip,	3845	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3846	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3847	);
3219		3848
3220	$self->{multiplexer}->add ($widget);	3849	$self->{multiplexer}->add ($widget);
3221	}	3850	}
3222		3851
		3852	sub get_current_page {
		3853	my ($self) = @_;
		3854
		3855	$self->{multiplexer}->get_current_page
		3856	}
		3857
3223	sub set_current_page {	3858	sub set_current_page {
3224	my ($self, $page) = @_;	3859	my ($self, $page) = @_;
3225		3860
3226	$self->{multiplexer}->set_current_page ($page);	3861	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3862	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3863	}
3229		3864
3230	#############################################################################	3865	#############################################################################
3231		3866
3232	package CFClient::UI::Combobox;	3867	package CFPlus::UI::Selector;
3233		3868
3234	use utf8;	3869	use utf8;
3235		3870
3236	our @ISA = CFClient::UI::Button::;	3871	our @ISA = CFPlus::UI::Button::;
3237		3872
3238	sub new {	3873	sub new {
3239	my $class = shift;	3874	my $class = shift;
3240		3875
3241	my $self = $class->SUPER::new (	3876	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3893	my ($value, $title, $tooltip) = @$_;
3259		3894
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3895	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3896	}
3262		3897
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3898	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3899	}
3265		3900
3266	sub _set_value {	3901	sub _set_value {
3267	my ($self, $value) = @_;	3902	my ($self, $value) = @_;
3268		3903
…		…
3283	$self->emit (changed => $value);	3918	$self->emit (changed => $value);
3284	}	3919	}
3285		3920
3286	#############################################################################	3921	#############################################################################
3287		3922
3288	package CFClient::UI::Statusbox;	3923	package CFPlus::UI::Statusbox;
3289		3924
3290	our @ISA = CFClient::UI::VBox::;	3925	our @ISA = CFPlus::UI::VBox::;
3291		3926
3292	sub new {	3927	sub new {
3293	my $class = shift;	3928	my $class = shift;
3294		3929
3295	my $self = $class->SUPER::new (	3930	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3931	fontsize => 0.8,
3297	@_,	3932	@_,
3298	);	3933	);
3299		3934
3300	Scalar::Util::weaken (my $this = $self);	3935	CFPlus::weaken (my $this = $self);
3301		3936
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3937	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3938
3304	$self	3939	$self
3305	}	3940	}
…		…
3307	sub reorder {	3942	sub reorder {
3308	my ($self) = @_;	3943	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3944	my $NOW = Time::HiRes::time;
3310		3945
3311	# freeze display when hovering over any label	3946	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3947	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3948	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3949	values %{ $self->{item} };
3315		3950
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3951	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3952	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3953	}
…		…
3339	for ($short) {	3974	for ($short) {
3340	s/^\s+//;	3975	s/^\s+//;
3341	s/\s+/ /g;	3976	s/\s+/ /g;
3342	}	3977	}
3343		3978
3344	new CFClient::UI::Label	3979	new CFPlus::UI::Label
3345	markup => $short,	3980	markup => $short,
3346	tooltip => $item->{tooltip},	3981	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3982	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3983	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3984	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	4038	count => 1,
3404	%arg,	4039	%arg,
3405	};	4040	};
3406	}	4041	}
3407		4042
		4043	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	4044	$self->reorder;
		4045	});
3409	}	4046	}
3410		4047
3411	sub reconfigure {	4048	sub reconfigure {
3412	my ($self) = @_;	4049	my ($self) = @_;
3413		4050
…		…
3426	$self->SUPER::destroy;	4063	$self->SUPER::destroy;
3427	}	4064	}
3428		4065
3429	#############################################################################	4066	#############################################################################
3430		4067
3431	package CFClient::UI::Inventory;
3432
3433	our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435	sub new {
3436	my $class = shift;
3437
3438	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440	@_,
3441	);
3442
3443	$self
3444	}
3445
3446	sub set_items {
3447	my ($self, $items) = @_;
3448
3449	$self->{child}->clear;
3450	return unless $items;
3451
3452	my @items = sort {
3453	($a->{type} <=> $b->{type})
3454	or ($a->{name} cmp $b->{name})
3455	} @$items;
3456
3457	$self->{real_items} = \@items;
3458
3459	my $row = 0;
3460	for my $item (@items) {
3461	CFClient::Item::update_widgets $item;
3462
3463	$self->{child}->add (0, $row, $item->{face_widget});
3464	$self->{child}->add (1, $row, $item->{desc_widget});
3465	$self->{child}->add (2, $row, $item->{weight_widget});
3466
3467	$row++;
3468	}
3469	}
3470
3471	#############################################################################
3472
3473	package CFClient::UI::BindEditor;
3474
3475	our @ISA = CFClient::UI::FancyFrame::;
3476
3477	sub new {
3478	my $class = shift;
3479
3480	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482	$self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486	text => "start recording",
3487	tooltip => "Start/Stops recording of actions."
3488	."All subsequent actions after the recording started will be captured."
3489	."The actions are displayed after the record was stopped."
3490	."To bind the action you have to click on the 'Bind' button",
3491	on_activate => sub {
3492	unless ($self->{recording}) {
3493	$self->start;
3494	} else {
3495	$self->stop;
3496	}
3497	});
3498
3499	$vb->add (new CFClient::UI::Label text => "Actions:");
3500	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3503	$vb->add (my $hb = new CFClient::UI::HBox);
3504	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505	$hb->add (new CFClient::UI::Button
3506	text => "bind",
3507	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508	on_activate => sub {
3509	$self->ask_for_bind;
3510	});
3511
3512	$vb->add (my $hb = new CFClient::UI::HBox);
3513	$hb->add (new CFClient::UI::Button
3514	text => "ok",
3515	expand => 1,
3516	tooltip => "This closes the binding editor and saves the binding",
3517	on_activate => sub {
3518	$self->hide;
3519	$self->commit;
3520	});
3521
3522	$hb->add (new CFClient::UI::Button
3523	text => "cancel",
3524	expand => 1,
3525	tooltip => "This closes the binding editor without saving",
3526	on_activate => sub {
3527	$self->hide;
3528	$self->{binding_cancel}->()
3529	if $self->{binding_cancel};
3530	});
3531
3532	$self->update_binding_widgets;
3533
3534	$self
3535	}
3536
3537	sub cfg_bind {
3538	my ($self, $mod, $sym, $cmds) = @_;
3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540	::update_bindings ();
3541	}
3542
3543	sub cfg_unbind {
3544	my ($self, $mod, $sym, $cmds) = @_;
3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546	::update_bindings ();
3547	}
3548
3549	sub commit {
3550	my ($self) = @_;
3551	my ($mod, $sym, $cmds) = $self->get_binding;
3552	if ($sym != 0 && @$cmds > 0) {
3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554	."'. Don't forget 'Save Config'!");
3555	$self->{binding_change}->($mod, $sym, $cmds)
3556	if $self->{binding_change};
3557	} else {
3558	$::STATUSBOX->add ("No action bound, no key or action specified!");
3559	$self->{binding_cancel}->()
3560	if $self->{binding_cancel};
3561	}
3562	}
3563
3564	sub start {
3565	my ($self) = @_;
3566
3567	$self->{rec_btn}->set_text ("stop recording");
3568	$self->{recording} = 1;
3569	$self->clear_command_list;
3570	$::CONN->start_record if $::CONN;
3571	}
3572
3573	sub stop {
3574	my ($self) = @_;
3575
3576	$self->{rec_btn}->set_text ("start recording");
3577	$self->{recording} = 0;
3578
3579	my $rec;
3580	$rec = $::CONN->stop_record if $::CONN;
3581	return unless ref $rec eq 'ARRAY';
3582	$self->set_command_list ($rec);
3583	}
3584
3585
3586	sub ask_for_bind_and_commit {
3587	my ($self) = @_;
3588	$self->ask_for_bind (1);
3589	}
3590
3591	sub ask_for_bind {
3592	my ($self, $commit, $end_cb) = @_;
3593
3594	CFClient::Binder::open_binding_dialog (sub {
3595	my ($mod, $sym) = @_;
3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597	$self->update_binding_widgets;
3598	$self->commit if $commit;
3599	$end_cb->() if $end_cb;
3600	});
3601	}
3602
3603	# $mod and $sym are the modifiers and key symbol
3604	# $cmds is a array ref of strings (the commands)
3605	# $cb is the callback that is executed on OK
3606	# $ccb is the callback that is executed on CANCEL and
3607	# when the binding was unsuccessful on OK
3608	sub set_binding {
3609	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611	$self->clear_command_list;
3612	$self->{recording} = 0;
3613	$self->{rec_btn}->set_text ("start recording");
3614
3615	$self->{binding} = [$mod, $sym];
3616	$self->{commands} = $cmds;
3617
3618	$self->{binding_change} = $cb;
3619	$self->{binding_cancel} = $ccb;
3620
3621	$self->update_binding_widgets;
3622	}
3623
3624	# this is a shortcut method that asks for a binding
3625	# and then just binds it.
3626	sub do_quick_binding {
3627	my ($self, $cmds, $end_cb) = @_;
3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629	$self->ask_for_bind (1, $end_cb);
3630	}
3631
3632	sub update_binding_widgets {
3633	my ($self) = @_;
3634	my ($mod, $sym, $cmds) = $self->get_binding;
3635	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636	$self->set_command_list ($cmds);
3637	}
3638
3639	sub get_binding {
3640	my ($self) = @_;
3641	return (
3642	$self->{binding}->[0],
3643	$self->{binding}->[1],
3644	[ grep { defined $_ } @{$self->{commands}} ]
3645	);
3646	}
3647
3648	sub clear_command_list {
3649	my ($self) = @_;
3650	$self->{cmdbox}->clear ();
3651	}
3652
3653	sub set_command_list {
3654	my ($self, $cmds) = @_;
3655
3656	$self->{cmdbox}->clear ();
3657	$self->{commands} = $cmds;
3658
3659	my $idx = 0;
3660
3661	for (@$cmds) {
3662	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664	my $i = $idx;
3665	$hb->add (new CFClient::UI::Label text => $_);
3666	$hb->add (new CFClient::UI::Button
3667	text => "delete",
3668	tooltip => "Deletes the action from the record",
3669	on_activate => sub {
3670	$self->{cmdbox}->remove ($hb);
3671	$cmds->[$i] = undef;
3672	});
3673
3674
3675	$idx++
3676	}
3677	}
3678
3679	#############################################################################
3680
3681	package CFClient::UI::SpellList;
3682
3683	our @ISA = CFClient::UI::Table::;
3684
3685	sub new {
3686	my $class = shift;
3687
3688	my $self = $class->SUPER::new (
3689	binding => [],
3690	commands => [],
3691	@_,
3692	)
3693	}
3694
3695	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708	sub rebuild_spell_list {
3709	my ($self) = @_;
3710
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;
3713
3714	return unless $::CONN;
3715
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722	my $row = 0;
3723
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};
3726
3727	$row++;
3728
3729	my $spell_cb = sub {
3730	my ($widget, $ev) = @_;
3731
3732	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {
3737	(new CFClient::UI::Menu
3738	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],
3742	)->popup ($ev);
3743	} else {
3744	return 0;
3745	}
3746
3747	1
3748	};
3749
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755	$self->add (0, $row, new CFClient::UI::Face
3756	face => $spell->{face},
3757	can_hover => 1,
3758	can_events => 1,
3759	tooltip => $tooltip,
3760	on_button_down => $spell_cb,
3761	);
3762
3763	$self->add (1, $row, new CFClient::UI::Label
3764	expand => 1,
3765	text => $spell->{name},
3766	can_hover => 1,
3767	can_events => 1,
3768	tooltip => $tooltip,
3769	on_button_down => $spell_cb,
3770	);
3771
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}
3777	});
3778	}
3779
3780	sub add_spell {
3781	my ($self, $spell) = @_;
3782
3783	$self->{spell}->{$spell->{name}} = $spell;
3784	$self->rebuild_spell_list;
3785	}
3786
3787	sub remove_spell {
3788	my ($self, $spell) = @_;
3789
3790	delete $self->{spell}->{$spell->{name}};
3791	$self->rebuild_spell_list;
3792	}
3793
3794	sub clear_spells {
3795	my ($self) = @_;
3796
3797	$self->{spell} = {};
3798	$self->rebuild_spell_list;
3799	}
3800
3801	#############################################################################
3802
3803	package CFClient::UI::Root;	4068	package CFPlus::UI::Root;
3804		4069
3805	our @ISA = CFClient::UI::Container::;	4070	our @ISA = CFPlus::UI::Container::;
3806		4071
3807	use List::Util qw(min max);	4072	use List::Util qw(min max);
3808		4073
3809	use CFClient::OpenGL;	4074	use CFPlus::OpenGL;
3810		4075
3811	sub new {	4076	sub new {
3812	my $class = shift;	4077	my $class = shift;
3813		4078
3814	my $self = $class->SUPER::new (	4079	my $self = $class->SUPER::new (
3815	visible => 1,	4080	visible => 1,
3816	@_,	4081	@_,
3817	);	4082	);
3818		4083
3819	Scalar::Util::weaken ($self->{root} = $self);	4084	CFPlus::weaken ($self->{root} = $self);
3820		4085
3821	$self	4086	$self
3822	}	4087	}
3823		4088
3824	sub size_request {	4089	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4255	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4256
3992	$w = 0 if $w < 0;	4257	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4258	$h = 0 if $h < 0;
3994		4259
		4260	$w = max $widget->{min_w}, $w;
		4261	$h = max $widget->{min_h}, $h;
		4262
		4263	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4264	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4265
		4266	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4267	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4268
3995	$w = int $w + 0.5;	4269	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4270	$h = int $h + 0.5;
3997		4271
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4272	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4273	$widget->{old_w} = $widget->{w};
…		…
4009		4283
4010	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
4011	$_->()	4285	$_->()
4012	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
4013	}	4287	}
4014
4015		4288
4016	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
4019		4292
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4295	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4296	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4297	glLoadIdentity;
4025		4298
4026	{	4299	{
4027	package CFClient::UI::Base;	4300	package CFPlus::UI::Base;
4028		4301
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4302	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4303	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4304
4033	$self->_draw;	4305	$self->_draw;
		4306	}
4034	}	4307	}
4035		4308
4036	#############################################################################	4309	#############################################################################
4037		4310
4038	package CFClient::UI;	4311	package CFPlus::UI;
4039		4312
4040	$ROOT = new CFClient::UI::Root;	4313	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4314	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4315
4043	1	4316	1
4044		4317

Diff Legend

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