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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.410 by root, Sun Jul 22 16:37:19 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) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$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;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
…		…
452		490
453	$FOCUS->emit ("focus_out") if $FOCUS;	491	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	492	$self->emit ("focus_in");
455	}	493	}
456		494
457	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
466		505
467	1	506	0
468	}	507	}
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
474	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
479	#d##TODO# stop propagating at first true, do not use sum	536	# 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	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	554	}
484		555
485	sub find_widget {	556	#sub find_widget {
486	my ($self, $x, $y) = @_;	557	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		558
497	sub set_parent {	559	sub set_parent {
498	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
499		561
500	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
502	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
…		…
531		593
532	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
533	# functions seems pointless.	595	# functions seems pointless.
534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535		597
536	sub draw {	598	#sub draw {
537	my ($self) = @_;	599	#CFPlus.xs
538
539	return unless $self->{h} && $self->{w};
540
541	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};
544
545	# skip widgets that are entirely outside the drawing area
546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549	glPushMatrix;
550	glTranslate $self->{x}, $self->{y}, 0;
551
552	if ($self == $HOVER && $self->{can_hover}) {
553	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554	glEnable GL_BLEND;
555	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556	glBegin GL_QUADS;
557	glVertex 0 , 0;
558	glVertex $self->{w}, 0;
559	glVertex $self->{w}, $self->{h};
560	glVertex 0 , $self->{h};
561	glEnd;
562	glDisable GL_BLEND;
563	}
564
565	if ($ENV{CFPLUS_DEBUG} & 1) {
566	glPushMatrix;
567	glColor 1, 1, 0, 1;
568	glTranslate 0.375, 0.375;
569	glBegin GL_LINE_LOOP;
570	glVertex 0 , 0;
571	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;
574	glEnd;
575	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}
578
579	$self->_draw;
580	glPopMatrix;
581	}
582		600
583	sub _draw {	601	sub _draw {
584	my ($self) = @_;	602	my ($self) = @_;
585		603
586	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
587	}	605	}
588		606
589	sub DESTROY {	607	sub DESTROY {
590	my ($self) = @_;	608	my ($self) = @_;
591		609
592	delete $WIDGET{$self+0};	610	return if CFPlus::in_destruct;
593		611
594	eval { $self->destroy };	612	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
596	}	616	}
597		617
598	#############################################################################	618	#############################################################################
599		619
600	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
601		621
602	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
603		623
604	use strict;	624	use strict;
605	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
606		626
607	sub new {	627	sub new {
608	my $class = shift;	628	my $class = shift;
609		629
610	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
641	}	661	}
642	}	662	}
643		663
644	#############################################################################	664	#############################################################################
645		665
646	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
647		667
648	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
649		669
650	sub new {	670	sub new {
651	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
653	}	673	}
…		…
660		680
661	sub draw { }	681	sub draw { }
662		682
663	#############################################################################	683	#############################################################################
664		684
665	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
666		686
667	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
668		688
669	sub new {	689	sub new {
670	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
671		691
672	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
676	can_events => 0,	696	can_events => 0,
677	%arg,	697	%arg,
678	);	698	);
679		699
680	$self->add (@$children)	700	$self->add (@$children)
681	if $children;	701	if $children && @$children;
682		702
683	$self	703	$self
		704	}
		705
		706	sub realloc {
		707	my ($self) = @_;
		708
		709	$self->{force_realloc} = 1;
		710	$self->{force_size_alloc} = 1;
		711	$self->SUPER::realloc;
684	}	712	}
685		713
686	sub add {	714	sub add {
687	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
688		716
689	$_->set_parent ($self)	717	$_->set_parent ($self)
690	for @widgets;	718	for @widgets;
691		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	721	use sort 'stable';
693		722
694	$self->{children} = [	723	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
697	];	726	];
698		727
699	$self->realloc;	728	$self->realloc;
		729
		730	map $_+0, @widgets
700	}	731	}
701		732
702	sub children {	733	sub children {
703	@{ $_[0]{children} }	734	@{ $_[0]{children} }
704	}	735	}
…		…
715	}	746	}
716		747
717	sub clear {	748	sub clear {
718	my ($self) = @_;	749	my ($self) = @_;
719		750
720	my $children = delete $self->{children};	751	my $children = $self->{children};
721	$self->{children} = [];	752	$self->{children} = [];
722		753
723	for (@$children) {	754	for (@$children) {
724	delete $_->{parent};	755	delete $_->{parent};
725	$_->hide;	756	$_->hide;
…		…
750	$_->draw for @{$self->{children}};	781	$_->draw for @{$self->{children}};
751	}	782	}
752		783
753	#############################################################################	784	#############################################################################
754		785
755	package CFClient::UI::Bin;	786	package CFPlus::UI::Bin;
756		787
757	our @ISA = CFClient::UI::Container::;	788	our @ISA = CFPlus::UI::Container::;
758		789
759	sub new {	790	sub new {
760	my ($class, %arg) = @_;	791	my ($class, %arg) = @_;
761		792
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	793	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		794
764	$class->SUPER::new (children => [$child], %arg)	795	$class->SUPER::new (children => [$child], %arg)
765	}	796	}
766		797
767	sub add {	798	sub add {
…		…
774	sub remove {	805	sub remove {
775	my ($self, $widget) = @_;	806	my ($self, $widget) = @_;
776		807
777	$self->SUPER::remove ($widget);	808	$self->SUPER::remove ($widget);
778		809
779	$self->{children} = [new CFClient::UI::Empty]	810	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	811	unless @{$self->{children}};
781	}	812	}
782		813
783	sub child { $_[0]->{children}[0] }	814	sub child { $_[0]->{children}[0] }
784		815
…		…
796		827
797	#############################################################################	828	#############################################################################
798		829
799	# back-buffered drawing area	830	# back-buffered drawing area
800		831
801	package CFClient::UI::Window;	832	package CFPlus::UI::Window;
802		833
803	our @ISA = CFClient::UI::Bin::;	834	our @ISA = CFPlus::UI::Bin::;
804		835
805	use CFClient::OpenGL;	836	use CFPlus::OpenGL;
806		837
807	sub new {	838	sub new {
808	my ($class, %arg) = @_;	839	my ($class, %arg) = @_;
809		840
810	my $self = $class->SUPER::new (%arg);	841	my $self = $class->SUPER::new (%arg);
…		…
832	}	863	}
833		864
834	sub render_child {	865	sub render_child {
835	my ($self) = @_;	866	my ($self) = @_;
836		867
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	868	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	869	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	870	glClear GL_COLOR_BUFFER_BIT;
840		871
841	{	872	{
842	package CFClient::UI::Base;	873	package CFPlus::UI::Base;
843		874
844	($draw_x, $draw_y, $draw_w, $draw_h) =	875	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	876	(0, 0, $self->{w}, $self->{h});
		877
		878	$self->_render;
846	}	879	}
847
848	$self->_render;
849	};	880	};
850	}	881	}
851		882
852	sub _draw {	883	sub _draw {
853	my ($self) = @_;	884	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		885
857	my $tex = $self->{texture}	886	my $tex = $self->{texture}
858	or return;	887	or return;
859		888
860	glEnable GL_TEXTURE_2D;	889	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	890	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	891	glColor 0, 0, 0, 1;
863		892
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	893	$tex->draw_quad_alpha_premultiplied (0, 0);
865		894
866	glDisable GL_TEXTURE_2D;	895	glDisable GL_TEXTURE_2D;
867	}	896	}
868		897
869	#############################################################################	898	#############################################################################
870		899
871	package CFClient::UI::ViewPort;	900	package CFPlus::UI::ViewPort;
872		901
		902	use List::Util qw(min max);
		903
873	our @ISA = CFClient::UI::Window::;	904	our @ISA = CFPlus::UI::Window::;
874		905
875	sub new {	906	sub new {
876	my $class = shift;	907	my $class = shift;
877		908
878	$class->SUPER::new (	909	$class->SUPER::new (
…		…
885	sub size_request {	916	sub size_request {
886	my ($self) = @_;	917	my ($self) = @_;
887		918
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	919	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		920
890	$w = 10 if $self->{scroll_x};	921	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	922	$h = 1 if $self->{scroll_y};
892		923
893	($w, $h)	924	($w, $h)
894	}	925	}
895		926
896	sub invoke_size_allocate {	927	sub invoke_size_allocate {
…		…
908	}	939	}
909		940
910	sub set_offset {	941	sub set_offset {
911	my ($self, $x, $y) = @_;	942	my ($self, $x, $y) = @_;
912		943
		944	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		945	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		946
		947	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	948	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	949	$self->{view_y} = $y;
915		950
		951	$self->emit (changed => $x, $y);
916	$self->update;	952	$self->update;
		953	}
917	}	954	}
918		955
919	# hmm, this does not work for topleft of $self... but we should not ask for that	956	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	957	sub coord2local {
921	my ($self, $x, $y) = @_;	958	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
937		974
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	977	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	979	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	980	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	981	}
945	}	982	}
946		983
947	sub _render {	984	sub _render {
948	my ($self) = @_;	985	my ($self) = @_;
949		986
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	987	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	988	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		989
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	990	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		991
955	$self->SUPER::_render;	992	$self->SUPER::_render;
956	}	993	}
957		994
958	#############################################################################	995	#############################################################################
959		996
960	package CFClient::UI::ScrolledWindow;	997	package CFPlus::UI::ScrolledWindow;
961		998
962	our @ISA = CFClient::UI::HBox::;	999	our @ISA = CFPlus::UI::Table::;
963		1000
964	sub new {	1001	sub new {
965	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
966		1003
967	my $child = delete $arg{child};	1004	my $child = delete $arg{child};
968		1005
969	my $self;	1006	my $self;
970		1007
971	my $slider = new CFClient::UI::Slider	1008	my $hslider = new CFPlus::UI::Slider
		1009	col => 0,
		1010	row => 1,
		1011	vertical => 0,
		1012	range => [0, 0, 1, 0.01], # HACK fix
		1013	on_changed => sub {
		1014	$self->{hpos} = $_[1];
		1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1016	},
		1017	;
		1018
		1019	my $vslider = new CFPlus::UI::Slider
		1020	col => 1,
		1021	row => 0,
972	vertical => 1,	1022	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1023	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1024	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1025	$self->{vpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1027	},
977	;	1028	;
978		1029
979	$self = $class->SUPER::new (	1030	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1031	scroll_x => 0,
		1032	scroll_y => 1,
		1033	can_events => 1,
981	slider => $slider,	1034	hslider => $hslider,
		1035	vslider => $vslider,
		1036	col_expand => [1, 0],
		1037	row_expand => [1, 0],
982	%arg,	1038	%arg,
983	);	1039	);
984		1040
		1041	$self->{vp} = new CFPlus::UI::ViewPort
		1042	col => 0,
		1043	row => 0,
		1044	expand => 1,
		1045	scroll_x => $self->{scroll_x},
		1046	scroll_y => $self->{scroll_y},
		1047	on_changed => sub {
		1048	my ($vp, $x, $y) = @_;
		1049
		1050	$vp->{parent}{hslider}->set_value ($x);
		1051	$vp->{parent}{vslider}->set_value ($y);
		1052
		1053	0
		1054	},
		1055	on_size_allocate => sub {
		1056	my ($vp, $w, $h) = @_;
		1057	$vp->{parent}->update_slider;
		1058	0
		1059	},
		1060	;
		1061
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp});
		1063
986	$self->add ($child) if $child;	1064	$self->add ($child) if $child;
987		1065
988	$self	1066	$self
989	}	1067	}
990
991	#TODO# update range on size_allocate depending on child
992		1068
993	sub add {	1069	sub add {
994	my ($self, $widget) = @_;	1070	my ($self, $widget) = @_;
995		1071
996	$self->{vp}->add ($self->{child} = $widget);	1072	$self->{vp}->add ($self->{child} = $widget);
997	}	1073	}
998		1074
999	sub update_slider {	1075	sub update_slider {
1000	my ($self) = @_;	1076	my ($self) = @_;
1001		1077
		1078	my $child = ($self->{vp} or return)->child;
		1079
		1080	if ($self->{scroll_x}) {
		1081	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1082	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1083
1005	sub update {	1084	my $visible = $w1 > $w2;
		1085	if ($visible != $self->{hslider_visible}) {
		1086	$self->{hslider_visible} = $visible;
		1087	$visible ? $self->SUPER::add ($self->{hslider})
		1088	: $self->SUPER::remove ($self->{hslider});
		1089	}
		1090	}
		1091
		1092	if ($self->{scroll_y}) {
		1093	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1094	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1095
		1096	my $visible = $h1 > $h2;
		1097	if ($visible != $self->{vslider_visible}) {
		1098	$self->{vslider_visible} = $visible;
		1099	$visible ? $self->SUPER::add ($self->{vslider})
		1100	: $self->SUPER::remove ($self->{vslider});
		1101	}
		1102	}
		1103	}
		1104
		1105	sub start_dragging {
1006	my ($self) = @_;	1106	my ($self, $ev) = @_;
1007		1107
1008	$self->SUPER::update;	1108	$self->grab_focus;
1009		1109
1010	$self->update_slider;	1110	my $ox = $self->{vp}{view_x};
		1111	my $oy = $self->{vp}{view_y};
		1112
		1113	$self->{motion} = sub {
		1114	my ($ev, $x, $y) = @_;
		1115
		1116	$ox -= $ev->{xrel};
		1117	$oy -= $ev->{yrel};
		1118
		1119	$self->{vp}->set_offset ($ox, $oy);
		1120	};
		1121	}
		1122
		1123	sub invoke_mouse_wheel {
		1124	my ($self, $ev) = @_;
		1125
		1126	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1127	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1128
		1129	1
		1130	}
		1131
		1132	sub invoke_button_down {
		1133	my ($self, $ev, $x, $y) = @_;
		1134
		1135	if ($ev->{button} == 2) {
		1136	$self->start_dragging ($ev);
		1137	return 1;
		1138	}
		1139
		1140	0
		1141	}
		1142
		1143	sub invoke_button_up {
		1144	my ($self, $ev, $x, $y) = @_;
		1145
		1146	if (delete $self->{motion}) {
		1147	return 1;
		1148	}
		1149
		1150	0
		1151	}
		1152
		1153	sub invoke_mouse_motion {
		1154	my ($self, $ev, $x, $y) = @_;
		1155
		1156	if ($self->{motion}) {
		1157	$self->{motion}->($ev, $x, $y);
		1158	return 1;
		1159	}
		1160
		1161	0
1011	}	1162	}
1012		1163
1013	sub invoke_size_allocate {	1164	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1015		1166
1016	$self->update_slider;	1167	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1168	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1169	}
1020		1170
1021	#############################################################################	1171	#############################################################################
1022		1172
1023	package CFClient::UI::Frame;	1173	package CFPlus::UI::Frame;
1024		1174
1025	our @ISA = CFClient::UI::Bin::;	1175	our @ISA = CFPlus::UI::Bin::;
1026		1176
1027	use CFClient::OpenGL;	1177	use CFPlus::OpenGL;
1028		1178
1029	sub new {	1179	sub new {
1030	my $class = shift;	1180	my $class = shift;
1031		1181
1032	$class->SUPER::new (	1182	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1208	$self->SUPER::_draw;
1059	}	1209	}
1060		1210
1061	#############################################################################	1211	#############################################################################
1062		1212
1063	package CFClient::UI::FancyFrame;	1213	package CFPlus::UI::FancyFrame;
1064		1214
1065	our @ISA = CFClient::UI::Bin::;	1215	our @ISA = CFPlus::UI::Bin::;
1066		1216
1067	use CFClient::OpenGL;	1217	use CFPlus::OpenGL;
		1218
		1219	sub new {
		1220	my ($class, %arg) = @_;
		1221
		1222	if ((exists $arg{label}) && !ref $arg{label}) {
		1223	$arg{label} = new CFPlus::UI::Label
		1224	align => 1,
		1225	valign => 0,
		1226	text => $arg{label},
		1227	fontsize => ($arg{border} || 0.8) * 0.75;
		1228	}
		1229
		1230	my $self = $class->SUPER::new (
		1231	# label => "",
		1232	fg => [0.6, 0.3, 0.1],
		1233	border => 0.8,
		1234	style => 'single',
		1235	%arg,
		1236	);
		1237
		1238	$self
		1239	}
		1240
		1241	sub add {
		1242	my ($self, @widgets) = @_;
		1243
		1244	$self->SUPER::add (@widgets);
		1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1246	}
		1247
		1248	sub border {
		1249	int $_[0]{border} * $::FONTSIZE
		1250	}
		1251
		1252	sub size_request {
		1253	my ($self) = @_;
		1254
		1255	($self->{label_w}, undef) = $self->{label}->size_request
		1256	if $self->{label};
		1257
		1258	my ($w, $h) = $self->SUPER::size_request;
		1259
		1260	(
		1261	$w + $self->border * 2,
		1262	$h + $self->border * 2,
		1263	)
		1264	}
		1265
		1266	sub invoke_size_allocate {
		1267	my ($self, $w, $h) = @_;
		1268
		1269	my $border = $self->border;
		1270
		1271	$w -= List::Util::max 0, $border * 2;
		1272	$h -= List::Util::max 0, $border * 2;
		1273
		1274	if (my $label = $self->{label}) {
		1275	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1276	$label->{h} = List::Util::min $h, $border;
		1277	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1278	}
		1279
		1280	$self->child->configure ($border, $border, $w, $h);
		1281
		1282	1
		1283	}
		1284
		1285	sub _draw {
		1286	my ($self) = @_;
		1287
		1288	my $child = $self->{children}[0];
		1289
		1290	my $border = $self->border;
		1291	my ($w, $h) = ($self->{w}, $self->{h});
		1292
		1293	$child->draw;
		1294
		1295	glColor @{$self->{fg}};
		1296	glBegin GL_LINE_STRIP;
		1297	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1298	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1299	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1300	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1301	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1302	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1303	glEnd;
		1304
		1305	if ($self->{label}) {
		1306	glTranslate $border * 2, 0;
		1307	$self->{label}->_draw;
		1308	}
		1309	}
		1310
		1311	#############################################################################
		1312
		1313	package CFPlus::UI::Toplevel;
		1314
		1315	our @ISA = CFPlus::UI::Bin::;
		1316
		1317	use CFPlus::OpenGL;
1068		1318
1069	my $bg =	1319	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1321	mipmap => 1, wrap => 1;
1072		1322
1073	my @border =	1323	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1324	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);	1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1326
		1327	my @icon =
		1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1329	qw(x1_move.png x1_resize.png);
1076		1330
1077	sub new {	1331	sub new {
1078	my ($class, %arg) = @_;	1332	my ($class, %arg) = @_;
1079		1333
1080	my $self = $class->SUPER::new (	1334	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1335	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1336	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1337	border => 0.6,
1084	can_events => 1,	1338	can_events => 1,
1085	min_w => 16,	1339	min_w => 64,
1086	min_h => 16,	1340	min_h => 32,
1087	%arg,	1341	%arg,
1088	);	1342	);
1089		1343
1090	$self->{title_widget} = new CFClient::UI::Label	1344	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1345	align => 0,
1092	valign => 1,	1346	valign => 1,
1093	text => $self->{title},	1347	text => $self->{title},
1094	fontsize => $self->{border},	1348	fontsize => $self->{border},
1095	if exists $self->{title};	1349	if exists $self->{title};
1096		1350
1097	if ($self->{has_close_button}) {	1351	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1352	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1353	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1354	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1355	on_activate => sub { $self->emit ("delete") };
1102		1356
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1357	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1358	}
1105		1359
1106	$self	1360	$self
1107	}	1361	}
1108		1362
1109	sub add {	1363	sub add {
1110	my ($self, @widgets) = @_;	1364	my ($self, @widgets) = @_;
1111		1365
1112	$self->SUPER::add (@widgets);	1366	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1367	$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};	1368	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1369	}
1116		1370
1117	sub border {	1371	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1372	int $_[0]{border} * $::FONTSIZE
1119	}	1373	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1481	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1482
1229	! ! $self->{motion}	1483	! ! $self->{motion}
1230	}	1484	}
1231		1485
		1486	sub invoke_visibility_change {
		1487	my ($self, $visible) = @_;
		1488
		1489	delete $self->{motion} unless $visible;
		1490
		1491	0
		1492	}
		1493
