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.368 by root, Mon Jun 25 05:43:37 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	}
…		…
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
875	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
876		950
877	sub new {	951	sub new {
878	my $class = shift;	952	my $class = shift;
879		953
880	$class->SUPER::new (	954	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1016	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1018	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1020	}
947	}	1021	}
948		1022
949	sub _render {	1023	sub _render {
950	my ($self) = @_;	1024	my ($self) = @_;
951		1025
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	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};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1028
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1030
957	$self->SUPER::_render;	1031	$self->SUPER::_render;
958	}	1032	}
959		1033
960	#############################################################################	1034	#############################################################################
961		1035
962	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
963		1037
964	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::HBox::;
965		1039
966	sub new {	1040	sub new {
967	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
968		1042
969	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
970		1044
971	my $self;	1045	my $self;
972		1046
973	my $slider = new CFClient::UI::Slider	1047	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1048	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1049	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1050	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1051	$self->{vp}->set_offset (0, $_[1]);
978	},	1052	},
979	;	1053	;
980		1054
981	$self = $class->SUPER::new (	1055	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1056	vp => (new CFPlus::UI::ViewPort expand => 1),
		1057	can_events => 1,
983	slider => $slider,	1058	slider => $slider,
984	%arg,	1059	%arg,
985	);	1060	);
986		1061
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1063	$self->add ($child) if $child;
989		1064
990	$self	1065	$self
991	}	1066	}
992		1067
		1068	#TODO# update range on size_allocate depending on child
		1069
993	sub add {	1070	sub add {
994	my ($self, $widget) = @_;	1071	my ($self, $widget) = @_;
995		1072
996	$self->{vp}->add ($self->{child} = $widget);	1073	$self->{vp}->add ($self->{child} = $widget);
997	}	1074	}
998		1075
		1076	sub invoke_mouse_wheel {
		1077	my ($self, $ev) = @_;
		1078
		1079	return 0 unless $ev->{dy}; # only vertical movements
		1080
		1081	$self->{slider}->emit (mouse_wheel => $ev);
		1082
		1083	1
		1084	}
		1085
		1086	sub update_slider {
		1087	my ($self) = @_;
		1088
		1089	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1090	}
		1091
999	sub update {	1092	sub update {
1000	my ($self) = @_;	1093	my ($self) = @_;
1001		1094
1002	$self->SUPER::update;	1095	$self->SUPER::update;
1003		1096
1004	# todo: overwrite size_allocate of child	1097	$self->update_slider;
1005	my $child = $self->{vp}->child;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007	}	1098	}
1008		1099
1009	sub invoke_size_allocate {	1100	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1101	my ($self, $w, $h) = @_;
1011		1102
1012	my $child = $self->{vp}->child;	1103	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014		1104
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1105	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1106	}
1017		1107
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1108	#############################################################################
1022		1109
1023	package CFClient::UI::Frame;	1110	package CFPlus::UI::Frame;
1024		1111
1025	our @ISA = CFClient::UI::Bin::;	1112	our @ISA = CFPlus::UI::Bin::;
1026		1113
1027	use CFClient::OpenGL;	1114	use CFPlus::OpenGL;
1028		1115
1029	sub new {	1116	sub new {
1030	my $class = shift;	1117	my $class = shift;
1031		1118
1032	$class->SUPER::new (	1119	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1145	$self->SUPER::_draw;
1059	}	1146	}
1060		1147
1061	#############################################################################	1148	#############################################################################
1062		1149
1063	package CFClient::UI::FancyFrame;	1150	package CFPlus::UI::FancyFrame;
1064		1151
1065	our @ISA = CFClient::UI::Bin::;	1152	our @ISA = CFPlus::UI::Bin::;
1066		1153
1067	use CFClient::OpenGL;	1154	use CFPlus::OpenGL;
		1155
		1156	sub new {
		1157	my ($class, %arg) = @_;
		1158
		1159	if ((exists $arg{label}) && !ref $arg{label}) {
		1160	$arg{label} = new CFPlus::UI::Label
		1161	align => 1,
		1162	valign => 0,
		1163	text => $arg{label},
		1164	fontsize => ($arg{border} || 0.8) * 0.75;
		1165	}
		1166
		1167	my $self = $class->SUPER::new (
		1168	# label => "",
		1169	fg => [0.6, 0.3, 0.1],
		1170	border => 0.8,
		1171	style => 'single',
		1172	%arg,
		1173	);
		1174
		1175	$self
		1176	}
		1177
		1178	sub add {
		1179	my ($self, @widgets) = @_;
		1180
		1181	$self->SUPER::add (@widgets);
		1182	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1183	}
		1184
		1185	sub border {
		1186	int $_[0]{border} * $::FONTSIZE
		1187	}
		1188
		1189	sub size_request {
		1190	my ($self) = @_;
		1191
		1192	($self->{label_w}, undef) = $self->{label}->size_request
		1193	if $self->{label};
		1194
		1195	my ($w, $h) = $self->SUPER::size_request;
		1196
		1197	(
		1198	$w + $self->border * 2,
		1199	$h + $self->border * 2,
		1200	)
		1201	}
		1202
		1203	sub invoke_size_allocate {
		1204	my ($self, $w, $h) = @_;
		1205
		1206	my $border = $self->border;
		1207
		1208	$w -= List::Util::max 0, $border * 2;
		1209	$h -= List::Util::max 0, $border * 2;
		1210
		1211	if (my $label = $self->{label}) {
		1212	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1213	$label->{h} = List::Util::min $h, $border;
		1214	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1215	}
		1216
		1217	$self->child->configure ($border, $border, $w, $h);
		1218
		1219	1
		1220	}
		1221
		1222	sub _draw {
		1223	my ($self) = @_;
		1224
		1225	my $child = $self->{children}[0];
		1226
		1227	my $border = $self->border;
		1228	my ($w, $h) = ($self->{w}, $self->{h});
		1229
		1230	$child->draw;
		1231
		1232	glColor @{$self->{fg}};
		1233	glBegin GL_LINE_STRIP;
		1234	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1235	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1236	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1237	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1238	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1239	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1240	glEnd;
		1241
		1242	if ($self->{label}) {
		1243	glTranslate $border * 2, 0;
		1244	$self->{label}->_draw;
		1245	}
		1246	}
		1247
		1248	#############################################################################
		1249
		1250	package CFPlus::UI::Toplevel;
		1251
		1252	our @ISA = CFPlus::UI::Bin::;
		1253
		1254	use CFPlus::OpenGL;
1068		1255
1069	my $bg =	1256	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1257	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1258	mipmap => 1, wrap => 1;
1072		1259
1073	my @border =	1260	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1261	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);	1262	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1263
1077	sub new {	1264	sub new {
1078	my ($class, %arg) = @_;	1265	my ($class, %arg) = @_;
1079		1266
1080	my $self = $class->SUPER::new (	1267	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1268	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1269	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1270	border => 0.6,
1084	can_events => 1,	1271	can_events => 1,
1085	min_w => 16,	1272	min_w => 64,
1086	min_h => 16,	1273	min_h => 32,
1087	%arg,	1274	%arg,
1088	);	1275	);
1089		1276
1090	$self->{title_widget} = new CFClient::UI::Label	1277	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1278	align => 0,
1092	valign => 1,	1279	valign => 1,
1093	text => $self->{title},	1280	text => $self->{title},
1094	fontsize => $self->{border},	1281	fontsize => $self->{border},
1095	if exists $self->{title};	1282	if exists $self->{title};
1096		1283
1097	if ($self->{has_close_button}) {	1284	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1285	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1286	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1287	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1288	on_activate => sub { $self->emit ("delete") };
1102		1289
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1290	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1291	}
1105		1292
1106	$self	1293	$self
1107	}	1294	}
1108		1295
1109	sub add {	1296	sub add {
1110	my ($self, @widgets) = @_;	1297	my ($self, @widgets) = @_;
1111		1298
1112	$self->SUPER::add (@widgets);	1299	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1300	$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};	1301	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1302	}
1116		1303
1117	sub border {	1304	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1305	int $_[0]{border} * $::FONTSIZE
1119	}	1306	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1339	$self->child->configure ($border, $border, $w, $h);
1153		1340
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1341	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1342	if $self->{close_button};
1156		1343
		1344	1
		1345	}
		1346
		1347	sub invoke_delete {
		1348	my ($self) = @_;
		1349
		1350	$self->hide;
		1351
1157	1	1352	1
1158	}	1353	}
1159		1354
1160	sub invoke_button_down {	1355	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1356	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1414	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1415
1221	! ! $self->{motion}	1416	! ! $self->{motion}
1222	}	1417	}
1223		1418
		1419	sub invoke_visibility_change {
		1420	my ($self, $visible) = @_;
		1421
		1422	delete $self->{motion} unless $visible;
		1423
		1424	0
		1425	}
		1426