1232	sub _draw {	1494	sub _draw {
1233	my ($self) = @_;	1495	my ($self) = @_;
1234		1496
1235	my $child = $self->{children}[0];	1497	my $child = $self->{children}[0];
1236		1498
…		…
1241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242		1504
1243	my $border = $self->border;	1505	my $border = $self->border;
1244		1506
1245	glColor @{ $self->{border_bg} };	1507	glColor @{ $self->{border_bg} };
1246	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1512
		1513	# move
		1514	my $w2 = ($w - $border) * .5;
		1515	my $h2 = ($h - $border) * .5;
		1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1519
		1520	# resize
		1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1523	unless $self->{has_close_button};
		1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250		1526
1251	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252	glColor @{ $self->{bg} };	1528	glColor @{ $self->{bg} };
1253		1529
1254	# TODO: repeat texture not scale	1530	# TODO: repeat texture not scale
…		…
1273	if $self->{close_button};	1549	if $self->{close_button};
1274	}	1550	}
1275		1551
1276	#############################################################################	1552	#############################################################################
1277		1553
1278	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1279		1555
1280	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Container::;
1281		1557
1282	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1283		1559
1284	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1285		1561
1286	sub new {	1562	sub new {
1287	my $class = shift;	1563	my $class = shift;
1288		1564
1289	$class->SUPER::new (	1565	$class->SUPER::new (
1290	col_expand => [],	1566	col_expand => [],
		1567	row_expand => [],
1291	@_,	1568	@_,
1292	)	1569	)
1293	}	1570	}
1294		1571
1295	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}
1298
1299	sub add {	1572	sub add {
1300	my ($self, $x, $y, $child) = @_;	1573	my ($self, @widgets) = @_;
1301		1574
1302	$child->set_parent ($self);	1575	for my $child (@widgets) {
1303	$self->{children}[$y][$x] = $child;	1576	$child->{rowspan} ||= 1;
		1577	$child->{colspan} ||= 1;
		1578	}
1304		1579
1305	$self->realloc;	1580	$self->SUPER::add (@widgets);
1306	}	1581	}
1307		1582
1308	sub remove {	1583	sub add_at {
		1584	my $self = shift;
		1585
		1586	my @widgets;
		1587
		1588	while (@_) {
		1589	my ($col, $row, $child) = splice @_, 0, 3, ();
		1590
		1591	$child->{row} = $row;
		1592	$child->{col} = $col;
		1593
		1594	push @widgets, $child;
		1595	}
		1596
		1597	$self->add (@widgets);
		1598	}
		1599
		1600	sub get_wh {
1309	my ($self, $child) = @_;	1601	my ($self) = @_;
1310		1602
1311	# TODO: not yet implemented	1603	my (@w, @h);
1312	}
1313
1314	# TODO: move to container class maybe? send children a signal on removal?
1315	sub clear {
1316	my ($self) = @_;
1317		1604
1318	my @children = $self->children;	1605	my @children = $self->children;
1319	delete $self->{children};	1606
		1607	# first pass, columns
		1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1610
		1611	my $sw = sum @w[$c .. $c + $cs - 1];
		1612
		1613	if ($w > $sw) {
		1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1615	}
1320		1616	}
1321	for (@children) {
1322	delete $_->{parent};
1323	$_->hide;
1324	}
1325		1617
1326	$self->realloc;	1618	# second pass, rows
1327	}	1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1328
1329	sub get_wh {
1330	my ($self) = @_;
1331
1332	my (@w, @h);
1333
1334	for my $y (0 .. $#{$self->{children}}) {
1335	my $row = $self->{children}[$y]
1336	or next;
1337
1338	for my $x (0 .. $#$row) {
1339	my $widget = $row->[$x]
1340	or next;
1341	my ($w, $h) = @$widget{qw(req_w req_h)};	1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1342		1621
1343	$w[$x] = max $w[$x], $w;	1622	my $sh = sum @h[$r .. $r + $rs - 1];
1344	$h[$y] = max $h[$y], $h;	1623
		1624	if ($h > $sh) {
		1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345	}	1626	}
1346	}	1627	}
1347		1628
1348	(\@w, \@h)	1629	(\@w, \@h)
1349	}	1630	}
…		…
1365	my ($ws, $hs) = $self->get_wh;	1646	my ($ws, $hs) = $self->get_wh;
1366		1647
1367	my $req_w = (sum @$ws) || 1;	1648	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1649	my $req_h = (sum @$hs) || 1;
1369		1650
1370	# TODO: nicer code && do row_expand	1651	# now linearly scale the rows/columns to the allocated size
1371	my @col_expand = @{$self->{col_expand}};	1652	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1653	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1654	my $col_expand = (sum @col_expand) || 1;
1374		1655
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1657
1379	CFClient::UI::harmonize $ws;	1658	CFPlus::UI::harmonize $ws;
		1659
		1660	my @row_expand = @{$self->{row_expand}};
		1661	@row_expand = (1) x @$ws unless @row_expand;
		1662	my $row_expand = (sum @row_expand) || 1;
		1663
		1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1665
1380	CFClient::UI::harmonize $hs;	1666	CFPlus::UI::harmonize $hs;
1381		1667
1382	my $y;	1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383		1670
1384	for my $r (0 .. $#{$self->{children}}) {	1671	for my $widget ($self->children) {
1385	my $row = $self->{children}[$r]	1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1386	or next;
1387		1673
1388	my $x = 0;	1674	$widget->configure (
1389	my $row_h = $hs->[$r];	1675	$x[$c], $y[$r],
		1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390		1677	);
1391	for my $c (0 .. $#$row) {	1678	}
1392	my $col_w = $ws->[$c];
1393		1679
1394	if (my $widget = $row->[$c]) {	1680	1
1395	$widget->configure ($x, $y, $col_w, $row_h);	1681	}
1396	}
1397		1682
1398	$x += $col_w;	1683	#############################################################################
		1684
		1685	package CFPlus::UI::Fixed;
		1686
		1687	use List::Util qw(min max);
		1688
		1689	our @ISA = CFPlus::UI::Container::;
		1690
		1691	sub add_fixed {
		1692	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1693
		1694	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1695	$self->SUPER::add ($child);
		1696	}
		1697
		1698	sub _scale($$$) {
		1699	my ($mode, $val, $max) = @_;
		1700
		1701	$mode eq "abs" ? $val
		1702	: $mode eq "rel" ? $val * $max
		1703	: 0
		1704	}
		1705
		1706	sub size_request {
		1707	my ($self) = @_;
		1708
		1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1710
		1711	# determine overall size by querying abs widgets
		1712	for my $child ($self->visible_children) {
		1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1714
		1715	if ($pos eq "abs") {
		1716	$w = _scale $size, $w, $child->{req_w};
		1717	$h = _scale $size, $h, $child->{req_h};
		1718
		1719	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1399	}	1721	}
		1722	}
1400		1723
1401	$y += $row_h;	1724	my $W = $x2 - $x1;
		1725	my $H = $y2 - $y1;
		1726
		1727	# now layout remaining widgets
		1728	for my $child ($self->visible_children) {
		1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1730
		1731	if ($pos ne "abs") {
		1732	$x = _scale $pos, $x, $W;
		1733	$y = _scale $pos, $x, $H;
		1734	$w = _scale $size, $w, $child->{req_w};
		1735	$h = _scale $size, $h, $child->{req_h};
		1736
		1737	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1739	}
		1740	}
		1741
		1742	my $W = $x2 - $x1;
		1743	my $H = $y2 - $y1;
		1744
		1745	($W, $H)
		1746	}
		1747
		1748	sub invoke_size_allocate {
		1749	my ($self, $W, $H) = @_;
		1750
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	$x = _scale $pos, $x, $W;
		1755	$y = _scale $pos, $x, $H;
		1756	$w = _scale $size, $w, $W;
		1757	$h = _scale $size, $h, $H;
		1758
		1759	$child->configure ($x, $y, $w, $h);
1402	}	1760	}
1403		1761
1404	1	1762	1
1405	}	1763	}
1406		1764
1407	sub find_widget {
1408	my ($self, $x, $y) = @_;
1409
1410	$x -= $self->{x};
1411	$y -= $self->{y};
1412
1413	my $res;
1414
1415	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1416	$res = $_->find_widget ($x, $y)
1417	and return $res;
1418	}
1419
1420	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1421	}
1422
1423	sub _draw {
1424	my ($self) = @_;
1425
1426	for (grep $_, @{$self->{children}}) {
1427	$_->draw for grep $_, @$_;
1428	}
1429	}
1430
1431	#############################################################################	1765	#############################################################################
1432		1766
1433	package CFClient::UI::Box;	1767	package CFPlus::UI::Box;
1434		1768
1435	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
1436		1770
1437	sub size_request {	1771	sub size_request {
1438	my ($self) = @_;	1772	my ($self) = @_;
1439		1773
1440	$self->{vertical}	1774	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1807	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1808	for 0 .. $#children;
1475	}	1809	}
1476	}	1810	}
1477		1811
1478	CFClient::UI::harmonize \@req;	1812	CFPlus::UI::harmonize \@req;
1479		1813
1480	my $pos = 0;	1814	my $pos = 0;
1481	for (0 .. $#children) {	1815	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1816	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1817	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1822	1
1489	}	1823	}
1490		1824
1491	#############################################################################	1825	#############################################################################
1492		1826
1493	package CFClient::UI::HBox;	1827	package CFPlus::UI::HBox;
1494		1828
1495	our @ISA = CFClient::UI::Box::;	1829	our @ISA = CFPlus::UI::Box::;
1496		1830
1497	sub new {	1831	sub new {
1498	my $class = shift;	1832	my $class = shift;
1499		1833
1500	$class->SUPER::new (	1834	$class->SUPER::new (
…		…
1503	)	1837	)
1504	}	1838	}
1505		1839
1506	#############################################################################	1840	#############################################################################
1507		1841
1508	package CFClient::UI::VBox;	1842	package CFPlus::UI::VBox;
1509		1843
1510	our @ISA = CFClient::UI::Box::;	1844	our @ISA = CFPlus::UI::Box::;
1511		1845
1512	sub new {	1846	sub new {
1513	my $class = shift;	1847	my $class = shift;
1514		1848
1515	$class->SUPER::new (	1849	$class->SUPER::new (
…		…
1518	)	1852	)
1519	}	1853	}
1520		1854
1521	#############################################################################	1855	#############################################################################
1522		1856
1523	package CFClient::UI::Label;	1857	package CFPlus::UI::Label;
1524		1858
1525	our @ISA = CFClient::UI::DrawBG::;	1859	our @ISA = CFPlus::UI::DrawBG::;
1526		1860
1527	use CFClient::OpenGL;	1861	use CFPlus::OpenGL;
1528		1862
1529	sub new {	1863	sub new {
1530	my ($class, %arg) = @_;	1864	my ($class, %arg) = @_;
1531		1865
1532	my $self = $class->SUPER::new (	1866	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1869	#active_bg => none
1536	#font => default_font	1870	#font => default_font
1537	#text => initial text	1871	#text => initial text
1538	#markup => initial narkup	1872	#markup => initial narkup
1539	#max_w => maximum pixel width	1873	#max_w => maximum pixel width
		1874	#style => 0, # render flags
1540	ellipsise => 3, # end	1875	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1876	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1877	fontsize => 1,
1543	align => -1,	1878	align => -1,
1544	valign => -1,	1879	valign => -1,
1545	padding_x => 2,	1880	padding_x => 2,
1546	padding_y => 2,	1881	padding_y => 2,
1547	can_events => 0,	1882	can_events => 0,
1548	%arg	1883	%arg
1549	);	1884	);
1550		1885
1551	if (exists $self->{template}) {	1886	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1887	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1888	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1889	$self->{template} = $layout;
1555	}	1890	}
1556		1891
1557	if (exists $self->{markup}) {	1892	if (exists $self->{markup}) {
…		…
1561	}	1896	}
1562		1897
1563	$self	1898	$self
1564	}	1899	}
1565		1900
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1901	sub update {
1577	my ($self) = @_;	1902	my ($self) = @_;
1578		1903
1579	delete $self->{texture};	1904	delete $self->{texture};
1580	$self->SUPER::update;	1905	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1592		1917
1593	return if $self->{text} eq "T$text";	1918	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1919	$self->{text} = "T$text";
1595		1920
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1921	$self->{layout}->set_text ($text);
1598		1922
1599	delete $self->{size_req};	1923	delete $self->{size_req};
1600	$self->realloc;	1924	$self->realloc;
1601	$self->update;	1925	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1931	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1932	$self->{text} = "M$markup";
1609		1933
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1934	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		1935
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1936	$self->{layout}->set_markup ($markup);
1614		1937
1615	delete $self->{size_req};	1938	delete $self->{size_req};
1616	$self->realloc;	1939	$self->realloc;
1617	$self->update;	1940	$self->update;
…		…
1629		1952
1630	my ($w, $h) = $self->{layout}->size;	1953	my ($w, $h) = $self->{layout}->size;
1631		1954
1632	if (exists $self->{template}) {	1955	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	1956	$self->{template}->set_font ($self->{font}) if $self->{font};
		1957	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1958	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		1959
1636	my ($w2, $h2) = $self->{template}->size;	1960	my ($w2, $h2) = $self->{template}->size;
1637		1961
1638	$w = List::Util::max $w, $w2;	1962	$w = List::Util::max $w, $w2;
…		…
1672		1996
1673	sub reconfigure {	1997	sub reconfigure {
1674	my ($self) = @_;	1998	my ($self) = @_;
1675		1999
1676	delete $self->{size_req};	2000	delete $self->{size_req};
		2001	delete $self->{texture};
1677		2002
1678	$self->SUPER::reconfigure;	2003	$self->SUPER::reconfigure;
1679	}	2004	}
1680		2005
1681	sub _draw {	2006	sub _draw {
1682	my ($self) = @_;	2007	my ($self) = @_;
1683		2008
1684	$self->SUPER::_draw; # draw background, if applicable	2009	$self->SUPER::_draw; # draw background, if applicable
1685		2010
1686	my $tex = $self->{texture} ||= do {	2011	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	2012	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	2013	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	2014	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	2015	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2016	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2017	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		2018
1694	new_from_layout CFClient::Texture $self->{layout}	2019	[$self->{layout}->size]
1695	};	2020	};
1696		2021
1697	unless (exists $self->{ox}) {	2022	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2023	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2024	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1701		2026
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
1705	};	2030	};
1706		2031
1707	glEnable GL_TEXTURE_2D;	2032	# unless ($self->{list}) {
1708		2033	# $self->{list} = CFPlus::OpenGL::glGenList;
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2034	# CFPlus::OpenGL::glNewList $self->{list};
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2035	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711		2036	# CFPlus::OpenGL::glEndList;
1712	if ($tex->{format} == GL_ALPHA) {
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}	2037	# }
		2038	#
		2039	# CFPlus::OpenGL::glCallList $self->{list};
1720		2040
1721	glDisable GL_TEXTURE_2D;	2041	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1722	}	2042	}
		2043
		2044	#sub destroy {
		2045	# my ($self) = @_;
		2046	#
		2047	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2048	#
		2049	# $self->SUPER::destroy;
		2050	#}