1224	sub _draw {	1427	sub _draw {
1225	my ($self) = @_;	1428	my ($self) = @_;
1226		1429
1227	my $child = $self->{children}[0];	1430	my $child = $self->{children}[0];
1228		1431
…		…
1265	if $self->{close_button};	1468	if $self->{close_button};
1266	}	1469	}
1267		1470
1268	#############################################################################	1471	#############################################################################
1269		1472
1270	package CFClient::UI::Table;	1473	package CFPlus::UI::Table;
1271		1474
1272	our @ISA = CFClient::UI::Base::;	1475	our @ISA = CFPlus::UI::Base::;
1273		1476
1274	use List::Util qw(max sum);	1477	use List::Util qw(max sum);
1275		1478
1276	use CFClient::OpenGL;	1479	use CFPlus::OpenGL;
1277		1480
1278	sub new {	1481	sub new {
1279	my $class = shift;	1482	my $class = shift;
1280		1483
1281	$class->SUPER::new (	1484	$class->SUPER::new (
…		…
1287	sub children {	1490	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1492	}
1290		1493
1291	sub add {	1494	sub add {
1292	my ($self, $x, $y, $child) = @_;	1495	my ($self) = shift;
1293		1496
		1497	while (@_) {
		1498	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1499	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1500	$self->{children}[$y][$x] = $child;
		1501	}
1296		1502
		1503	$self->{force_realloc} = 1;
		1504	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1505	$self->realloc;
1298	}	1506	}
1299		1507
1300	sub remove {	1508	sub remove {
1301	my ($self, $child) = @_;	1509	my ($self, $child) = @_;
…		…
1366		1574
1367	# linearly scale sizes	1575	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1578
1371	CFClient::UI::harmonize $ws;	1579	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1580	CFPlus::UI::harmonize $hs;
1373		1581
1374	my $y;	1582	my $y;
1375		1583
1376	for my $r (0 .. $#{$self->{children}}) {	1584	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1585	my $row = $self->{children}[$r]
…		…
1420	}	1628	}
1421	}	1629	}
1422		1630
1423	#############################################################################	1631	#############################################################################
1424		1632
1425	package CFClient::UI::Box;	1633	package CFPlus::UI::Box;
1426		1634
1427	our @ISA = CFClient::UI::Container::;	1635	our @ISA = CFPlus::UI::Container::;
1428		1636
1429	sub size_request {	1637	sub size_request {
1430	my ($self) = @_;	1638	my ($self) = @_;
1431		1639
1432	$self->{vertical}	1640	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1673	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1674	for 0 .. $#children;
1467	}	1675	}
1468	}	1676	}
1469		1677
1470	CFClient::UI::harmonize \@req;	1678	CFPlus::UI::harmonize \@req;
1471		1679
1472	my $pos = 0;	1680	my $pos = 0;
1473	for (0 .. $#children) {	1681	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1682	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1683	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1688	1
1481	}	1689	}
1482		1690
1483	#############################################################################	1691	#############################################################################
1484		1692
1485	package CFClient::UI::HBox;	1693	package CFPlus::UI::HBox;
1486		1694
1487	our @ISA = CFClient::UI::Box::;	1695	our @ISA = CFPlus::UI::Box::;
1488		1696
1489	sub new {	1697	sub new {
1490	my $class = shift;	1698	my $class = shift;
1491		1699
1492	$class->SUPER::new (	1700	$class->SUPER::new (
…		…
1495	)	1703	)
1496	}	1704	}
1497		1705
1498	#############################################################################	1706	#############################################################################
1499		1707
1500	package CFClient::UI::VBox;	1708	package CFPlus::UI::VBox;
1501		1709
1502	our @ISA = CFClient::UI::Box::;	1710	our @ISA = CFPlus::UI::Box::;
1503		1711
1504	sub new {	1712	sub new {
1505	my $class = shift;	1713	my $class = shift;
1506		1714
1507	$class->SUPER::new (	1715	$class->SUPER::new (
…		…
1510	)	1718	)
1511	}	1719	}
1512		1720
1513	#############################################################################	1721	#############################################################################
1514		1722
1515	package CFClient::UI::Label;	1723	package CFPlus::UI::Label;
1516		1724
1517	our @ISA = CFClient::UI::DrawBG::;	1725	our @ISA = CFPlus::UI::DrawBG::;
1518		1726
1519	use CFClient::OpenGL;	1727	use CFPlus::OpenGL;
1520		1728
1521	sub new {	1729	sub new {
1522	my ($class, %arg) = @_;	1730	my ($class, %arg) = @_;
1523		1731
1524	my $self = $class->SUPER::new (	1732	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1735	#active_bg => none
1528	#font => default_font	1736	#font => default_font
1529	#text => initial text	1737	#text => initial text
1530	#markup => initial narkup	1738	#markup => initial narkup
1531	#max_w => maximum pixel width	1739	#max_w => maximum pixel width
		1740	#style => 0, # render flags
1532	ellipsise => 3, # end	1741	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1742	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1743	fontsize => 1,
1535	align => -1,	1744	align => -1,
1536	valign => -1,	1745	valign => -1,
1537	padding_x => 2,	1746	padding_x => 2,
1538	padding_y => 2,	1747	padding_y => 2,
1539	can_events => 0,	1748	can_events => 0,
1540	%arg	1749	%arg
1541	);	1750	);
1542		1751
1543	if (exists $self->{template}) {	1752	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1753	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1754	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1755	$self->{template} = $layout;
1547	}	1756	}
1548		1757
1549	if (exists $self->{markup}) {	1758	if (exists $self->{markup}) {
…		…
1553	}	1762	}
1554		1763
1555	$self	1764	$self
1556	}	1765	}
1557		1766
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 {	1767	sub update {
1569	my ($self) = @_;	1768	my ($self) = @_;
1570		1769
1571	delete $self->{texture};	1770	delete $self->{texture};
1572	$self->SUPER::update;	1771	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1782	my ($self, $text) = @_;
1584		1783
1585	return if $self->{text} eq "T$text";	1784	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1785	$self->{text} = "T$text";
1587		1786
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1787	$self->{layout}->set_text ($text);
1590		1788
1591	delete $self->{size_req};	1789	delete $self->{size_req};
1592	$self->realloc;	1790	$self->realloc;
1593	$self->update;	1791	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1797	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1798	$self->{text} = "M$markup";
1601		1799
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1800	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1801
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1802	$self->{layout}->set_markup ($markup);
1606		1803
1607	delete $self->{size_req};	1804	delete $self->{size_req};
1608	$self->realloc;	1805	$self->realloc;
1609	$self->update;	1806	$self->update;
…		…
1621		1818
1622	my ($w, $h) = $self->{layout}->size;	1819	my ($w, $h) = $self->{layout}->size;
1623		1820
1624	if (exists $self->{template}) {	1821	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1822	$self->{template}->set_font ($self->{font}) if $self->{font};
		1823	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1824	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1825
1628	my ($w2, $h2) = $self->{template}->size;	1826	my ($w2, $h2) = $self->{template}->size;
1629		1827
1630	$w = List::Util::max $w, $w2;	1828	$w = List::Util::max $w, $w2;
…		…
1654		1852
1655	sub set_fontsize {	1853	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1854	my ($self, $fontsize) = @_;
1657		1855
1658	$self->{fontsize} = $fontsize;	1856	$self->{fontsize} = $fontsize;
		1857	delete $self->{size_req};
1659	delete $self->{texture};	1858	delete $self->{texture};
1660		1859
1661	$self->realloc;	1860	$self->realloc;
1662	}	1861	}
1663		1862
1664	sub reconfigure {	1863	sub reconfigure {
1665	my ($self) = @_;	1864	my ($self) = @_;
1666		1865
1667	delete $self->{size_req};	1866	delete $self->{size_req};
		1867	delete $self->{texture};
1668		1868
1669	$self->SUPER::reconfigure;	1869	$self->SUPER::reconfigure;
1670	}	1870	}
1671		1871
1672	sub _draw {	1872	sub _draw {
1673	my ($self) = @_;	1873	my ($self) = @_;
1674		1874
1675	$self->SUPER::_draw; # draw background, if applicable	1875	$self->SUPER::_draw; # draw background, if applicable
1676		1876
1677	my $tex = $self->{texture} ||= do {	1877	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1878	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1879	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1880	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1881	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1882	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1883	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1884
1685	new_from_layout CFClient::Texture $self->{layout}	1885	[$self->{layout}->size]
1686	};	1886	};
1687		1887
1688	unless (exists $self->{ox}) {	1888	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1889	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1890	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1891	: ($self->{w} - $size->[0]) * 0.5);
1692		1892
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1893	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1894	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1895	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1896	};
1697		1897
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1898	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1899	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1900
1703	if ($tex->{format} == GL_ALPHA) {	1901	$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	}	1902	}
1714		1903
1715	#############################################################################	1904	#############################################################################
1716		1905
1717	package CFClient::UI::EntryBase;	1906	package CFPlus::UI::EntryBase;
1718		1907
1719	our @ISA = CFClient::UI::Label::;	1908	our @ISA = CFPlus::UI::Label::;
1720		1909
1721	use CFClient::OpenGL;	1910	use CFPlus::OpenGL;
1722		1911
1723	sub new {	1912	sub new {
1724	my $class = shift;	1913	my $class = shift;
1725		1914
1726	$class->SUPER::new (	1915	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1919	active_fg => [0, 0, 0],
1731	can_hover => 1,	1920	can_hover => 1,
1732	can_focus => 1,	1921	can_focus => 1,
1733	valign => 0,	1922	valign => 0,
1734	can_events => 1,	1923	can_events => 1,
		1924	ellipsise => 0,
1735	#text => ...	1925	#text => ...
1736	#hidden => "*",	1926	#hidden => "*",
1737	@_	1927	@_
1738	)	1928	)
1739	}	1929	}
…		…
1784	my $sym = $ev->{sym};	1974	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	1975	my $uni = $ev->{unicode};
1786		1976
1787	my $text = $self->get_text;	1977	my $text = $self->get_text;
1788		1978
		1979	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1980
1789	if ($uni == 8) {	1981	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1982	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1983	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1984	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1985	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1986	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1987	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1988	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1989	} elsif ($sym == CFPlus::SDLK_HOME) {
		1990	# what a hack
		1991	$self->{cursor} =
		1992	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1993	? length $1
		1994	: 0;
		1995	} elsif ($sym == CFPlus::SDLK_END) {
		1996	# uh, again
		1997	$self->{cursor} =
		1998	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1999	? $self->{cursor} + length $1
		2000	: length $self->{text};
		2001	} elsif ($uni == 21) { # ctrl-u
		2002	$text = "";
1798	$self->{cursor} = 0;	2003	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2004	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2005	$self->emit ('escape');
1803	} elsif ($uni) {	2006	} elsif ($uni == 0x0d) {
		2007	substr $text, $self->{cursor}++, 0, "\012";
		2008	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2009	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2010	} else {
1806	return 0;	2011	return 0;
1807	}	2012	}
1808		2013
1809	$self->_set_text ($text);	2014	$self->_set_text ($text);
1810		2015
1811	$self->realloc;	2016	$self->realloc;
		2017	$self->update;
1812		2018
1813	1	2019	1
1814	}	2020	}
1815		2021
1816	sub invoke_focus_in {	2022	sub invoke_focus_in {
…		…
1828		2034
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2035	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2036
1831	# byte-index to char-index	2037	# byte-index to char-index
1832	my $text = $self->{text};	2038	my $text = $self->{text};
1833	utf8::encode $text;	2039	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2040	$self->{cursor} = length $text;
1835		2041
1836	$self->_set_text ($self->{text});	2042	$self->_set_text ($self->{text});
1837	$self->update;	2043	$self->update;
1838		2044
1839	1	2045	1
…		…
1878	utf8::encode $text;	2084	utf8::encode $text;
1879		2085
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2086	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2087	}
1882		2088
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2089	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2090	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};	2091	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2092	glEnd;
1888	}	2093	}
1889	}	2094	}
1890		2095
		2096	#############################################################################
		2097