1723		2051
1724	#############################################################################	2052	#############################################################################
1725		2053
1726	package CFClient::UI::EntryBase;	2054	package CFPlus::UI::EntryBase;
1727		2055
1728	our @ISA = CFClient::UI::Label::;	2056	our @ISA = CFPlus::UI::Label::;
1729		2057
1730	use CFClient::OpenGL;	2058	use CFPlus::OpenGL;
1731		2059
1732	sub new {	2060	sub new {
1733	my $class = shift;	2061	my $class = shift;
1734		2062
1735	$class->SUPER::new (	2063	$class->SUPER::new (
…		…
1739	active_fg => [0, 0, 0],	2067	active_fg => [0, 0, 0],
1740	can_hover => 1,	2068	can_hover => 1,
1741	can_focus => 1,	2069	can_focus => 1,
1742	valign => 0,	2070	valign => 0,
1743	can_events => 1,	2071	can_events => 1,
		2072	ellipsise => 0,
1744	#text => ...	2073	#text => ...
1745	#hidden => "*",	2074	#hidden => "*",
1746	@_	2075	@_
1747	)	2076	)
1748	}	2077	}
…		…
1793	my $sym = $ev->{sym};	2122	my $sym = $ev->{sym};
1794	my $uni = $ev->{unicode};	2123	my $uni = $ev->{unicode};
1795		2124
1796	my $text = $self->get_text;	2125	my $text = $self->get_text;
1797		2126
		2127	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2128
1798	if ($uni == 8) {	2129	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2130	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	2131	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	2132	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	2133	} elsif ($sym == CFPlus::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	2134	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	2135	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	2136	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	2137	} elsif ($sym == CFPlus::SDLK_HOME) {
		2138	# what a hack
		2139	$self->{cursor} =
		2140	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2141	? length $1
		2142	: 0;
		2143	} elsif ($sym == CFPlus::SDLK_END) {
		2144	# uh, again
		2145	$self->{cursor} =
		2146	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2147	? $self->{cursor} + length $1
		2148	: length $self->{text};
		2149	} elsif ($uni == 21) { # ctrl-u
		2150	$text = "";
1807	$self->{cursor} = 0;	2151	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {
1809	$self->{cursor} = length $text;
1810	} elsif ($uni == 27) {	2152	} elsif ($uni == 27) {
1811	$self->emit ('escape');	2153	$self->emit ('escape');
1812	} elsif ($uni) {	2154	} elsif ($uni == 0x0d) {
		2155	substr $text, $self->{cursor}++, 0, "\012";
		2156	} elsif ($uni >= 0x20) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	2157	substr $text, $self->{cursor}++, 0, chr $uni;
1814	} else {	2158	} else {
1815	return 0;	2159	return 0;
1816	}	2160	}
1817		2161
1818	$self->_set_text ($text);	2162	$self->_set_text ($text);
1819		2163
1820	$self->realloc;	2164	$self->realloc;
		2165	$self->update;
1821		2166
1822	1	2167	1
1823	}	2168	}
1824		2169
1825	sub invoke_focus_in {	2170	sub invoke_focus_in {
…		…
1837		2182
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	2183	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		2184
1840	# byte-index to char-index	2185	# byte-index to char-index
1841	my $text = $self->{text};	2186	my $text = $self->{text};
1842	utf8::encode $text;	2187	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	2188	$self->{cursor} = length $text;
1844		2189
1845	$self->_set_text ($self->{text});	2190	$self->_set_text ($self->{text});
1846	$self->update;	2191	$self->update;
1847		2192
1848	1	2193	1
…		…
1887	utf8::encode $text;	2232	utf8::encode $text;
1888		2233
1889	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2234	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890	}	2235	}
1891		2236
1892	glColor @{$self->{fg}};
1893	glBegin GL_LINES;	2237	glBegin GL_LINES;
1894	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2239	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896	glEnd;	2240	glEnd;
1897	}	2241	}
1898	}	2242	}
1899		2243
		2244	#############################################################################
		2245
1900	package CFClient::UI::Entry;	2246	package CFPlus::UI::Entry;
1901		2247
1902	our @ISA = CFClient::UI::EntryBase::;	2248	our @ISA = CFPlus::UI::EntryBase::;
1903		2249
1904	use CFClient::OpenGL;	2250	use CFPlus::OpenGL;
1905		2251
1906	sub invoke_key_down {	2252	sub invoke_key_down {
1907	my ($self, $ev) = @_;	2253	my ($self, $ev) = @_;
1908		2254
1909	my $sym = $ev->{sym};	2255	my $sym = $ev->{sym};
1910		2256
1911	if ($sym == 13) {	2257	if ($ev->{uni} == 0x0d || $sym == 13) {
1912	unshift @{$self->{history}},	2258	unshift @{$self->{history}},
1913	my $txt = $self->get_text;	2259	my $txt = $self->get_text;
1914		2260
1915	$self->{history_pointer} = -1;	2261	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	2262	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	2263	$self->emit (activate => $txt);
1918	$self->update;	2264	$self->update;
1919		2265
1920	} elsif ($sym == CFClient::SDLK_UP) {	2266	} elsif ($sym == CFPlus::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	2267	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	2268	$self->{history_saveback} = $self->get_text;
1923	}	2269	}
1924	if (@{$self->{history} || []} > 0) {	2270	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	2271	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	2273	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	2274	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2275	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	2276	}
1931		2277
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	2278	} elsif ($sym == CFPlus::SDLK_DOWN) {
1933	$self->{history_pointer}--;	2279	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2280	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		2281
1936	if ($self->{history_pointer} >= 0) {	2282	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2283	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2292	1
1947	}	2293	}
1948		2294
1949	#############################################################################	2295	#############################################################################
1950		2296
		2297	package CFPlus::UI::TextEdit;
		2298
		2299	our @ISA = CFPlus::UI::EntryBase::;
		2300
		2301	use CFPlus::OpenGL;
		2302
		2303	sub move_cursor_ver {
		2304	my ($self, $dy) = @_;
		2305
		2306	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2307
		2308	$y += $dy;
		2309
		2310	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2311	$self->{cursor} = $index;
		2312	delete $self->{cur_h};
		2313	$self->update;
		2314	return;
		2315	}
		2316	}
		2317
		2318	sub invoke_key_down {
		2319	my ($self, $ev) = @_;
		2320
		2321	my $sym = $ev->{sym};
		2322
		2323	if ($sym == CFPlus::SDLK_UP) {
		2324	$self->move_cursor_ver (-1);
		2325	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2326	$self->move_cursor_ver (+1);
		2327	} else {
		2328	return $self->SUPER::invoke_key_down ($ev)
		2329	}
		2330
		2331	1
		2332	}
		2333
		2334	#############################################################################
		2335