1891	package CFClient::UI::Entry;	2098	package CFPlus::UI::Entry;
1892		2099
1893	our @ISA = CFClient::UI::EntryBase::;	2100	our @ISA = CFPlus::UI::EntryBase::;
1894		2101
1895	use CFClient::OpenGL;	2102	use CFPlus::OpenGL;
1896		2103
1897	sub invoke_key_down {	2104	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2105	my ($self, $ev) = @_;
1899		2106
1900	my $sym = $ev->{sym};	2107	my $sym = $ev->{sym};
1901		2108
1902	if ($sym == 13) {	2109	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2110	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2111	my $txt = $self->get_text;
1905		2112
1906	$self->{history_pointer} = -1;	2113	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2114	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2115	$self->emit (activate => $txt);
1909	$self->update;	2116	$self->update;
1910		2117
1911	} elsif ($sym == CFClient::SDLK_UP) {	2118	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2119	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2120	$self->{history_saveback} = $self->get_text;
1914	}	2121	}
1915	if (@{$self->{history} || []} > 0) {	2122	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2123	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2125	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2126	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2127	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2128	}
1922		2129
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2130	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2131	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2132	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2133
1927	if ($self->{history_pointer} >= 0) {	2134	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2135	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2144	1
1938	}	2145	}
1939		2146
1940	#############################################################################	2147	#############################################################################
1941		2148
		2149	package CFPlus::UI::TextEdit;
		2150
		2151	our @ISA = CFPlus::UI::EntryBase::;
		2152
		2153	use CFPlus::OpenGL;
		2154
		2155	sub move_cursor_ver {
		2156	my ($self, $dy) = @_;
		2157
		2158	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2159
		2160	$y += $dy;
		2161
		2162	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2163	$self->{cursor} = $index;
		2164	delete $self->{cur_h};
		2165	$self->update;
		2166	return;
		2167	}
		2168	}
		2169
		2170	sub invoke_key_down {
		2171	my ($self, $ev) = @_;
		2172
		2173	my $sym = $ev->{sym};
		2174
		2175	if ($sym == CFPlus::SDLK_UP) {
		2176	$self->move_cursor_ver (-1);
		2177	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2178	$self->move_cursor_ver (+1);
		2179	} else {
		2180	return $self->SUPER::invoke_key_down ($ev)
		2181	}
		2182
		2183	1
		2184	}
		2185
		2186	#############################################################################
		2187
1942	package CFClient::UI::Button;	2188	package CFPlus::UI::Button;
1943		2189
1944	our @ISA = CFClient::UI::Label::;	2190	our @ISA = CFPlus::UI::Label::;
1945		2191
1946	use CFClient::OpenGL;	2192	use CFPlus::OpenGL;
1947		2193
1948	my @tex =	2194	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2196	qw(b1_button_active.png);
1951		2197
1952	sub new {	2198	sub new {
1953	my $class = shift;	2199	my $class = shift;
1954		2200
…		…
1991	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
1992	}	2238	}
1993		2239
1994	#############################################################################	2240	#############################################################################
1995		2241
		2242	package CFPlus::UI::CheckBox;
		2243
		2244	our @ISA = CFPlus::UI::DrawBG::;
		2245
		2246	my @tex =
		2247	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2248	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2249
		2250	use CFPlus::OpenGL;
		2251
		2252	sub new {
		2253	my $class = shift;
		2254
		2255	$class->SUPER::new (
		2256	padding_x => 2,
		2257	padding_y => 2,
		2258	fg => [1, 1, 1],
		2259	active_fg => [1, 1, 0],
		2260	bg => [0, 0, 0, 0.2],
		2261	active_bg => [1, 1, 1, 0.5],
		2262	state => 0,
		2263	can_hover => 1,
		2264	@_
		2265	)
		2266	}
		2267
		2268	sub size_request {
		2269	my ($self) = @_;
		2270
		2271	(6) x 2
		2272	}
		2273
		2274	sub toggle {
		2275	my ($self) = @_;
		2276
		2277	$self->{state} = !$self->{state};
		2278	$self->emit (changed => $self->{state});
		2279	$self->update;
		2280	}
		2281
		2282	sub invoke_button_down {
		2283	my ($self, $ev, $x, $y) = @_;
		2284
		2285	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2286	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2287	$self->toggle;
		2288	} else {
		2289	return 0
		2290	}
		2291
		2292	1
		2293	}
		2294
		2295	sub _draw {
		2296	my ($self) = @_;
		2297
		2298	$self->SUPER::_draw;
		2299
		2300	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2301
		2302	my ($w, $h) = @$self{qw(w h)};
		2303
		2304	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2305
		2306	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2307
		2308	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2309
		2310	glEnable GL_TEXTURE_2D;
		2311	$tex->draw_quad_alpha (0, 0, $s, $s);
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
		2317	package CFPlus::UI::Image;
		2318
		2319	our @ISA = CFPlus::UI::Base::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	our %texture_cache;
		2324
		2325	sub new {
		2326	my $class = shift;
		2327
		2328	my $self = $class->SUPER::new (
		2329	can_events => 0,
		2330	@_,
		2331	);
		2332
		2333	$self->{path} || $self->{tex}
		2334	or Carp::croak "'path' or 'tex' attributes required";
		2335
		2336	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2337	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2338
		2339	CFPlus::weaken $texture_cache{$self->{path}};
		2340
		2341	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2342
		2343	$self
		2344	}
		2345
		2346	sub STORABLE_freeze {
		2347	my ($self, $cloning) = @_;
		2348
		2349	$self->{path}
		2350	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2351
		2352	$self->{path}
		2353	}
		2354
		2355	sub STORABLE_attach {
		2356	my ($self, $cloning, $path) = @_;
		2357
		2358	$self->new (path => $path)
		2359	}
		2360
		2361	sub size_request {
		2362	my ($self) = @_;
		2363
		2364	($self->{tex}{w}, $self->{tex}{h})
		2365	}
		2366
		2367	sub _draw {
		2368	my ($self) = @_;
		2369
		2370	my $tex = $self->{tex};
		2371
		2372	my ($w, $h) = ($self->{w}, $self->{h});
		2373
		2374	if ($self->{rot90}) {
		2375	glRotate 90, 0, 0, 1;
		2376	glTranslate 0, -$self->{w}, 0;
		2377
		2378	($w, $h) = ($h, $w);
		2379	}
		2380
		2381	glEnable GL_TEXTURE_2D;
		2382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2383
		2384	$tex->draw_quad (0, 0, $w, $h);
		2385
		2386	glDisable GL_TEXTURE_2D;
		2387	}
		2388
		2389	#############################################################################
		2390
1996	package CFClient::UI::ImageButton;	2391	package CFPlus::UI::ImageButton;
1997		2392
1998	our @ISA = CFClient::UI::Image::;	2393	our @ISA = CFPlus::UI::Image::;
1999		2394
2000	use CFClient::OpenGL;	2395	use CFPlus::OpenGL;
2001		2396
2002	my %textures;	2397	my %textures;
2003		2398
2004	sub new {	2399	sub new {
2005	my $class = shift;	2400	my $class = shift;
…		…
2027	1	2422	1
2028	}	2423	}
2029		2424
2030	#############################################################################	2425	#############################################################################
2031		2426
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;	2427	package CFPlus::UI::VGauge;
2101		2428
2102	our @ISA = CFClient::UI::Base::;	2429	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		2430
2163	use List::Util qw(min max);	2431	use List::Util qw(min max);
2164		2432
2165	use CFClient::OpenGL;	2433	use CFPlus::OpenGL;
2166		2434
2167	my %tex = (	2435	my %tex = (
2168	food => [	2436	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2438	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2439	],
2172	grace => [	2440	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	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/	2442	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2443	],
2176	hp => [	2444	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2446	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2447	],
2180	mana => [	2448	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2449	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/	2450	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2451	],
2184	);	2452	);
2185		2453
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2454	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2514	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2515	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2516
2249	my $h1 = $self->{h} * (1 - $ycut1);	2517	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2518	my $h2 = $self->{h} * (1 - $ycut2);
		2519	my $h3 = $self->{h};
		2520
		2521	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2522
2252	glEnable GL_BLEND;	2523	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2524	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2525	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2526	glEnable GL_TEXTURE_2D;
…		…
2274		2545
2275	if ($t3) {	2546	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2547	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2548	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2549	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2550	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2551	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2552	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2553	glEnd;
2283	}	2554	}
2284		2555
2285	glDisable GL_BLEND;	2556	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2287	}	2558	}
2288		2559
2289	#############################################################################	2560	#############################################################################
2290		2561
2291	package CFClient::UI::Gauge;	2562	package CFPlus::UI::Gauge;
2292		2563
2293	our @ISA = CFClient::UI::VBox::;	2564	our @ISA = CFPlus::UI::VBox::;
2294		2565
2295	sub new {	2566	sub new {
2296	my ($class, %arg) = @_;	2567	my ($class, %arg) = @_;
2297		2568
2298	my $self = $class->SUPER::new (	2569	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2571	can_hover => 1,
2301	can_events => 1,	2572	can_events => 1,
2302	%arg,	2573	%arg,
2303	);	2574	);
2304		2575
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2576	$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);	2577	$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");	2578	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2579
2309	$self	2580	$self
2310	}	2581	}
2311		2582
2312	sub set_fontsize {	2583	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2604	$self->{value}->set_text ($val);
2334	}	2605	}
2335		2606
2336	#############################################################################	2607	#############################################################################
2337		2608
2338	package CFClient::UI::Slider;	2609	package CFPlus::UI::Slider;
2339		2610
2340	use strict;	2611	use strict;
2341		2612
2342	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2343		2614
2344	our @ISA = CFClient::UI::DrawBG::;	2615	our @ISA = CFPlus::UI::DrawBG::;
2345		2616
2346	my @tex =	2617	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2619	qw(s1_slider.png s1_slider_bg.png);
2349		2620
2350	sub new {	2621	sub new {
2351	my $class = shift;	2622	my $class = shift;
2352		2623
…		…
2441	}	2712	}
2442		2713
2443	1	2714	1
2444	}	2715	}
2445		2716
		2717	sub invoke_mouse_wheel {
		2718	my ($self, $ev) = @_;
		2719
		2720	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2721
		2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2723
		2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2725
		2726	! ! $delta
		2727	}
		2728
2446	sub update {	2729	sub update {
2447	my ($self) = @_;	2730	my ($self) = @_;
2448		2731
2449	delete $self->{knob_w};	2732	delete $self->{knob_w};
2450	$self->SUPER::update;	2733	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2498	}	2781	}
2499		2782
2500	#############################################################################	2783	#############################################################################
2501		2784
2502	package CFClient::UI::ValSlider;	2785	package CFPlus::UI::ValSlider;
2503		2786
2504	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFPlus::UI::HBox::;
2505		2788
2506	sub new {	2789	sub new {
2507	my ($class, %arg) = @_;	2790	my ($class, %arg) = @_;
2508		2791
2509	my $range = delete $arg{range};	2792	my $range = delete $arg{range};
2510		2793
2511	my $self = $class->SUPER::new (	2794	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2795	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2796	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2797	to_value => sub { shift },
2515	from_value => sub { shift },	2798	from_value => sub { shift },
2516	%arg,	2799	%arg,
2517	);	2800	);
2518		2801
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2821	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2822	sub set_value { shift->{slider}->set_value (@_) }
2540		2823
2541	#############################################################################	2824	#############################################################################
2542		2825
2543	package CFClient::UI::TextScroller;	2826	package CFPlus::UI::TextScroller;
2544		2827
2545	our @ISA = CFClient::UI::HBox::;	2828	our @ISA = CFPlus::UI::HBox::;
2546		2829
2547	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2548		2831
2549	sub new {	2832	sub new {
2550	my $class = shift;	2833	my $class = shift;
2551		2834
2552	my $self = $class->SUPER::new (	2835	my $self = $class->SUPER::new (
2553	fontsize => 1,	2836	fontsize => 1,
2554	can_events => 0,	2837	can_events => 1,
2555	indent => 0,	2838	indent => 0,
2556	#font => default_font	2839	#font => default_font
2557	@_,	2840	@_,
2558		2841
2559	layout => (new CFClient::Layout 1),	2842	layout => (new CFPlus::Layout),
2560	par => [],	2843	par => [],
		2844	max_par => 0,
2561	height => 0,	2845	height => 0,
2562	children => [	2846	children => [
2563	(new CFClient::UI::Empty expand => 1),	2847	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2848	(new CFPlus::UI::Slider vertical => 1),
2565	],	2849	],
2566	);	2850	);
2567		2851
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2852	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2853
…		…
2575		2859
2576	$self->{fontsize} = $fontsize;	2860	$self->{fontsize} = $fontsize;
2577	$self->reflow;	2861	$self->reflow;
2578	}	2862	}
2579		2863
2580	sub visible_children {	2864	sub size_request {
2581	my ($self) = @_;	2865	my ($self) = @_;
2582		2866
2583	@{$self->{children}}[0,1]	2867	my ($empty, $slider) = @{ $self->{children} };
		2868
		2869	local $self->{children} = [$empty, $slider];
		2870	$self->SUPER::size_request
2584	}	2871	}
2585		2872
2586	sub invoke_size_allocate {	2873	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	2874	my ($self, $w, $h) = @_;
2588		2875
…		…
2594	$self->{layout}->set_width ($empty->{w});	2881	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2882	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		2883
2597	$self->reflow;	2884	$self->reflow;
2598		2885
		2886	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	2887	$self->SUPER::invoke_size_allocate ($w, $h)
		2888	}
		2889
		2890	sub invoke_mouse_wheel {
		2891	my ($self, $ev) = @_;
		2892
		2893	return 0 unless $ev->{dy}; # only vertical movements
		2894
		2895	$self->{children}[1]->emit (mouse_wheel => $ev);
		2896
		2897	1
2600	}	2898	}
2601		2899
2602	sub get_layout {	2900	sub get_layout {
2603	my ($self, $para) = @_;	2901	my ($self, $para) = @_;
2604		2902
…		…
2632		2930
2633	# todo: base offset on lines or so, not on pixels	2931	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	2932	$self->{children}[1]->set_value ($offset);
2635	}	2933	}
2636		2934
		2935	sub current_paragraph {
		2936	my ($self) = @_;
		2937
		2938	$self->{top_paragraph} - 1
		2939	}
		2940
		2941	sub scroll_to {
		2942	my ($self, $para) = @_;
		2943
		2944	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2945
		2946	$self->{scroll_to} = $para;
		2947	$self->update;
		2948	}
		2949