1951	package CFClient::UI::Button;	2336	package CFPlus::UI::Button;
1952		2337
1953	our @ISA = CFClient::UI::Label::;	2338	our @ISA = CFPlus::UI::Label::;
1954		2339
1955	use CFClient::OpenGL;	2340	use CFPlus::OpenGL;
1956		2341
1957	my @tex =	2342	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2343	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2344	qw(b1_button_inactive.png b1_button_active.png);
1960		2345
1961	sub new {	2346	sub new {
1962	my $class = shift;	2347	my $class = shift;
1963		2348
1964	$class->SUPER::new (	2349	$class->SUPER::new (
1965	padding_x => 4,	2350	padding_x => 4,
1966	padding_y => 4,	2351	padding_y => 4,
1967	fg => [1, 1, 1],	2352	fg => [1.0, 1.0, 1.0],
1968	active_fg => [0, 0, 1],	2353	active_fg => [0.8, 0.8, 0.8],
1969	can_hover => 1,	2354	can_hover => 1,
1970	align => 0,	2355	align => 0,
1971	valign => 0,	2356	valign => 0,
1972	can_events => 1,	2357	can_events => 1,
1973	@_	2358	@_
…		…
1991		2376
1992	glEnable GL_TEXTURE_2D;	2377	glEnable GL_TEXTURE_2D;
1993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994	glColor 0, 0, 0, 1;	2379	glColor 0, 0, 0, 1;
1995		2380
		2381	my $tex = $tex[$GRAB == $self];
1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2382	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997		2383
1998	glDisable GL_TEXTURE_2D;	2384	glDisable GL_TEXTURE_2D;
1999		2385
2000	$self->SUPER::_draw;	2386	$self->SUPER::_draw;
2001	}	2387	}
2002		2388
2003	#############################################################################	2389	#############################################################################
2004		2390
		2391	package CFPlus::UI::CheckBox;
		2392
		2393	our @ISA = CFPlus::UI::DrawBG::;
		2394
		2395	my @tex =
		2396	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2397	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2398
		2399	use CFPlus::OpenGL;
		2400
		2401	sub new {
		2402	my $class = shift;
		2403
		2404	$class->SUPER::new (
		2405	padding_x => 2,
		2406	padding_y => 2,
		2407	fg => [1, 1, 1],
		2408	active_fg => [1, 1, 0],
		2409	bg => [0, 0, 0, 0.2],
		2410	active_bg => [1, 1, 1, 0.5],
		2411	state => 0,
		2412	can_hover => 1,
		2413	@_
		2414	)
		2415	}
		2416
		2417	sub size_request {
		2418	my ($self) = @_;
		2419
		2420	(6) x 2
		2421	}
		2422
		2423	sub toggle {
		2424	my ($self) = @_;
		2425
		2426	$self->{state} = !$self->{state};
		2427	$self->emit (changed => $self->{state});
		2428	$self->update;
		2429	}
		2430
		2431	sub invoke_button_down {
		2432	my ($self, $ev, $x, $y) = @_;
		2433
		2434	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2435	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2436	$self->toggle;
		2437	} else {
		2438	return 0
		2439	}
		2440
		2441	1
		2442	}
		2443
		2444	sub _draw {
		2445	my ($self) = @_;
		2446
		2447	$self->SUPER::_draw;
		2448
		2449	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2450
		2451	my ($w, $h) = @$self{qw(w h)};
		2452
		2453	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2454
		2455	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2456
		2457	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2458
		2459	glEnable GL_TEXTURE_2D;
		2460	$tex->draw_quad_alpha (0, 0, $s, $s);
		2461	glDisable GL_TEXTURE_2D;
		2462	}
		2463
		2464	#############################################################################
		2465
		2466	package CFPlus::UI::Image;
		2467
		2468	our @ISA = CFPlus::UI::Base::;
		2469
		2470	use CFPlus::OpenGL;
		2471
		2472	our %texture_cache;
		2473
		2474	sub new {
		2475	my $class = shift;
		2476
		2477	my $self = $class->SUPER::new (
		2478	can_events => 0,
		2479	@_,
		2480	);
		2481
		2482	$self->{path} || $self->{tex}
		2483	or Carp::croak "'path' or 'tex' attributes required";
		2484
		2485	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2486	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2487
		2488	CFPlus::weaken $texture_cache{$self->{path}};
		2489
		2490	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2491
		2492	$self
		2493	}
		2494
		2495	sub STORABLE_freeze {
		2496	my ($self, $cloning) = @_;
		2497
		2498	$self->{path}
		2499	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2500
		2501	$self->{path}
		2502	}
		2503
		2504	sub STORABLE_attach {
		2505	my ($self, $cloning, $path) = @_;
		2506
		2507	$self->new (path => $path)
		2508	}
		2509
		2510	sub size_request {
		2511	my ($self) = @_;
		2512
		2513	($self->{tex}{w}, $self->{tex}{h})
		2514	}
		2515
		2516	sub _draw {
		2517	my ($self) = @_;
		2518
		2519	my $tex = $self->{tex};
		2520
		2521	my ($w, $h) = ($self->{w}, $self->{h});
		2522
		2523	if ($self->{rot90}) {
		2524	glRotate 90, 0, 0, 1;
		2525	glTranslate 0, -$self->{w}, 0;
		2526
		2527	($w, $h) = ($h, $w);
		2528	}
		2529
		2530	glEnable GL_TEXTURE_2D;
		2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2532
		2533	$tex->draw_quad (0, 0, $w, $h);
		2534
		2535	glDisable GL_TEXTURE_2D;
		2536	}
		2537
		2538	#############################################################################
		2539
2005	package CFClient::UI::ImageButton;	2540	package CFPlus::UI::ImageButton;
2006		2541
2007	our @ISA = CFClient::UI::Image::;	2542	our @ISA = CFPlus::UI::Image::;
2008		2543
2009	use CFClient::OpenGL;	2544	use CFPlus::OpenGL;
2010		2545
2011	my %textures;	2546	my %textures;
2012		2547
2013	sub new {	2548	sub new {
2014	my $class = shift;	2549	my $class = shift;
…		…
2036	1	2571	1
2037	}	2572	}
2038		2573
2039	#############################################################################	2574	#############################################################################
2040		2575
2041	package CFClient::UI::CheckBox;
2042
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub toggle {
2074	my ($self) = @_;
2075
2076	$self->{state} = !$self->{state};
2077	$self->emit (changed => $self->{state});
2078	$self->update;
2079	}
2080
2081	sub invoke_button_down {
2082	my ($self, $ev, $x, $y) = @_;
2083
2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086	$self->toggle;
2087	} else {
2088	return 0
2089	}
2090
2091	1
2092	}
2093
2094	sub _draw {
2095	my ($self) = @_;
2096
2097	$self->SUPER::_draw;
2098
2099	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101	my ($w, $h) = @$self{qw(w h)};
2102
2103	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107	my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109	glEnable GL_TEXTURE_2D;
2110	$tex->draw_quad_alpha (0, 0, $s, $s);
2111	glDisable GL_TEXTURE_2D;
2112	}
2113
2114	#############################################################################
2115
2116	package CFClient::UI::Image;	2576	package CFPlus::UI::VGauge;
2117		2577
2118	our @ISA = CFClient::UI::Base::;	2578	our @ISA = CFPlus::UI::Base::;
2119
2120	use CFClient::OpenGL;
2121
2122	our %texture_cache;
2123
2124	sub new {
2125	my $class = shift;
2126
2127	my $self = $class->SUPER::new (
2128	can_events => 0,
2129	@_,
2130	);
2131
2132	$self->{path}
2133	or Carp::croak "required attribute 'path' not set";
2134
2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142	$self
2143	}
2144
2145	sub size_request {
2146	my ($self) = @_;
2147
2148	($self->{tex}{w}, $self->{tex}{h})
2149	}
2150
2151	sub _draw {
2152	my ($self) = @_;
2153
2154	my $tex = $self->{tex};
2155
2156	my ($w, $h) = ($self->{w}, $self->{h});
2157
2158	if ($self->{rot90}) {
2159	glRotate 90, 0, 0, 1;
2160	glTranslate 0, -$self->{w}, 0;
2161
2162	($w, $h) = ($h, $w);
2163	}
2164
2165	glEnable GL_TEXTURE_2D;
2166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168	$tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170	glDisable GL_TEXTURE_2D;
2171	}
2172
2173	#############################################################################
2174
2175	package CFClient::UI::VGauge;
2176
2177	our @ISA = CFClient::UI::Base::;
2178		2579
2179	use List::Util qw(min max);	2580	use List::Util qw(min max);
2180		2581
2181	use CFClient::OpenGL;	2582	use CFPlus::OpenGL;
2182		2583
2183	my %tex = (	2584	my %tex = (
2184	food => [	2585	food => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2586	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2587	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187	],	2588	],
2188	grace => [	2589	grace => [
2189	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2590	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2591	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191	],	2592	],
2192	hp => [	2593	hp => [
2193	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2595	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195	],	2596	],
2196	mana => [	2597	mana => [
2197	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2598	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2599	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199	],	2600	],
2200	);	2601	);
2201		2602
2202	# eg. VGauge->new (gauge => 'food'), default gauge: food	2603	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2305	glDisable GL_TEXTURE_2D;	2706	glDisable GL_TEXTURE_2D;
2306	}	2707	}
2307		2708
2308	#############################################################################	2709	#############################################################################
2309		2710
2310	package CFClient::UI::Gauge;	2711	package CFPlus::UI::Gauge;
2311		2712
2312	our @ISA = CFClient::UI::VBox::;	2713	our @ISA = CFPlus::UI::VBox::;
2313		2714
2314	sub new {	2715	sub new {
2315	my ($class, %arg) = @_;	2716	my ($class, %arg) = @_;
2316		2717
2317	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
…		…
2319	can_hover => 1,	2720	can_hover => 1,
2320	can_events => 1,	2721	can_events => 1,
2321	%arg,	2722	%arg,
2322	);	2723	);
2323		2724
2324	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2725	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2726	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2727	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327		2728
2328	$self	2729	$self
2329	}	2730	}
2330		2731
2331	sub set_fontsize {	2732	sub set_fontsize {
…		…
2352	$self->{value}->set_text ($val);	2753	$self->{value}->set_text ($val);
2353	}	2754	}
2354		2755
2355	#############################################################################	2756	#############################################################################
2356		2757
2357	package CFClient::UI::Slider;	2758	package CFPlus::UI::Slider;
2358		2759
2359	use strict;	2760	use strict;
2360		2761
2361	use CFClient::OpenGL;	2762	use CFPlus::OpenGL;
2362		2763
2363	our @ISA = CFClient::UI::DrawBG::;	2764	our @ISA = CFPlus::UI::DrawBG::;
2364		2765
2365	my @tex =	2766	my @tex =
2366	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2767	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367	qw(s1_slider.png s1_slider_bg.png);	2768	qw(s1_slider.png s1_slider_bg.png);
2368		2769
2369	sub new {	2770	sub new {
2370	my $class = shift;	2771	my $class = shift;
2371		2772
…		…
2439		2840
2440	$self->SUPER::invoke_button_down ($ev, $x, $y);	2841	$self->SUPER::invoke_button_down ($ev, $x, $y);
2441		2842
2442	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2843	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2443		2844
2444	$self->invoke_mouse_motion ($ev, $x, $y)	2845	$self->invoke_mouse_motion ($ev, $x, $y);
		2846
		2847	1
2445	}	2848	}
2446		2849
2447	sub invoke_mouse_motion {	2850	sub invoke_mouse_motion {
2448	my ($self, $ev, $x, $y) = @_;	2851	my ($self, $ev, $x, $y) = @_;
2449		2852
…		…
2456		2859
2457	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2860	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458	} else {	2861	} else {
2459	return 0;	2862	return 0;
2460	}	2863	}
		2864
		2865	1
		2866	}
		2867
		2868	sub invoke_mouse_wheel {
		2869	my ($self, $ev) = @_;
		2870
		2871	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2872
		2873	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2874
		2875	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2461		2876
2462	1	2877	1
2463	}	2878	}
2464		2879
2465	sub update {	2880	sub update {
…		…
2516	glDisable GL_TEXTURE_2D;	2931	glDisable GL_TEXTURE_2D;
2517	}	2932	}
2518		2933
2519	#############################################################################	2934	#############################################################################
2520		2935
2521	package CFClient::UI::ValSlider;	2936	package CFPlus::UI::ValSlider;
2522		2937
2523	our @ISA = CFClient::UI::HBox::;	2938	our @ISA = CFPlus::UI::HBox::;
2524		2939
2525	sub new {	2940	sub new {
2526	my ($class, %arg) = @_;	2941	my ($class, %arg) = @_;
2527		2942
2528	my $range = delete $arg{range};	2943	my $range = delete $arg{range};
2529		2944
2530	my $self = $class->SUPER::new (	2945	my $self = $class->SUPER::new (
2531	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2946	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2947	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533	to_value => sub { shift },	2948	to_value => sub { shift },
2534	from_value => sub { shift },	2949	from_value => sub { shift },
2535	%arg,	2950	%arg,
2536	);	2951	);
2537		2952
…		…
2557	sub set_range { shift->{slider}->set_range (@_) }	2972	sub set_range { shift->{slider}->set_range (@_) }
2558	sub set_value { shift->{slider}->set_value (@_) }	2973	sub set_value { shift->{slider}->set_value (@_) }
2559		2974
2560	#############################################################################	2975	#############################################################################
2561		2976
2562	package CFClient::UI::TextScroller;	2977	package CFPlus::UI::TextScroller;
2563		2978
2564	our @ISA = CFClient::UI::HBox::;	2979	our @ISA = CFPlus::UI::HBox::;
2565		2980
2566	use CFClient::OpenGL;	2981	use CFPlus::OpenGL;
2567		2982
2568	sub new {	2983	sub new {
2569	my $class = shift;	2984	my $class = shift;
2570		2985
2571	my $self = $class->SUPER::new (	2986	my $self = $class->SUPER::new (
2572	fontsize => 1,	2987	fontsize => 1,
2573	can_events => 0,	2988	can_events => 1,
2574	indent => 0,	2989	indent => 0,
2575	#font => default_font	2990	#font => default_font
2576	@_,	2991	@_,
2577		2992
2578	layout => (new CFClient::Layout 1),	2993	layout => (new CFPlus::Layout),
2579	par => [],	2994	par => [],
		2995	max_par => 0,
2580	height => 0,	2996	height => 0,
2581	children => [	2997	children => [
2582	(new CFClient::UI::Empty expand => 1),	2998	(new CFPlus::UI::Empty expand => 1),
2583	(new CFClient::UI::Slider vertical => 1),	2999	(new CFPlus::UI::Slider vertical => 1),
2584	],	3000	],
2585	);	3001	);
2586		3002
2587	$self->{children}[1]->connect (changed => sub { $self->update });	3003	$self->{children}[1]->connect (changed => sub { $self->update });
2588		3004
…		…
2618		3034
2619	$self->reflow;	3035	$self->reflow;
2620		3036
2621	local $self->{children} = [$empty, $slider];	3037	local $self->{children} = [$empty, $slider];
2622	$self->SUPER::invoke_size_allocate ($w, $h)	3038	$self->SUPER::invoke_size_allocate ($w, $h)
		3039	}
		3040
		3041	sub invoke_mouse_wheel {
		3042	my ($self, $ev) = @_;
		3043
		3044	return 0 unless $ev->{dy}; # only vertical movements
		3045
		3046	$self->{children}[1]->emit (mouse_wheel => $ev);
		3047
		3048	1
2623	}	3049	}
2624		3050
2625	sub get_layout {	3051	sub get_layout {
2626	my ($self, $para) = @_;	3052	my ($self, $para) = @_;
2627		3053
…		…
2655		3081
2656	# todo: base offset on lines or so, not on pixels	3082	# todo: base offset on lines or so, not on pixels
2657	$self->{children}[1]->set_value ($offset);	3083	$self->{children}[1]->set_value ($offset);
2658	}	3084	}
2659		3085
		3086	sub current_paragraph {
		3087	my ($self) = @_;
		3088
		3089	$self->{top_paragraph} - 1
		3090	}
		3091
		3092	sub scroll_to {
		3093	my ($self, $para) = @_;
		3094
		3095	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3096
		3097	$self->{scroll_to} = $para;
		3098	$self->update;
		3099	}
		3100
2660	sub clear {	3101	sub clear {
2661	my ($self) = @_;	3102	my ($self) = @_;
2662		3103
2663	my (undef, undef, @other) = @{ $self->{children} };	3104	my (undef, undef, @other) = @{ $self->{children} };
2664	$self->remove ($_) for @other;	3105	$self->remove ($_) for @other;
…		…
2667	$self->{height} = 0;	3108	$self->{height} = 0;
2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3109	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669	}	3110	}
2670		3111
2671	sub add_paragraph {	3112	sub add_paragraph {
2672	my ($self, $color, $para, $indent) = @_;	3113	my $self = shift;
2673		3114
2674	my ($text, @w) = ref $para ? @$para : $para;	3115	for my $para (@_) {
2675
2676	$para = {	3116	$para = {
		3117	fg => [1, 1, 1, 1],
		3118	indent => 0,
		3119	markup => "",
		3120	widget => [],
		3121	ref $para ? %$para : (markup => $para),
2677	w => 1e10,	3122	w => 1e10,
2678	wrapped => 1,	3123	wrapped => 1,
2679	fg => $color,
2680	indent => $indent,
2681	markup => $text,
2682	widget => \@w,
2683	};	3124	};
2684		3125
2685	$self->add (@w) if @w;	3126	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686	push @{$self->{par}}, $para;	3127	push @{$self->{par}}, $para;
		3128	}
		3129
		3130	if (my $max = $self->{max_par}) {
		3131	shift @{$self->{par}} while @{$self->{par}} > $max;
		3132	}
2687		3133
2688	$self->{need_reflow}++;	3134	$self->{need_reflow}++;
2689	$self->update;	3135	$self->update;
2690	}	3136	}
2691		3137
2692	sub scroll_to_bottom {	3138	sub scroll_to_bottom {
2693	my ($self) = @_;	3139	my ($self) = @_;
2694		3140
2695	$self->{scroll_to_bottom} = 1;	3141	$self->{scroll_to} = $#{$self->{par}};
2696	$self->update;	3142	$self->update;
2697	}	3143	}
2698		3144
		3145	sub force_uptodate {
		3146	my ($self) = @_;
		3147
		3148	if (delete $self->{need_reflow}) {
		3149	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3150
		3151	my $height = 0;
		3152
		3153	for my $para (@{$self->{par}}) {
		3154	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3155	my $layout = $self->get_layout ($para);
		3156	my ($w, $h) = $layout->size;
		3157
		3158	$para->{w} = $w + $para->{indent};
		3159	$para->{h} = $h;
		3160	$para->{wrapped} = $layout->has_wrapped;
		3161	}
		3162
		3163	$para->{y} = $height;
		3164	$height += $para->{h};
		3165	}
		3166
		3167	$self->{height} = $height;
		3168	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3169
		3170	delete $self->{texture};
		3171	}
		3172
		3173	if (my $paridx = delete $self->{scroll_to}) {
		3174	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3175	}
		3176	}
		3177
2699	sub update {	3178	sub update {
2700	my ($self) = @_;	3179	my ($self) = @_;
2701		3180
2702	$self->SUPER::update;	3181	$self->SUPER::update;
2703		3182
2704	return unless $self->{h} > 0;	3183	return unless $self->{h} > 0;
2705		3184
2706	delete $self->{texture};	3185	delete $self->{texture};
2707		3186
2708	$ROOT->on_post_alloc ($self => sub {	3187	$ROOT->on_post_alloc ($self => sub {
		3188	$self->force_uptodate;
		3189
2709	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3190	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710		3191
2711	if (delete $self->{need_reflow}) {
2712	my $height = 0;
2713
2714	for my $para (@{$self->{par}}) {
2715	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716	my $layout = $self->get_layout ($para);
2717	my ($w, $h) = $layout->size;
2718
2719	$para->{w} = $w + $para->{indent};
2720	$para->{h} = $h;
2721	$para->{wrapped} = $layout->has_wrapped;
2722	}
2723
2724	$height += $para->{h};
2725	}
2726
2727	$self->{height} = $height;
2728
2729	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731	delete $self->{texture};
2732	}
2733
2734	if (delete $self->{scroll_to_bottom}) {
2735	$self->{children}[1]->set_value (1e10);
2736	}
2737
2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3192	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739	glClearColor 0, 0, 0, 0;	3193	glClearColor 0, 0, 0, 0;
2740	glClear GL_COLOR_BUFFER_BIT;	3194	glClear GL_COLOR_BUFFER_BIT;
2741		3195
		3196	package CFPlus::UI::Base;
		3197	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3198	(0, 0, $self->{w}, $self->{h});
		3199
		3200	my $top = int $self->{children}[1]{range}[0];
		3201
		3202	my $paridx = 0;
		3203	my $top_paragraph;
2742	my $top = int $self->{children}[1]{range}[0];	3204	my $top = int $self->{children}[1]{range}[0];
2743		3205
2744	my $y0 = $top;	3206	my $y0 = $top;
2745	my $y1 = $top + $H;	3207	my $y1 = $top + $H;
2746		3208
2747	my $y = 0;
2748
2749	glEnable GL_BLEND;
2750	#TODO# not correct in windows where rgba is forced off
2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753	for my $para (@{$self->{par}}) {	3209	for my $para (@{$self->{par}}) {
2754	my $h = $para->{h};	3210	my $h = $para->{h};
		3211	my $y = $para->{y};
2755		3212
2756	if ($y0 < $y + $h && $y < $y1) {	3213	if ($y0 < $y + $h && $y < $y1) {
2757
2758	my $layout = $self->get_layout ($para);	3214	my $layout = $self->get_layout ($para);
2759		3215
2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762	glRasterPos $para->{indent}, $y - $y0;	3216	$layout->render ($para->{indent}, $y - $y0);
2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764		3217
2765	if (my @w = @{ $para->{widget} }) {	3218	if (my @w = @{ $para->{widget} }) {
2766	my @s = $layout->get_shapes;	3219	my @s = $layout->get_shapes;
2767		3220
2768	glDisable GL_BLEND;
2769	for (@w) {	3221	for (@w) {
2770	my ($dx, $dy) = splice @s, 0, 2, ();	3222	my ($dx, $dy) = splice @s, 0, 2, ();
2771		3223
2772	$_->{x} = $dx + $para->{indent};	3224	$_->{x} = $dx + $para->{indent};
2773	$_->{y} = $dy + $y - $y0;	3225	$_->{y} = $dy + $y - $y0;
2774		3226
2775	$_->draw;	3227	$_->draw;
2776	}	3228	}
2777	glEnable GL_BLEND;
2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779	}	3229	}
2780	}	3230	}
2781		3231
2782	$y += $h;	3232	$paridx++;
		3233	$top_paragraph ||= $paridx if $y >= $top;
2783	}	3234	}
2784		3235
2785	glDisable GL_BLEND;	3236	$self->{top_paragraph} = $top_paragraph;
2786	};	3237	};
2787	});	3238	});
2788	}	3239	}
2789		3240
2790	sub reconfigure {	3241	sub reconfigure {
…		…
2808	$self->{children}[1]->draw;	3259	$self->{children}[1]->draw;
2809	}	3260	}
2810		3261
2811	#############################################################################	3262	#############################################################################
2812		3263
2813	package CFClient::UI::Animator;	3264	package CFPlus::UI::Animator;
2814		3265
2815	use CFClient::OpenGL;	3266	use CFPlus::OpenGL;
2816		3267
2817	our @ISA = CFClient::UI::Bin::;	3268	our @ISA = CFPlus::UI::Bin::;
2818		3269
2819	sub moveto {	3270	sub moveto {
2820	my ($self, $x, $y) = @_;	3271	my ($self, $x, $y) = @_;
2821		3272
2822	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3273	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2850	glPopMatrix;	3301	glPopMatrix;
2851	}	3302	}
2852		3303
2853	#############################################################################	3304	#############################################################################
2854		3305
2855	package CFClient::UI::Flopper;	3306	package CFPlus::UI::Flopper;
2856		3307
2857	our @ISA = CFClient::UI::Button::;	3308	our @ISA = CFPlus::UI::Button::;
2858		3309
2859	sub new {	3310	sub new {
2860	my $class = shift;	3311	my $class = shift;
2861		3312
2862	my $self = $class->SUPER::new (	3313	my $self = $class->SUPER::new (
…		…
2874	$self->{other}->toggle_visibility;	3325	$self->{other}->toggle_visibility;
2875	}	3326	}
2876		3327
2877	#############################################################################	3328	#############################################################################
2878		3329
2879	package CFClient::UI::Tooltip;	3330	package CFPlus::UI::Tooltip;
2880		3331
2881	our @ISA = CFClient::UI::Bin::;	3332	our @ISA = CFPlus::UI::Bin::;
2882		3333
2883	use CFClient::OpenGL;	3334	use CFPlus::OpenGL;
2884		3335
2885	sub new {	3336	sub new {
2886	my $class = shift;	3337	my $class = shift;
2887		3338
2888	$class->SUPER::new (	3339	$class->SUPER::new (
…		…
2891	)	3342	)
2892	}	3343	}
2893		3344
2894	sub set_tooltip_from {	3345	sub set_tooltip_from {
2895	my ($self, $widget) = @_;	3346	my ($self, $widget) = @_;
		3347
		3348	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3349	if $widget->{tooltip} =~ /^#(.*)$/;
2896		3350
2897	my $tooltip = $widget->{tooltip};	3351	my $tooltip = $widget->{tooltip};
2898		3352
2899	if ($ENV{CFPLUS_DEBUG} & 2) {	3353	if ($ENV{CFPLUS_DEBUG} & 2) {
2900	$tooltip .= "\n\n" . (ref $widget) . "\n"	3354	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2904	}	3358	}
2905		3359
2906	$tooltip =~ s/^\n+//;	3360	$tooltip =~ s/^\n+//;
2907	$tooltip =~ s/\n+$//;	3361	$tooltip =~ s/\n+$//;
2908		3362
2909	$self->add (new CFClient::UI::Label	3363	$self->add (new CFPlus::UI::Label
2910	markup => $tooltip,	3364	markup => $tooltip,
2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3365	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912	fontsize => 0.8,	3366	fontsize => 0.8,
2913	fg => [0, 0, 0, 1],	3367	style => 1, # FLAG_INVERSE
2914	ellipsise => 0,	3368	ellipsise => 0,
2915	font => ($widget->{tooltip_font} || $::FONT_PROP),	3369	font => ($widget->{tooltip_font} || $::FONT_PROP),
2916	);	3370	);
2917	}	3371	}
2918		3372
…		…
2937		3391
2938	$self->{root}->on_post_alloc ("move_$self" => sub {	3392	$self->{root}->on_post_alloc ("move_$self" => sub {
2939	my $widget = $self->{owner}	3393	my $widget = $self->{owner}
2940	or return;	3394	or return;
2941		3395
		3396	if ($widget->{visible}) {
2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3397	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943		3398
2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3399	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945	if $x + $self->{w} > $self->{root}{w};	3400	if $x + $self->{w} > $self->{root}{w};
2946		3401
2947	$self->move_abs ($x, $y);	3402	$self->move_abs ($x, $y);
		3403	} else {
		3404	$self->hide;
		3405	}
2948	});	3406	});
2949	}	3407	}
2950		3408
2951	sub _draw {	3409	sub _draw {
2952	my ($self) = @_;	3410	my ($self) = @_;
…		…
2976	$self->SUPER::_draw;	3434	$self->SUPER::_draw;
2977	}	3435	}
2978		3436
2979	#############################################################################	3437	#############################################################################
2980		3438
2981	package CFClient::UI::Face;	3439	package CFPlus::UI::Face;
2982		3440
2983	our @ISA = CFClient::UI::Base::;	3441	our @ISA = CFPlus::UI::DrawBG::;
2984		3442
2985	use CFClient::OpenGL;	3443	use CFPlus::OpenGL;
2986		3444
2987	sub new {	3445	sub new {
2988	my $class = shift;	3446	my $class = shift;
2989		3447
2990	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
		3449	size_w => 32,
		3450	size_h => 8,
2991	aspect => 1,	3451	aspect => 1,
2992	can_events => 0,	3452	can_events => 0,
2993	@_,	3453	@_,
2994	);	3454	);
2995		3455
2996	if ($self->{anim} && $self->{animspeed}) {	3456	if ($self->{anim} && $self->{animspeed}) {
2997	Scalar::Util::weaken (my $widget = $self);	3457	CFPlus::weaken (my $widget = $self);
2998		3458
		3459	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3460	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2999	$self->{timer} = Event->timer (	3461	$self->{timer} = Event->timer (
3000	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3001	hard => 1,	3462	parked => 1,
3002	interval => $self->{animspeed},
3003	cb => sub {	3463	cb => sub {
		3464	return unless $::CONN && $widget;
		3465
3004	++$widget->{frame};	3466	++$widget->{frame};
		3467	$widget->update_face;
3005	$widget->update;	3468	$widget->update;
		3469
		3470	$widget->update_timer;
3006	},	3471	},
3007	);	3472	);
		3473
		3474	$self->update_face;
		3475	$self->update_timer;
3008	}	3476	}
3009		3477
3010	$self	3478	$self
3011	}	3479	}
3012		3480
		3481	sub update_timer {
		3482	my ($self) = @_;
		3483
		3484	return unless $self->{timer};
		3485
		3486	if ($self->{visible}) {
		3487	$self->{timer}->at (
		3488	$self->{anim_start}
		3489	+ $self->{animspeed}
		3490	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3491	);
		3492	$self->{timer}->start;
		3493	} else {
		3494	$self->{timer}->stop;
		3495	}
		3496	}
		3497
		3498	sub update_face {
		3499	my ($self) = @_;
		3500
		3501	return unless $::CONN;
		3502
		3503	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3504	if ($anim && @$anim) {
		3505	delete $self->{wait_face};
		3506	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3507	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3508	}
		3509	}
		3510	}
		3511