2637	sub clear {	2950	sub clear {
2638	my ($self) = @_;	2951	my ($self) = @_;
2639		2952
2640	my (undef, undef, @other) = @{ $self->{children} };	2953	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	2954	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	2957	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2958	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	2959	}
2647		2960
2648	sub add_paragraph {	2961	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	2962	my $self = shift;
2650		2963
2651	my ($text, @w) = ref $para ? @$para : $para;	2964	for my $para (@_) {
2652
2653	$para = {	2965	$para = {
		2966	fg => [1, 1, 1, 1],
		2967	indent => 0,
		2968	markup => "",
		2969	widget => [],
		2970	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	2971	w => 1e10,
2655	wrapped => 1,	2972	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	2973	};
2661		2974
2662	$self->add (@w) if @w;	2975	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	2976	push @{$self->{par}}, $para;
		2977	}
		2978
		2979	if (my $max = $self->{max_par}) {
		2980	shift @{$self->{par}} while @{$self->{par}} > $max;
		2981	}
2664		2982
2665	$self->{need_reflow}++;	2983	$self->{need_reflow}++;
2666	$self->update;	2984	$self->update;
2667	}	2985	}
2668		2986
2669	sub scroll_to_bottom {	2987	sub scroll_to_bottom {
2670	my ($self) = @_;	2988	my ($self) = @_;
2671		2989
2672	$self->{scroll_to_bottom} = 1;	2990	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	2991	$self->update;
2674	}	2992	}
2675		2993
		2994	sub force_uptodate {
		2995	my ($self) = @_;
		2996
		2997	if (delete $self->{need_reflow}) {
		2998	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2999
		3000	my $height = 0;
		3001
		3002	for my $para (@{$self->{par}}) {
		3003	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3004	my $layout = $self->get_layout ($para);
		3005	my ($w, $h) = $layout->size;
		3006
		3007	$para->{w} = $w + $para->{indent};
		3008	$para->{h} = $h;
		3009	$para->{wrapped} = $layout->has_wrapped;
		3010	}
		3011
		3012	$para->{y} = $height;
		3013	$height += $para->{h};
		3014	}
		3015
		3016	$self->{height} = $height;
		3017	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3018
		3019	delete $self->{texture};
		3020	}
		3021
		3022	if (my $paridx = delete $self->{scroll_to}) {
		3023	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3024	}
		3025	}
		3026
2676	sub update {	3027	sub update {
2677	my ($self) = @_;	3028	my ($self) = @_;
2678		3029
2679	$self->SUPER::update;	3030	$self->SUPER::update;
2680		3031
2681	return unless $self->{h} > 0;	3032	return unless $self->{h} > 0;
2682		3033
2683	delete $self->{texture};	3034	delete $self->{texture};
2684		3035
2685	$ROOT->on_post_alloc ($self => sub {	3036	$ROOT->on_post_alloc ($self => sub {
		3037	$self->force_uptodate;
		3038
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3039	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3040
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 {	3041	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3042	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3043	glClear GL_COLOR_BUFFER_BIT;
2718		3044
		3045	package CFPlus::UI::Base;
		3046	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3047	(0, 0, $self->{w}, $self->{h});
		3048
		3049	my $top = int $self->{children}[1]{range}[0];
		3050
		3051	my $paridx = 0;
		3052	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3053	my $top = int $self->{children}[1]{range}[0];
2720		3054
2721	my $y0 = $top;	3055	my $y0 = $top;
2722	my $y1 = $top + $H;	3056	my $y1 = $top + $H;
2723		3057
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}}) {	3058	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3059	my $h = $para->{h};
		3060	my $y = $para->{y};
2732		3061
2733	if ($y0 < $y + $h && $y < $y1) {	3062	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3063	my $layout = $self->get_layout ($para);
2736		3064
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3065	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3066
2742	if (my @w = @{ $para->{widget} }) {	3067	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3068	my @s = $layout->get_shapes;
2744		3069
2745	for (@w) {	3070	for (@w) {
…		…
2751	$_->draw;	3076	$_->draw;
2752	}	3077	}
2753	}	3078	}
2754	}	3079	}
2755		3080
2756	$y += $h;	3081	$paridx++;
		3082	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3083	}
2758		3084
2759	glDisable GL_BLEND;	3085	$self->{top_paragraph} = $top_paragraph;
2760	};	3086	};
2761	});	3087	});
2762	}	3088	}
2763		3089
2764	sub reconfigure {	3090	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3108	$self->{children}[1]->draw;
2783	}	3109	}
2784		3110
2785	#############################################################################	3111	#############################################################################
2786		3112
2787	package CFClient::UI::Animator;	3113	package CFPlus::UI::Animator;
2788		3114
2789	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2790		3116
2791	our @ISA = CFClient::UI::Bin::;	3117	our @ISA = CFPlus::UI::Bin::;
2792		3118
2793	sub moveto {	3119	sub moveto {
2794	my ($self, $x, $y) = @_;	3120	my ($self, $x, $y) = @_;
2795		3121
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3122	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3150	glPopMatrix;
2825	}	3151	}
2826		3152
2827	#############################################################################	3153	#############################################################################
2828		3154
2829	package CFClient::UI::Flopper;	3155	package CFPlus::UI::Flopper;
2830		3156
2831	our @ISA = CFClient::UI::Button::;	3157	our @ISA = CFPlus::UI::Button::;
2832		3158
2833	sub new {	3159	sub new {
2834	my $class = shift;	3160	my $class = shift;
2835		3161
2836	my $self = $class->SUPER::new (	3162	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3174	$self->{other}->toggle_visibility;
2849	}	3175	}
2850		3176
2851	#############################################################################	3177	#############################################################################
2852		3178
2853	package CFClient::UI::Tooltip;	3179	package CFPlus::UI::Tooltip;
2854		3180
2855	our @ISA = CFClient::UI::Bin::;	3181	our @ISA = CFPlus::UI::Bin::;
2856		3182
2857	use CFClient::OpenGL;	3183	use CFPlus::OpenGL;
2858		3184
2859	sub new {	3185	sub new {
2860	my $class = shift;	3186	my $class = shift;
2861		3187
2862	$class->SUPER::new (	3188	$class->SUPER::new (
…		…
2865	)	3191	)
2866	}	3192	}
2867		3193
2868	sub set_tooltip_from {	3194	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3195	my ($self, $widget) = @_;
		3196
		3197	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3198	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3199
2871	my $tooltip = $widget->{tooltip};	3200	my $tooltip = $widget->{tooltip};
2872		3201
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3202	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3203	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3207	}
2879		3208
2880	$tooltip =~ s/^\n+//;	3209	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3210	$tooltip =~ s/\n+$//;
2882		3211
2883	$self->add (new CFClient::UI::Label	3212	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3213	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3214	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3215	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3216	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3217	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3218	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3219	);
2891	}	3220	}
2892		3221
…		…
2911		3240
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3241	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3242	my $widget = $self->{owner}
2914	or return;	3243	or return;
2915		3244
		3245	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3246	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3247
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3248	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3249	if $x + $self->{w} > $self->{root}{w};
2920		3250
2921	$self->move_abs ($x, $y);	3251	$self->move_abs ($x, $y);
		3252	} else {
		3253	$self->hide;
		3254	}
2922	});	3255	});
2923	}	3256	}
2924		3257
2925	sub _draw {	3258	sub _draw {
2926	my ($self) = @_;	3259	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3283	$self->SUPER::_draw;
2951	}	3284	}
2952		3285
2953	#############################################################################	3286	#############################################################################
2954		3287
2955	package CFClient::UI::Face;	3288	package CFPlus::UI::Face;
2956		3289
2957	our @ISA = CFClient::UI::Base::;	3290	our @ISA = CFPlus::UI::DrawBG::;
2958		3291
2959	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
2960		3293
2961	sub new {	3294	sub new {
2962	my $class = shift;	3295	my $class = shift;
2963		3296
2964	my $self = $class->SUPER::new (	3297	my $self = $class->SUPER::new (
…		…
2966	can_events => 0,	3299	can_events => 0,
2967	@_,	3300	@_,
2968	);	3301	);
2969		3302
2970	if ($self->{anim} && $self->{animspeed}) {	3303	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3304	CFPlus::weaken (my $widget = $self);
2972		3305
2973	$self->{timer} = Event->timer (	3306	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3308	hard => 1,
2976	interval => $self->{animspeed},	3309	interval => $self->{animspeed},
…		…
2999	sub _draw {	3332	sub _draw {
3000	my ($self) = @_;	3333	my ($self) = @_;
3001		3334
3002	return unless $::CONN;	3335	return unless $::CONN;
3003		3336
		3337	$self->SUPER::_draw;
		3338
3004	my $face;	3339	my $face;
3005		3340
3006	if ($self->{frame}) {	3341	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3342	my $anim = $::CONN->{anim}[$self->{anim}];
3008		3343
…		…
3030	$self->SUPER::destroy;	3365	$self->SUPER::destroy;
3031	}	3366	}
3032		3367
3033	#############################################################################	3368	#############################################################################
3034		3369
3035	package CFClient::UI::Buttonbar;	3370	package CFPlus::UI::Buttonbar;
3036		3371
3037	our @ISA = CFClient::UI::HBox::;	3372	our @ISA = CFPlus::UI::HBox::;
3038		3373
3039	# TODO: should actualyl wrap buttons and other goodies.	3374	# TODO: should actually wrap buttons and other goodies.
3040		3375
3041	#############################################################################	3376	#############################################################################
3042		3377
3043	package CFClient::UI::Menu;	3378	package CFPlus::UI::Menu;
3044		3379
3045	our @ISA = CFClient::UI::FancyFrame::;	3380	our @ISA = CFPlus::UI::Toplevel::;
3046		3381
3047	use CFClient::OpenGL;	3382	use CFPlus::OpenGL;
3048		3383
3049	sub new {	3384	sub new {
3050	my $class = shift;	3385	my $class = shift;
3051		3386
3052	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
3053	items => [],	3388	items => [],
3054	z => 100,	3389	z => 100,
3055	@_,	3390	@_,
3056	);	3391	);
3057		3392
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3393	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3394
3060	for my $item (@{ $self->{items} }) {	3395	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3396	my ($widget, $cb, $tooltip) = @$item;
3062		3397
3063	# handle various types of items, only text for now	3398	# handle various types of items, only text for now
3064	if (!ref $widget) {	3399	if (!ref $widget) {
		3400	if ($widget =~ /\t/) {
		3401	my ($left, $right) = split /\t/, $widget, 2;
		3402
3065	$widget = new CFClient::UI::Label	3403	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3404	can_hover => 1,
3067	can_events => 1,	3405	can_events => 1,
		3406	tooltip => $tooltip,
		3407	children => [
		3408	(new CFPlus::UI::Label markup => $left, expand => 1),
		3409	(new CFPlus::UI::Label markup => $right, align => +1),
		3410	],
		3411	;
		3412
		3413	} else {
		3414	$widget = new CFPlus::UI::Label
		3415	can_hover => 1,
		3416	can_events => 1,
3068	markup => $widget,	3417	markup => $widget,
3069	tooltip => $tooltip	3418	tooltip => $tooltip;
		3419	}
3070	}	3420	}
3071		3421
3072	$self->{item}{$widget} = $item;	3422	$self->{item}{$widget} = $item;
3073		3423
3074	$self->{vbox}->add ($widget);	3424	$self->{vbox}->add ($widget);
…		…
3117	1	3467	1
3118	}	3468	}
3119		3469
3120	#############################################################################	3470	#############################################################################
3121		3471
3122	package CFClient::UI::Multiplexer;	3472	package CFPlus::UI::Multiplexer;
3123		3473
3124	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFPlus::UI::Container::;
3125		3475
3126	sub new {	3476	sub new {
3127	my $class = shift;	3477	my $class = shift;
3128		3478
3129	my $self = $class->SUPER::new (	3479	my $self = $class->SUPER::new (
…		…
3143		3493
3144	$self->{current} = $self->{children}[0]	3494	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3495	if @{ $self->{children} };
3146	}	3496	}
3147		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{current}
		3502	}
		3503
3148	sub set_current_page {	3504	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3505	my ($self, $page_or_widget) = @_;
3150		3506
3151	my $widget = ref $page_or_widget	3507	my $widget = ref $page_or_widget
3152	? $page_or_widget	3508	? $page_or_widget
…		…
3184	$self->{current}->draw;	3540	$self->{current}->draw;
3185	}	3541	}
3186		3542
3187	#############################################################################	3543	#############################################################################
3188		3544
3189	package CFClient::UI::Notebook;	3545	package CFPlus::UI::Notebook;
3190		3546
3191	our @ISA = CFClient::UI::VBox::;	3547	our @ISA = CFPlus::UI::VBox::;
3192		3548
3193	sub new {	3549	sub new {
3194	my $class = shift;	3550	my $class = shift;
3195		3551
3196	my $self = $class->SUPER::new (	3552	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3553	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3555	# filter => # will be put between multiplexer and $self
3200	@_,	3556	@_,
3201	);	3557	);
3202		3558
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3563	}
3208		3564
3209	sub add {	3565	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3566	my ($self, $title, $widget, $tooltip) = @_;
3211		3567
3212	Scalar::Util::weaken $self;	3568	CFPlus::weaken $self;
3213		3569
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3571	markup => $title,
3216	tooltip => $tooltip,	3572	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3573	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3574	);
3219		3575
3220	$self->{multiplexer}->add ($widget);	3576	$self->{multiplexer}->add ($widget);
3221	}	3577	}
3222		3578
		3579	sub get_current_page {
		3580	my ($self) = @_;
		3581
		3582	$self->{multiplexer}->get_current_page
		3583	}
		3584
3223	sub set_current_page {	3585	sub set_current_page {
3224	my ($self, $page) = @_;	3586	my ($self, $page) = @_;
3225		3587
3226	$self->{multiplexer}->set_current_page ($page);	3588	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3589	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3590	}
3229		3591
3230	#############################################################################	3592	#############################################################################
3231		3593
3232	package CFClient::UI::Combobox;	3594	package CFPlus::UI::Selector;
3233		3595
3234	use utf8;	3596	use utf8;
3235		3597
3236	our @ISA = CFClient::UI::Button::;	3598	our @ISA = CFPlus::UI::Button::;
3237		3599
3238	sub new {	3600	sub new {
3239	my $class = shift;	3601	my $class = shift;
3240		3602
3241	my $self = $class->SUPER::new (	3603	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3620	my ($value, $title, $tooltip) = @$_;
3259		3621
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3622	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3623	}
3262		3624
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3625	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3626	}
3265		3627
3266	sub _set_value {	3628	sub _set_value {
3267	my ($self, $value) = @_;	3629	my ($self, $value) = @_;
3268		3630
…		…
3283	$self->emit (changed => $value);	3645	$self->emit (changed => $value);
3284	}	3646	}
3285		3647
3286	#############################################################################	3648	#############################################################################
3287		3649
3288	package CFClient::UI::Statusbox;	3650	package CFPlus::UI::Statusbox;
3289		3651
3290	our @ISA = CFClient::UI::VBox::;	3652	our @ISA = CFPlus::UI::VBox::;
3291		3653
3292	sub new {	3654	sub new {
3293	my $class = shift;	3655	my $class = shift;
3294		3656
3295	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3658	fontsize => 0.8,
3297	@_,	3659	@_,
3298	);	3660	);
3299		3661
3300	Scalar::Util::weaken (my $this = $self);	3662	CFPlus::weaken (my $this = $self);
3301		3663
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3664	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3665
3304	$self	3666	$self
3305	}	3667	}
…		…
3307	sub reorder {	3669	sub reorder {
3308	my ($self) = @_;	3670	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3671	my $NOW = Time::HiRes::time;
3310		3672
3311	# freeze display when hovering over any label	3673	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3674	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3675	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3676	values %{ $self->{item} };
3315		3677
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3678	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3679	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3680	}
…		…
3339	for ($short) {	3701	for ($short) {
3340	s/^\s+//;	3702	s/^\s+//;
3341	s/\s+/ /g;	3703	s/\s+/ /g;
3342	}	3704	}
3343		3705
3344	new CFClient::UI::Label	3706	new CFPlus::UI::Label
3345	markup => $short,	3707	markup => $short,
3346	tooltip => $item->{tooltip},	3708	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3709	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3710	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3711	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3765	count => 1,
3404	%arg,	3766	%arg,
3405	};	3767	};
3406	}	3768	}
3407		3769
		3770	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3771	$self->reorder;
		3772	});