3013	sub size_request {	3512	sub size_request {
3014	(32, 8)	3513	my ($self) = @_;
		3514
		3515	if ($::CONN) {
		3516	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3517	if (my $tex = $::CONN->{texture}[$faceid]) {
		3518	$self->{tex} = $tex;
		3519	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3520	} else {
		3521	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3522	$self->realloc;
		3523	});
		3524	}
		3525	}
		3526	}
		3527
		3528	($self->{size_w} || 8, $self->{size_h} || 8)
3015	}	3529	}
3016		3530
3017	sub update {	3531	sub update {
3018	my ($self) = @_;	3532	my ($self) = @_;
3019		3533
3020	return unless $self->{visible};	3534	return unless $self->{visible};
3021		3535
3022	$self->SUPER::update;	3536	$self->SUPER::update;
3023	}	3537	}
3024		3538
		3539	sub invoke_visibility_change {
		3540	my ($self) = @_;
		3541
		3542	$self->update_timer;
		3543
		3544	0
		3545	}
		3546
3025	sub _draw {	3547	sub _draw {
3026	my ($self) = @_;	3548	my ($self) = @_;
3027		3549
3028	return unless $::CONN;	3550	$self->SUPER::_draw;
3029		3551
3030	my $face;	3552	if (my $tex = $self->{tex}) {
3031
3032	if ($self->{frame}) {
3033	my $anim = $::CONN->{anim}[$self->{anim}];
3034
3035	$face = $anim->[ $self->{frame} % @$anim ]
3036	if $anim && @$anim;
3037	}
3038
3039	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3040
3041	if ($tex) {
3042	glEnable GL_TEXTURE_2D;	3553	glEnable GL_TEXTURE_2D;
3043	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3044	glColor 0, 0, 0, 1;	3555	glColor 0, 0, 0, 1;
3045	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3556	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3046	glDisable GL_TEXTURE_2D;	3557	glDisable GL_TEXTURE_2D;
…		…
3048	}	3559	}
3049		3560
3050	sub destroy {	3561	sub destroy {
3051	my ($self) = @_;	3562	my ($self) = @_;
3052		3563
3053	$self->{timer}->cancel	3564	(delete $self->{timer})->cancel
3054	if $self->{timer};	3565	if $self->{timer};
3055		3566
3056	$self->SUPER::destroy;	3567	$self->SUPER::destroy;
3057	}	3568	}
3058		3569
3059	#############################################################################	3570	#############################################################################
3060		3571
3061	package CFClient::UI::Buttonbar;	3572	package CFPlus::UI::Buttonbar;
3062		3573
3063	our @ISA = CFClient::UI::HBox::;	3574	our @ISA = CFPlus::UI::HBox::;
3064		3575
3065	# TODO: should actualyl wrap buttons and other goodies.	3576	# TODO: should actually wrap buttons and other goodies.
3066		3577
3067	#############################################################################	3578	#############################################################################
3068		3579
3069	package CFClient::UI::Menu;	3580	package CFPlus::UI::Menu;
3070		3581
3071	our @ISA = CFClient::UI::FancyFrame::;	3582	our @ISA = CFPlus::UI::Toplevel::;
3072		3583
3073	use CFClient::OpenGL;	3584	use CFPlus::OpenGL;
3074		3585
3075	sub new {	3586	sub new {
3076	my $class = shift;	3587	my $class = shift;
3077		3588
3078	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
3079	items => [],	3590	items => [],
3080	z => 100,	3591	z => 100,
3081	@_,	3592	@_,
3082	);	3593	);
3083		3594
3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3595	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085		3596
3086	for my $item (@{ $self->{items} }) {	3597	for my $item (@{ $self->{items} }) {
3087	my ($widget, $cb, $tooltip) = @$item;	3598	my ($widget, $cb, $tooltip) = @$item;
3088		3599
3089	# handle various types of items, only text for now	3600	# handle various types of items, only text for now
3090	if (!ref $widget) {	3601	if (!ref $widget) {
		3602	if ($widget =~ /\t/) {
		3603	my ($left, $right) = split /\t/, $widget, 2;
		3604
3091	$widget = new CFClient::UI::Label	3605	$widget = new CFPlus::UI::HBox
3092	can_hover => 1,	3606	can_hover => 1,
3093	can_events => 1,	3607	can_events => 1,
		3608	tooltip => $tooltip,
		3609	children => [
		3610	(new CFPlus::UI::Label markup => $left, expand => 1),
		3611	(new CFPlus::UI::Label markup => $right, align => +1),
		3612	],
		3613	;
		3614
		3615	} else {
		3616	$widget = new CFPlus::UI::Label
		3617	can_hover => 1,
		3618	can_events => 1,
3094	markup => $widget,	3619	markup => $widget,
3095	tooltip => $tooltip	3620	tooltip => $tooltip;
		3621	}
3096	}	3622	}
3097		3623
3098	$self->{item}{$widget} = $item;	3624	$self->{item}{$widget} = $item;
3099		3625
3100	$self->{vbox}->add ($widget);	3626	$self->{vbox}->add ($widget);
…		…
3143	1	3669	1
3144	}	3670	}
3145		3671
3146	#############################################################################	3672	#############################################################################
3147		3673
3148	package CFClient::UI::Multiplexer;	3674	package CFPlus::UI::Multiplexer;
3149		3675
3150	our @ISA = CFClient::UI::Container::;	3676	our @ISA = CFPlus::UI::Container::;
3151		3677
3152	sub new {	3678	sub new {
3153	my $class = shift;	3679	my $class = shift;
3154		3680
3155	my $self = $class->SUPER::new (	3681	my $self = $class->SUPER::new (
…		…
3216	$self->{current}->draw;	3742	$self->{current}->draw;
3217	}	3743	}
3218		3744
3219	#############################################################################	3745	#############################################################################
3220		3746
3221	package CFClient::UI::Notebook;	3747	package CFPlus::UI::Notebook;
3222		3748
3223	our @ISA = CFClient::UI::VBox::;	3749	our @ISA = CFPlus::UI::VBox::;
3224		3750
3225	sub new {	3751	sub new {
3226	my $class = shift;	3752	my $class = shift;
3227		3753
3228	my $self = $class->SUPER::new (	3754	my $self = $class->SUPER::new (
3229	buttonbar => (new CFClient::UI::Buttonbar),	3755	buttonbar => (new CFPlus::UI::Buttonbar),
3230	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3756	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231	# filter => # will be put between multiplexer and $self	3757	# filter => # will be put between multiplexer and $self
3232	@_,	3758	@_,
3233	);	3759	);
3234		3760
3235	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3761	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3239	}	3765	}
3240		3766
3241	sub add {	3767	sub add {
3242	my ($self, $title, $widget, $tooltip) = @_;	3768	my ($self, $title, $widget, $tooltip) = @_;
3243		3769
3244	Scalar::Util::weaken $self;	3770	CFPlus::weaken $self;
3245		3771
3246	$self->{buttonbar}->add (new CFClient::UI::Button	3772	unless (ref $title) {
		3773	$title = new CFPlus::UI::Button
3247	markup => $title,	3774	markup => $title,
3248	tooltip => $tooltip,	3775	tooltip => $tooltip,
		3776	;
		3777	}
		3778
3249	on_activate => sub { $self->set_current_page ($widget) },	3779	$title->connect (activate => sub { $self->set_current_page ($widget) });
3250	);	3780	$self->{buttonbar}->add ($title);
3251		3781
3252	$self->{multiplexer}->add ($widget);	3782	$self->{multiplexer}->add ($widget);
3253	}	3783	}
3254		3784
3255	sub get_current_page {	3785	sub get_current_page {
…		…
3265	$self->emit (page_changed => $self->{multiplexer}{current});	3795	$self->emit (page_changed => $self->{multiplexer}{current});
3266	}	3796	}
3267		3797
3268	#############################################################################	3798	#############################################################################
3269		3799
3270	package CFClient::UI::Combobox;	3800	package CFPlus::UI::Selector;
3271		3801
3272	use utf8;	3802	use utf8;
3273		3803
3274	our @ISA = CFClient::UI::Button::;	3804	our @ISA = CFPlus::UI::Button::;
3275		3805
3276	sub new {	3806	sub new {
3277	my $class = shift;	3807	my $class = shift;
3278		3808
3279	my $self = $class->SUPER::new (	3809	my $self = $class->SUPER::new (
…		…
3296	my ($value, $title, $tooltip) = @$_;	3826	my ($value, $title, $tooltip) = @$_;
3297		3827
3298	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3828	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299	}	3829	}
3300		3830
3301	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3831	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302	}	3832	}
3303		3833
3304	sub _set_value {	3834	sub _set_value {
3305	my ($self, $value) = @_;	3835	my ($self, $value) = @_;
3306		3836
…		…
3321	$self->emit (changed => $value);	3851	$self->emit (changed => $value);
3322	}	3852	}
3323		3853
3324	#############################################################################	3854	#############################################################################
3325		3855
3326	package CFClient::UI::Statusbox;	3856	package CFPlus::UI::Statusbox;
3327		3857
3328	our @ISA = CFClient::UI::VBox::;	3858	our @ISA = CFPlus::UI::VBox::;
3329		3859
3330	sub new {	3860	sub new {
3331	my $class = shift;	3861	my $class = shift;
3332		3862
3333	my $self = $class->SUPER::new (	3863	my $self = $class->SUPER::new (
3334	fontsize => 0.8,	3864	fontsize => 0.8,
3335	@_,	3865	@_,
3336	);	3866	);
3337		3867
3338	Scalar::Util::weaken (my $this = $self);	3868	CFPlus::weaken (my $this = $self);
3339		3869
3340	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3870	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341		3871
3342	$self	3872	$self
3343	}	3873	}
…		…
3345	sub reorder {	3875	sub reorder {
3346	my ($self) = @_;	3876	my ($self) = @_;
3347	my $NOW = Time::HiRes::time;	3877	my $NOW = Time::HiRes::time;
3348		3878
3349	# freeze display when hovering over any label	3879	# freeze display when hovering over any label
3350	return if $CFClient::UI::TOOLTIP->{owner}	3880	return if $CFPlus::UI::TOOLTIP->{owner}
3351	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3881	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352	values %{ $self->{item} };	3882	values %{ $self->{item} };
3353		3883
3354	while (my ($k, $v) = each %{ $self->{item} }) {	3884	while (my ($k, $v) = each %{ $self->{item} }) {
3355	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3885	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356	}	3886	}
…		…
3377	for ($short) {	3907	for ($short) {
3378	s/^\s+//;	3908	s/^\s+//;
3379	s/\s+/ /g;	3909	s/\s+/ /g;
3380	}	3910	}
3381		3911
3382	new CFClient::UI::Label	3912	new CFPlus::UI::Label
3383	markup => $short,	3913	markup => $short,
3384	tooltip => $item->{tooltip},	3914	tooltip => $item->{tooltip},
3385	tooltip_font => $::FONT_PROP,	3915	tooltip_font => $::FONT_PROP,
3386	tooltip_width => 0.67,	3916	tooltip_width => 0.67,
3387	fontsize => $item->{fontsize} || $self->{fontsize},	3917	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3466	$self->SUPER::destroy;	3996	$self->SUPER::destroy;
3467	}	3997	}
3468		3998
3469	#############################################################################	3999	#############################################################################
3470		4000
3471	package CFClient::UI::Inventory;
3472
3473	our @ISA = CFClient::UI::Table::;
3474
3475	sub new {
3476	my $class = shift;
3477
3478	my $self = $class->SUPER::new (
3479	col_expand => [0, 1, 0],
3480	@_,
3481	);
3482
3483	$self
3484	}
3485
3486	sub set_items {
3487	my ($self, $items) = @_;
3488
3489	$self->clear;
3490	return unless $items;
3491
3492	my @items = sort {
3493	($a->{type} <=> $b->{type})
3494	or ($a->{name} cmp $b->{name})
3495	} values %$items;
3496
3497	$self->{real_items} = \@items;
3498
3499	my $row = 0;
3500	for my $item (@items) {
3501	CFClient::Item::update_widgets $item;
3502
3503	$self->add (0, $row, $item->{face_widget});
3504	$self->add (1, $row, $item->{desc_widget});
3505	$self->add (2, $row, $item->{weight_widget});
3506
3507	$row++;
3508	}
3509	}
3510
3511	#############################################################################
3512
3513	package CFClient::UI::SpellList;
3514
3515	our @ISA = CFClient::UI::Table::;
3516
3517	sub new {
3518	my $class = shift;
3519
3520	my $self = $class->SUPER::new (
3521	binding => [],
3522	commands => [],
3523	@_,
3524	)
3525	}
3526
3527	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540	sub rebuild_spell_list {
3541	my ($self) = @_;
3542
3543	$CFClient::UI::ROOT->on_refresh ($self => sub {
3544	$self->clear;
3545
3546	return unless $::CONN;
3547
3548	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554	my $row = 0;
3555
3556	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557	my $spell = $self->{spell}{$_};
3558
3559	$row++;
3560
3561	my $spell_cb = sub {
3562	my ($widget, $ev) = @_;
3563
3564	if ($ev->{button} == 1) {
3565	$::CONN->user_send ("cast $spell->{name}");
3566	} elsif ($ev->{button} == 2) {
3567	$::CONN->user_send ("invoke $spell->{name}");
3568	} elsif ($ev->{button} == 3) {
3569	(new CFClient::UI::Menu
3570	items => [
3571	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573	],
3574	)->popup ($ev);
3575	} else {
3576	return 0;
3577	}
3578
3579	1
3580	};
3581
3582	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584	#TODO: add path info to tooltip
3585	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587	$self->add (0, $row, new CFClient::UI::Face
3588	face => $spell->{face},
3589	can_hover => 1,
3590	can_events => 1,
3591	tooltip => $tooltip,
3592	on_button_down => $spell_cb,
3593	);
3594
3595	$self->add (1, $row, new CFClient::UI::Label
3596	expand => 1,
3597	text => $spell->{name},
3598	can_hover => 1,
3599	can_events => 1,
3600	tooltip => $tooltip,
3601	on_button_down => $spell_cb,
3602	);
3603
3604	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608	}
3609	});
3610	}
3611
3612	sub add_spell {
3613	my ($self, $spell) = @_;
3614
3615	$self->{spell}->{$spell->{name}} = $spell;
3616	$self->rebuild_spell_list;
3617	}
3618
3619	sub remove_spell {
3620	my ($self, $spell) = @_;
3621
3622	delete $self->{spell}->{$spell->{name}};
3623	$self->rebuild_spell_list;
3624	}
3625
3626	sub clear_spells {
3627	my ($self) = @_;
3628
3629	$self->{spell} = {};
3630	$self->rebuild_spell_list;
3631	}
3632
3633	#############################################################################
3634
3635	package CFClient::UI::Root;	4001	package CFPlus::UI::Root;
3636		4002
3637	our @ISA = CFClient::UI::Container::;	4003	our @ISA = CFPlus::UI::Container::;
3638		4004
3639	use List::Util qw(min max);	4005	use List::Util qw(min max);
3640		4006
3641	use CFClient::OpenGL;	4007	use CFPlus::OpenGL;
3642		4008
3643	sub new {	4009	sub new {
3644	my $class = shift;	4010	my $class = shift;
3645		4011
3646	my $self = $class->SUPER::new (	4012	my $self = $class->SUPER::new (
3647	visible => 1,	4013	visible => 1,
3648	@_,	4014	@_,
3649	);	4015	);
3650		4016
3651	Scalar::Util::weaken ($self->{root} = $self);	4017	CFPlus::weaken ($self->{root} = $self);
3652		4018
3653	$self	4019	$self
3654	}	4020	}
3655		4021
3656	sub size_request {	4022	sub size_request {
…		…
3751	while ($self->{refresh_hook}) {	4117	while ($self->{refresh_hook}) {
3752	$_->()	4118	$_->()
3753	for values %{delete $self->{refresh_hook}};	4119	for values %{delete $self->{refresh_hook}};
3754	}	4120	}
3755		4121
3756	if ($self->{realloc}) {	4122	while ($self->{realloc}) {
3757	my %queue;	4123	my %queue;
3758	my @queue;	4124	my @queue;
3759	my $widget;	4125	my $widget;
3760		4126
3761	outer:	4127	outer:
…		…
3808	}	4174	}
3809	}	4175	}
3810		4176
3811	delete $self->{realloc}{$widget+0};	4177	delete $self->{realloc}{$widget+0};
3812	}	4178	}
3813	}
3814		4179
3815	while (my $size_alloc = delete $self->{size_alloc}) {	4180	while (my $size_alloc = delete $self->{size_alloc}) {
3816	my @queue = sort { $b->{visible} <=> $a->{visible} }	4181	my @queue = sort { $a->{visible} <=> $b->{visible} }
3817	values %$size_alloc;	4182	values %$size_alloc;
3818		4183
3819	while () {	4184	while () {
3820	my $widget = pop @queue || last;	4185	my $widget = pop @queue || last;
3821		4186
3822	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4187	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823		4188
3824	$w = 0 if $w < 0;	4189	$w = max $widget->{min_w}, $w;
3825	$h = 0 if $h < 0;	4190	$h = max $widget->{min_h}, $h;
3826		4191
		4192	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4193	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4194
		4195	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4196	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4197
3827	$w = int $w + 0.5;	4198	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	4199	$h = int $h + 0.5;
3829		4200
3830	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4201	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831	$widget->{old_w} = $widget->{w};	4202	$widget->{old_w} = $widget->{w};
3832	$widget->{old_h} = $widget->{h};	4203	$widget->{old_h} = $widget->{h};
3833		4204
3834	$widget->{w} = $w;	4205	$widget->{w} = $w;
3835	$widget->{h} = $h;	4206	$widget->{h} = $h;
3836		4207
3837	$widget->emit (size_allocate => $w, $h);	4208	$widget->emit (size_allocate => $w, $h);
		4209	}
3838	}	4210	}
3839	}	4211	}
3840	}	4212	}
3841		4213
3842	while ($self->{post_alloc_hook}) {	4214	while ($self->{post_alloc_hook}) {
3843	$_->()	4215	$_->()
3844	for values %{delete $self->{post_alloc_hook}};	4216	for values %{delete $self->{post_alloc_hook}};
3845	}	4217	}
3846
3847		4218
3848	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4219	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4220	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850	glClear GL_COLOR_BUFFER_BIT;	4221	glClear GL_COLOR_BUFFER_BIT;
3851		4222
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4225	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4226	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4227	glLoadIdentity;
3857		4228
3858	{	4229	{
3859	package CFClient::UI::Base;	4230	package CFPlus::UI::Base;
3860		4231
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4232	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4233	(0, 0, $self->{w}, $self->{h});
3863	}
3864		4234
3865	$self->_draw;	4235	$self->_draw;
		4236	}
3866	}	4237	}
3867		4238
3868	#############################################################################	4239	#############################################################################
3869		4240
3870	package CFClient::UI;	4241	package CFPlus::UI;
3871		4242
3872	$ROOT = new CFClient::UI::Root;	4243	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4244	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4245
3875	1	4246	1
3876		4247

Diff Legend

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