3409	}	3773	}
3410		3774
3411	sub reconfigure {	3775	sub reconfigure {
3412	my ($self) = @_;	3776	my ($self) = @_;
3413		3777
…		…
3426	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3427	}	3791	}
3428		3792
3429	#############################################################################	3793	#############################################################################
3430		3794
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;	3795	package CFPlus::UI::Root;
3804		3796
3805	our @ISA = CFClient::UI::Container::;	3797	our @ISA = CFPlus::UI::Container::;
3806		3798
3807	use List::Util qw(min max);	3799	use List::Util qw(min max);
3808		3800
3809	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3810		3802
3811	sub new {	3803	sub new {
3812	my $class = shift;	3804	my $class = shift;
3813		3805
3814	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3815	visible => 1,	3807	visible => 1,
3816	@_,	3808	@_,
3817	);	3809	);
3818		3810
3819	Scalar::Util::weaken ($self->{root} = $self);	3811	CFPlus::weaken ($self->{root} = $self);
3820		3812
3821	$self	3813	$self
3822	}	3814	}
3823		3815
3824	sub size_request {	3816	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3982	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		3983
3992	$w = 0 if $w < 0;	3984	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	3985	$h = 0 if $h < 0;
3994		3986
		3987	$w = max $widget->{min_w}, $w;
		3988	$h = max $widget->{min_h}, $h;
		3989
		3990	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3991	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3992
		3993	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3994	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3995
3995	$w = int $w + 0.5;	3996	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	3997	$h = int $h + 0.5;
3997		3998
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3999	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4000	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4023	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4024	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4025	glLoadIdentity;
4025		4026
4026	{	4027	{
4027	package CFClient::UI::Base;	4028	package CFPlus::UI::Base;
4028		4029
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4031	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4032
4033	$self->_draw;	4033	$self->_draw;
		4034	}
4034	}	4035	}
4035		4036
4036	#############################################################################	4037	#############################################################################
4037		4038
4038	package CFClient::UI;	4039	package CFPlus::UI;
4039		4040
4040	$ROOT = new CFClient::UI::Root;	4041	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4042	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4043
4043	1	4044	1
4044		4045

Diff Legend

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