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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
423	my ($self) = @_;	457	my ($self) = @_;
424		458
425	return if $FOCUS == $self;	459	return if $FOCUS == $self;
426	return unless $self->{can_focus};	460	return unless $self->{can_focus};
427		461
428	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
429		463
430	$focus->update if $focus;	464	$self->update;
431	$FOCUS->update;
432		465
433	0	466	0
434	}	467	}
435		468
436	sub invoke_focus_out {	469	sub invoke_focus_out {
437	my ($self) = @_;	470	my ($self) = @_;
438		471
439	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
440		473
441	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
442		475
443	$focus->update if $focus; #?	476	$self->update;
444		477
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	479	unless $FOCUS;
447		480
448	0	481	0
449	}	482	}
450		483
451	sub grab_focus {	484	sub grab_focus {
452	my ($self) = @_;	485	my ($self) = @_;
453		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
466		501
467	1	502	0
468	}	503	}
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
479	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
574	glEnd;	641	glEnd;
575	glPopMatrix;	642	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	644	}
578		645
579	$self->_draw;	646	$self->_draw;
580	glPopMatrix;	647	glPopMatrix;
581	}	648	}
…		…
584	my ($self) = @_;	651	my ($self) = @_;
585		652
586	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
587	}	654	}
588		655
		656	my $cntx;#d#
589	sub DESTROY {	657	sub DESTROY {
590	my ($self) = @_;	658	my ($self) = @_;
591		659
592	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
593		661
594	eval { $self->destroy };	662	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
596	}	666	}
597		667
598	#############################################################################	668	#############################################################################
599		669
600	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
601		671
602	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
603		673
604	use strict;	674	use strict;
605	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
606		676
607	sub new {	677	sub new {
608	my $class = shift;	678	my $class = shift;
609		679
610	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
641	}	711	}
642	}	712	}
643		713
644	#############################################################################	714	#############################################################################
645		715
646	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
647		717
648	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
649		719
650	sub new {	720	sub new {
651	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
653	}	723	}
…		…
660		730
661	sub draw { }	731	sub draw { }
662		732
663	#############################################################################	733	#############################################################################
664		734
665	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
666		736
667	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
668		738
669	sub new {	739	sub new {
670	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
671		741
672	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
681	if $children;	751	if $children;
682		752
683	$self	753	$self
684	}	754	}
685		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
686	sub add {	764	sub add {
687	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
688		766
689	$_->set_parent ($self)	767	$_->set_parent ($self)
690	for @widgets;	768	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
751	}	829	}
752		830
753	#############################################################################	831	#############################################################################
754		832
755	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
756		834
757	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
758		836
759	sub new {	837	sub new {
760	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
761		839
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		841
764	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
765	}	843	}
766		844
767	sub add {	845	sub add {
…		…
774	sub remove {	852	sub remove {
775	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
776		854
777	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
778		856
779	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	858	unless @{$self->{children}};
781	}	859	}
782		860
783	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
784		862
…		…
796		874
797	#############################################################################	875	#############################################################################
798		876
799	# back-buffered drawing area	877	# back-buffered drawing area
800		878
801	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
802		880
803	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
804		882
805	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
806		884
807	sub new {	885	sub new {
808	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
809		887
810	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
832	}	910	}
833		911
834	sub render_child {	912	sub render_child {
835	my ($self) = @_;	913	my ($self) = @_;
836		914
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
840		918
841	{	919	{
842	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
843		921
844	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
846	}	926	}
847
848	$self->_render;
849	};	927	};
850	}	928	}
851		929
852	sub _draw {	930	sub _draw {
853	my ($self) = @_;	931	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		932
857	my $tex = $self->{texture}	933	my $tex = $self->{texture}
858	or return;	934	or return;
859		935
860	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
863		939
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
865		941
866	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
867	}	943	}
868		944
869	#############################################################################	945	#############################################################################
870		946
871	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
872		948
873	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
874		950
875	sub new {	951	sub new {
876	my $class = shift;	952	my $class = shift;
877		953
878	$class->SUPER::new (	954	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1016	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1018	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1020	}
945	}	1021	}
946		1022
947	sub _render {	1023	sub _render {
948	my ($self) = @_;	1024	my ($self) = @_;
949		1025
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1028
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1030
955	$self->SUPER::_render;	1031	$self->SUPER::_render;
956	}	1032	}
957		1033
958	#############################################################################	1034	#############################################################################
959		1035
960	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
961		1037
962	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::HBox::;
963		1039
964	sub new {	1040	sub new {
965	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
966		1042
967	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
968		1044
969	my $self;	1045	my $self;
970		1046
971	my $slider = new CFClient::UI::Slider	1047	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1048	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1049	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1050	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1051	$self->{vp}->set_offset (0, $_[1]);
976	},	1052	},
977	;	1053	;
978		1054
979	$self = $class->SUPER::new (	1055	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1056	vp => (new CFPlus::UI::ViewPort expand => 1),
		1057	can_events => 1,
981	slider => $slider,	1058	slider => $slider,
982	%arg,	1059	%arg,
983	);	1060	);
984		1061
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1063	$self->add ($child) if $child;
…		…
994	my ($self, $widget) = @_;	1071	my ($self, $widget) = @_;
995		1072
996	$self->{vp}->add ($self->{child} = $widget);	1073	$self->{vp}->add ($self->{child} = $widget);
997	}	1074	}
998		1075
		1076	sub invoke_mouse_wheel {
		1077	my ($self, $ev) = @_;
		1078
		1079	return 0 unless $ev->{dy}; # only vertical movements
		1080
		1081	$self->{slider}->emit (mouse_wheel => $ev);
		1082
		1083	1
		1084	}
		1085
999	sub update_slider {	1086	sub update_slider {
1000	my ($self) = @_;	1087	my ($self) = @_;
1001		1088
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1089	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1090	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1105	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1106	}
1020		1107
1021	#############################################################################	1108	#############################################################################
1022		1109
1023	package CFClient::UI::Frame;	1110	package CFPlus::UI::Frame;
1024		1111
1025	our @ISA = CFClient::UI::Bin::;	1112	our @ISA = CFPlus::UI::Bin::;
1026		1113
1027	use CFClient::OpenGL;	1114	use CFPlus::OpenGL;
1028		1115
1029	sub new {	1116	sub new {
1030	my $class = shift;	1117	my $class = shift;
1031		1118
1032	$class->SUPER::new (	1119	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1145	$self->SUPER::_draw;
1059	}	1146	}
1060		1147
1061	#############################################################################	1148	#############################################################################
1062		1149
1063	package CFClient::UI::FancyFrame;	1150	package CFPlus::UI::FancyFrame;
1064		1151
1065	our @ISA = CFClient::UI::Bin::;	1152	our @ISA = CFPlus::UI::Bin::;
1066		1153
1067	use CFClient::OpenGL;	1154	use CFPlus::OpenGL;
		1155
		1156	sub new {
		1157	my ($class, %arg) = @_;
		1158
		1159	if ((exists $arg{label}) && !ref $arg{label}) {
		1160	$arg{label} = new CFPlus::UI::Label
		1161	align => 1,
		1162	valign => 0,
		1163	text => $arg{label},
		1164	fontsize => ($arg{border} || 0.8) * 0.75;
		1165	}
		1166
		1167	my $self = $class->SUPER::new (
		1168	# label => "",
		1169	fg => [0.6, 0.3, 0.1],
		1170	border => 0.8,
		1171	style => 'single',
		1172	%arg,
		1173	);
		1174
		1175	$self
		1176	}
		1177
		1178	sub add {
		1179	my ($self, @widgets) = @_;
		1180
		1181	$self->SUPER::add (@widgets);
		1182	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1183	}
		1184
		1185	sub border {
		1186	int $_[0]{border} * $::FONTSIZE
		1187	}
		1188
		1189	sub size_request {
		1190	my ($self) = @_;
		1191
		1192	($self->{label_w}, undef) = $self->{label}->size_request
		1193	if $self->{label};
		1194
		1195	my ($w, $h) = $self->SUPER::size_request;
		1196
		1197	(
		1198	$w + $self->border * 2,
		1199	$h + $self->border * 2,
		1200	)
		1201	}
		1202
		1203	sub invoke_size_allocate {
		1204	my ($self, $w, $h) = @_;
		1205
		1206	my $border = $self->border;
		1207
		1208	$w -= List::Util::max 0, $border * 2;
		1209	$h -= List::Util::max 0, $border * 2;
		1210
		1211	if (my $label = $self->{label}) {
		1212	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1213	$label->{h} = List::Util::min $h, $border;
		1214	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1215	}
		1216
		1217	$self->child->configure ($border, $border, $w, $h);
		1218
		1219	1
		1220	}
		1221
		1222	sub _draw {
		1223	my ($self) = @_;
		1224
		1225	my $child = $self->{children}[0];
		1226
		1227	my $border = $self->border;
		1228	my ($w, $h) = ($self->{w}, $self->{h});
		1229
		1230	$child->draw;
		1231
		1232	glColor @{$self->{fg}};
		1233	glBegin GL_LINE_STRIP;
		1234	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1235	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1236	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1237	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1238	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1239	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1240	glEnd;
		1241
		1242	if ($self->{label}) {
		1243	glTranslate $border * 2, 0;
		1244	$self->{label}->_draw;
		1245	}
		1246	}
		1247
		1248	#############################################################################
		1249
		1250	package CFPlus::UI::Toplevel;
		1251
		1252	our @ISA = CFPlus::UI::Bin::;
		1253
		1254	use CFPlus::OpenGL;
1068		1255
1069	my $bg =	1256	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1257	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1258	mipmap => 1, wrap => 1;
1072		1259
1073	my @border =	1260	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1261	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1262	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1263
1077	sub new {	1264	sub new {
1078	my ($class, %arg) = @_;	1265	my ($class, %arg) = @_;
1079		1266
1080	my $self = $class->SUPER::new (	1267	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1268	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1269	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1270	border => 0.6,
1084	can_events => 1,	1271	can_events => 1,
1085	min_w => 16,	1272	min_w => 64,
1086	min_h => 16,	1273	min_h => 32,
1087	%arg,	1274	%arg,
1088	);	1275	);
1089		1276
1090	$self->{title_widget} = new CFClient::UI::Label	1277	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1278	align => 0,
1092	valign => 1,	1279	valign => 1,
1093	text => $self->{title},	1280	text => $self->{title},
1094	fontsize => $self->{border},	1281	fontsize => $self->{border},
1095	if exists $self->{title};	1282	if exists $self->{title};
1096		1283
1097	if ($self->{has_close_button}) {	1284	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1285	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1286	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1287	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1288	on_activate => sub { $self->emit ("delete") };
1102		1289
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1290	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1291	}
1105		1292
1106	$self	1293	$self
1107	}	1294	}
1108		1295
1109	sub add {	1296	sub add {
1110	my ($self, @widgets) = @_;	1297	my ($self, @widgets) = @_;
1111		1298
1112	$self->SUPER::add (@widgets);	1299	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1300	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1301	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1302	}
1116		1303
1117	sub border {	1304	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1305	int $_[0]{border} * $::FONTSIZE
1119	}	1306	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1339	$self->child->configure ($border, $border, $w, $h);
1153		1340
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1341	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1342	if $self->{close_button};
1156		1343
		1344	1
		1345	}
		1346
		1347	sub invoke_delete {
		1348	my ($self) = @_;
		1349
		1350	$self->hide;
		1351
1157	1	1352	1
1158	}	1353	}
1159		1354
1160	sub invoke_button_down {	1355	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1356	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1414	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1415
1221	! ! $self->{motion}	1416	! ! $self->{motion}
1222	}	1417	}
1223		1418
		1419	sub invoke_visibility_change {
		1420	my ($self, $visible) = @_;
		1421
		1422	delete $self->{motion} unless $visible;
		1423
		1424	0
		1425	}
		1426
1224	sub _draw {	1427	sub _draw {
1225	my ($self) = @_;	1428	my ($self) = @_;
1226		1429
1227	my $child = $self->{children}[0];	1430	my $child = $self->{children}[0];
1228		1431
…		…
1265	if $self->{close_button};	1468	if $self->{close_button};
1266	}	1469	}
1267		1470
1268	#############################################################################	1471	#############################################################################
1269		1472
1270	package CFClient::UI::Table;	1473	package CFPlus::UI::Table;
1271		1474
1272	our @ISA = CFClient::UI::Base::;	1475	our @ISA = CFPlus::UI::Base::;
1273		1476
1274	use List::Util qw(max sum);	1477	use List::Util qw(max sum);
1275		1478
1276	use CFClient::OpenGL;	1479	use CFPlus::OpenGL;
1277		1480
1278	sub new {	1481	sub new {
1279	my $class = shift;	1482	my $class = shift;
1280		1483
1281	$class->SUPER::new (	1484	$class->SUPER::new (
…		…
1287	sub children {	1490	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1492	}
1290		1493
1291	sub add {	1494	sub add {
1292	my ($self, $x, $y, $child) = @_;	1495	my ($self) = shift;
1293		1496
		1497	while (@_) {
		1498	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1499	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1500	$self->{children}[$y][$x] = $child;
		1501	}
1296		1502
		1503	$self->{force_realloc} = 1;
		1504	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1505	$self->realloc;
1298	}	1506	}
1299		1507
1300	sub remove {	1508	sub remove {
1301	my ($self, $child) = @_;	1509	my ($self, $child) = @_;
…		…
1366		1574
1367	# linearly scale sizes	1575	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1578
1371	CFClient::UI::harmonize $ws;	1579	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1580	CFPlus::UI::harmonize $hs;
1373		1581
1374	my $y;	1582	my $y;
1375		1583
1376	for my $r (0 .. $#{$self->{children}}) {	1584	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1585	my $row = $self->{children}[$r]
…		…
1420	}	1628	}
1421	}	1629	}
1422		1630
1423	#############################################################################	1631	#############################################################################
1424		1632
1425	package CFClient::UI::Box;	1633	package CFPlus::UI::Box;
1426		1634
1427	our @ISA = CFClient::UI::Container::;	1635	our @ISA = CFPlus::UI::Container::;
1428		1636
1429	sub size_request {	1637	sub size_request {
1430	my ($self) = @_;	1638	my ($self) = @_;
1431		1639
1432	$self->{vertical}	1640	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1673	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1674	for 0 .. $#children;
1467	}	1675	}
1468	}	1676	}
1469		1677
1470	CFClient::UI::harmonize \@req;	1678	CFPlus::UI::harmonize \@req;
1471		1679
1472	my $pos = 0;	1680	my $pos = 0;
1473	for (0 .. $#children) {	1681	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1682	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1683	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1688	1
1481	}	1689	}
1482		1690
1483	#############################################################################	1691	#############################################################################
1484		1692
1485	package CFClient::UI::HBox;	1693	package CFPlus::UI::HBox;
1486		1694
1487	our @ISA = CFClient::UI::Box::;	1695	our @ISA = CFPlus::UI::Box::;
1488		1696
1489	sub new {	1697	sub new {
1490	my $class = shift;	1698	my $class = shift;
1491		1699
1492	$class->SUPER::new (	1700	$class->SUPER::new (
…		…
1495	)	1703	)
1496	}	1704	}
1497		1705
1498	#############################################################################	1706	#############################################################################
1499		1707
1500	package CFClient::UI::VBox;	1708	package CFPlus::UI::VBox;
1501		1709
1502	our @ISA = CFClient::UI::Box::;	1710	our @ISA = CFPlus::UI::Box::;
1503		1711
1504	sub new {	1712	sub new {
1505	my $class = shift;	1713	my $class = shift;
1506		1714
1507	$class->SUPER::new (	1715	$class->SUPER::new (
…		…
1510	)	1718	)
1511	}	1719	}
1512		1720
1513	#############################################################################	1721	#############################################################################
1514		1722
1515	package CFClient::UI::Label;	1723	package CFPlus::UI::Label;
1516		1724
1517	our @ISA = CFClient::UI::DrawBG::;	1725	our @ISA = CFPlus::UI::DrawBG::;
1518		1726
1519	use CFClient::OpenGL;	1727	use CFPlus::OpenGL;
1520		1728
1521	sub new {	1729	sub new {
1522	my ($class, %arg) = @_;	1730	my ($class, %arg) = @_;
1523		1731
1524	my $self = $class->SUPER::new (	1732	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1735	#active_bg => none
1528	#font => default_font	1736	#font => default_font
1529	#text => initial text	1737	#text => initial text
1530	#markup => initial narkup	1738	#markup => initial narkup
1531	#max_w => maximum pixel width	1739	#max_w => maximum pixel width
		1740	#style => 0, # render flags
1532	ellipsise => 3, # end	1741	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1742	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1743	fontsize => 1,
1535	align => -1,	1744	align => -1,
1536	valign => -1,	1745	valign => -1,
1537	padding_x => 2,	1746	padding_x => 2,
1538	padding_y => 2,	1747	padding_y => 2,
1539	can_events => 0,	1748	can_events => 0,
1540	%arg	1749	%arg
1541	);	1750	);
1542		1751
1543	if (exists $self->{template}) {	1752	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1753	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1754	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1755	$self->{template} = $layout;
1547	}	1756	}
1548		1757
1549	if (exists $self->{markup}) {	1758	if (exists $self->{markup}) {
…		…
1553	}	1762	}
1554		1763
1555	$self	1764	$self
1556	}	1765	}
1557		1766
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1767	sub update {
1569	my ($self) = @_;	1768	my ($self) = @_;
1570		1769
1571	delete $self->{texture};	1770	delete $self->{texture};
1572	$self->SUPER::update;	1771	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1782	my ($self, $text) = @_;
1584		1783
1585	return if $self->{text} eq "T$text";	1784	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1785	$self->{text} = "T$text";
1587		1786
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1787	$self->{layout}->set_text ($text);
1590		1788
1591	delete $self->{size_req};	1789	delete $self->{size_req};
1592	$self->realloc;	1790	$self->realloc;
1593	$self->update;	1791	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1797	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1798	$self->{text} = "M$markup";
1601		1799
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1800	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1801
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1802	$self->{layout}->set_markup ($markup);
1606		1803
1607	delete $self->{size_req};	1804	delete $self->{size_req};
1608	$self->realloc;	1805	$self->realloc;
1609	$self->update;	1806	$self->update;
…		…
1621		1818
1622	my ($w, $h) = $self->{layout}->size;	1819	my ($w, $h) = $self->{layout}->size;
1623		1820
1624	if (exists $self->{template}) {	1821	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1822	$self->{template}->set_font ($self->{font}) if $self->{font};
		1823	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1824	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1825
1628	my ($w2, $h2) = $self->{template}->size;	1826	my ($w2, $h2) = $self->{template}->size;
1629		1827
1630	$w = List::Util::max $w, $w2;	1828	$w = List::Util::max $w, $w2;
…		…
1664		1862
1665	sub reconfigure {	1863	sub reconfigure {
1666	my ($self) = @_;	1864	my ($self) = @_;
1667		1865
1668	delete $self->{size_req};	1866	delete $self->{size_req};
		1867	delete $self->{texture};
1669		1868
1670	$self->SUPER::reconfigure;	1869	$self->SUPER::reconfigure;
1671	}	1870	}
1672		1871
1673	sub _draw {	1872	sub _draw {
1674	my ($self) = @_;	1873	my ($self) = @_;
1675		1874
1676	$self->SUPER::_draw; # draw background, if applicable	1875	$self->SUPER::_draw; # draw background, if applicable
1677		1876
1678	my $tex = $self->{texture} ||= do {	1877	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	1878	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	1879	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	1880	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	1881	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1882	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1883	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		1884
1686	new_from_layout CFClient::Texture $self->{layout}	1885	[$self->{layout}->size]
1687	};	1886	};
1688		1887
1689	unless (exists $self->{ox}) {	1888	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1889	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1890	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	1891	: ($self->{w} - $size->[0]) * 0.5);
1693		1892
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1893	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1894	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	1895	: ($self->{h} - $size->[1]) * 0.5);
1697	};	1896	};
1698		1897
1699	glEnable GL_TEXTURE_2D;
1700
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1898	my $w = List::Util::min $self->{w} + 4, $size->[0];
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1899	my $h = List::Util::min $self->{h} + 2, $size->[1];
1703		1900
1704	if ($tex->{format} == GL_ALPHA) {	1901	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706	glColor @{$self->{fg}};
1707	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708	} else {
1709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711	}
1712
1713	glDisable GL_TEXTURE_2D;
1714	}	1902	}
1715		1903
1716	#############################################################################	1904	#############################################################################
1717		1905
1718	package CFClient::UI::EntryBase;	1906	package CFPlus::UI::EntryBase;
1719		1907
1720	our @ISA = CFClient::UI::Label::;	1908	our @ISA = CFPlus::UI::Label::;
1721		1909
1722	use CFClient::OpenGL;	1910	use CFPlus::OpenGL;
1723		1911
1724	sub new {	1912	sub new {
1725	my $class = shift;	1913	my $class = shift;
1726		1914
1727	$class->SUPER::new (	1915	$class->SUPER::new (
…		…
1731	active_fg => [0, 0, 0],	1919	active_fg => [0, 0, 0],
1732	can_hover => 1,	1920	can_hover => 1,
1733	can_focus => 1,	1921	can_focus => 1,
1734	valign => 0,	1922	valign => 0,
1735	can_events => 1,	1923	can_events => 1,
		1924	ellipsise => 0,
1736	#text => ...	1925	#text => ...
1737	#hidden => "*",	1926	#hidden => "*",
1738	@_	1927	@_
1739	)	1928	)
1740	}	1929	}
…		…
1785	my $sym = $ev->{sym};	1974	my $sym = $ev->{sym};
1786	my $uni = $ev->{unicode};	1975	my $uni = $ev->{unicode};
1787		1976
1788	my $text = $self->get_text;	1977	my $text = $self->get_text;
1789		1978
		1979	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1980
1790	if ($uni == 8) {	1981	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1982	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	1983	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	1984	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	1985	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	1986	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	1987	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	1988	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	1989	} elsif ($sym == CFPlus::SDLK_HOME) {
		1990	# what a hack
		1991	$self->{cursor} =
		1992	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1993	? length $1
		1994	: 0;
		1995	} elsif ($sym == CFPlus::SDLK_END) {
		1996	# uh, again
		1997	$self->{cursor} =
		1998	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1999	? $self->{cursor} + length $1
		2000	: length $self->{text};
		2001	} elsif ($uni == 21) { # ctrl-u
		2002	$text = "";
1799	$self->{cursor} = 0;	2003	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {
1801	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	2004	} elsif ($uni == 27) {
1803	$self->emit ('escape');	2005	$self->emit ('escape');
1804	} elsif ($uni) {	2006	} elsif ($uni == 0x0d) {
		2007	substr $text, $self->{cursor}++, 0, "\012";
		2008	} elsif ($uni >= 0x20) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	2009	substr $text, $self->{cursor}++, 0, chr $uni;
1806	} else {	2010	} else {
1807	return 0;	2011	return 0;
1808	}	2012	}
1809		2013
1810	$self->_set_text ($text);	2014	$self->_set_text ($text);
1811		2015
1812	$self->realloc;	2016	$self->realloc;
		2017	$self->update;
1813		2018
1814	1	2019	1
1815	}	2020	}
1816		2021
1817	sub invoke_focus_in {	2022	sub invoke_focus_in {
…		…
1829		2034
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	2035	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		2036
1832	# byte-index to char-index	2037	# byte-index to char-index
1833	my $text = $self->{text};	2038	my $text = $self->{text};
1834	utf8::encode $text;	2039	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	2040	$self->{cursor} = length $text;
1836		2041
1837	$self->_set_text ($self->{text});	2042	$self->_set_text ($self->{text});
1838	$self->update;	2043	$self->update;
1839		2044
1840	1	2045	1
…		…
1879	utf8::encode $text;	2084	utf8::encode $text;
1880		2085
1881	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2086	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882	}	2087	}
1883		2088
1884	glColor @{$self->{fg}};
1885	glBegin GL_LINES;	2089	glBegin GL_LINES;
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2090	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2091	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888	glEnd;	2092	glEnd;
1889	}	2093	}
1890	}	2094	}
1891		2095
		2096	#############################################################################
		2097
1892	package CFClient::UI::Entry;	2098	package CFPlus::UI::Entry;
1893		2099
1894	our @ISA = CFClient::UI::EntryBase::;	2100	our @ISA = CFPlus::UI::EntryBase::;
1895		2101
1896	use CFClient::OpenGL;	2102	use CFPlus::OpenGL;
1897		2103
1898	sub invoke_key_down {	2104	sub invoke_key_down {
1899	my ($self, $ev) = @_;	2105	my ($self, $ev) = @_;
1900		2106
1901	my $sym = $ev->{sym};	2107	my $sym = $ev->{sym};
1902		2108
1903	if ($sym == 13) {	2109	if ($ev->{uni} == 0x0d || $sym == 13) {
1904	unshift @{$self->{history}},	2110	unshift @{$self->{history}},
1905	my $txt = $self->get_text;	2111	my $txt = $self->get_text;
1906		2112
1907	$self->{history_pointer} = -1;	2113	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	2114	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	2115	$self->emit (activate => $txt);
1910	$self->update;	2116	$self->update;
1911		2117
1912	} elsif ($sym == CFClient::SDLK_UP) {	2118	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	2119	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	2120	$self->{history_saveback} = $self->get_text;
1915	}	2121	}
1916	if (@{$self->{history} || []} > 0) {	2122	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	2123	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	2125	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	2126	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2127	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	2128	}
1923		2129
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	2130	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	2131	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2132	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		2133
1928	if ($self->{history_pointer} >= 0) {	2134	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2135	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2144	1
1939	}	2145	}
1940		2146
1941	#############################################################################	2147	#############################################################################
1942		2148
		2149	package CFPlus::UI::TextEdit;
		2150
		2151	our @ISA = CFPlus::UI::EntryBase::;
		2152
		2153	use CFPlus::OpenGL;
		2154
		2155	sub move_cursor_ver {
		2156	my ($self, $dy) = @_;
		2157
		2158	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2159
		2160	$y += $dy;
		2161
		2162	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2163	$self->{cursor} = $index;
		2164	delete $self->{cur_h};
		2165	$self->update;
		2166	return;
		2167	}
		2168	}
		2169
		2170	sub invoke_key_down {
		2171	my ($self, $ev) = @_;
		2172
		2173	my $sym = $ev->{sym};
		2174
		2175	if ($sym == CFPlus::SDLK_UP) {
		2176	$self->move_cursor_ver (-1);
		2177	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2178	$self->move_cursor_ver (+1);
		2179	} else {
		2180	return $self->SUPER::invoke_key_down ($ev)
		2181	}
		2182
		2183	1
		2184	}
		2185
		2186	#############################################################################
		2187
1943	package CFClient::UI::Button;	2188	package CFPlus::UI::Button;
1944		2189
1945	our @ISA = CFClient::UI::Label::;	2190	our @ISA = CFPlus::UI::Label::;
1946		2191
1947	use CFClient::OpenGL;	2192	use CFPlus::OpenGL;
1948		2193
1949	my @tex =	2194	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2196	qw(b1_button_active.png);
1952		2197
1953	sub new {	2198	sub new {
1954	my $class = shift;	2199	my $class = shift;
1955		2200
…		…
1992	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
1993	}	2238	}
1994		2239
1995	#############################################################################	2240	#############################################################################
1996		2241
		2242	package CFPlus::UI::CheckBox;
		2243
		2244	our @ISA = CFPlus::UI::DrawBG::;
		2245
		2246	my @tex =
		2247	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2248	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2249
		2250	use CFPlus::OpenGL;
		2251
		2252	sub new {
		2253	my $class = shift;
		2254
		2255	$class->SUPER::new (
		2256	padding_x => 2,
		2257	padding_y => 2,
		2258	fg => [1, 1, 1],
		2259	active_fg => [1, 1, 0],
		2260	bg => [0, 0, 0, 0.2],
		2261	active_bg => [1, 1, 1, 0.5],
		2262	state => 0,
		2263	can_hover => 1,
		2264	@_
		2265	)
		2266	}
		2267
		2268	sub size_request {
		2269	my ($self) = @_;
		2270
		2271	(6) x 2
		2272	}
		2273
		2274	sub toggle {
		2275	my ($self) = @_;
		2276
		2277	$self->{state} = !$self->{state};
		2278	$self->emit (changed => $self->{state});
		2279	$self->update;
		2280	}
		2281
		2282	sub invoke_button_down {
		2283	my ($self, $ev, $x, $y) = @_;
		2284
		2285	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2286	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2287	$self->toggle;
		2288	} else {
		2289	return 0
		2290	}
		2291
		2292	1
		2293	}
		2294
		2295	sub _draw {
		2296	my ($self) = @_;
		2297
		2298	$self->SUPER::_draw;
		2299
		2300	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2301
		2302	my ($w, $h) = @$self{qw(w h)};
		2303
		2304	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2305
		2306	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2307
		2308	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2309
		2310	glEnable GL_TEXTURE_2D;
		2311	$tex->draw_quad_alpha (0, 0, $s, $s);
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
		2317	package CFPlus::UI::Image;
		2318
		2319	our @ISA = CFPlus::UI::Base::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	our %texture_cache;
		2324
		2325	sub new {
		2326	my $class = shift;
		2327
		2328	my $self = $class->SUPER::new (
		2329	can_events => 0,
		2330	@_,
		2331	);
		2332
		2333	$self->{path} || $self->{tex}
		2334	or Carp::croak "'path' or 'tex' attributes required";
		2335
		2336	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2337	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2338
		2339	CFPlus::weaken $texture_cache{$self->{path}};
		2340
		2341	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2342
		2343	$self
		2344	}
		2345
		2346	sub STORABLE_freeze {
		2347	my ($self, $cloning) = @_;
		2348
		2349	$self->{path}
		2350	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2351
		2352	$self->{path}
		2353	}
		2354
		2355	sub STORABLE_attach {
		2356	my ($self, $cloning, $path) = @_;
		2357
		2358	$self->new (path => $path)
		2359	}
		2360
		2361	sub size_request {
		2362	my ($self) = @_;
		2363
		2364	($self->{tex}{w}, $self->{tex}{h})
		2365	}
		2366
		2367	sub _draw {
		2368	my ($self) = @_;
		2369
		2370	my $tex = $self->{tex};
		2371
		2372	my ($w, $h) = ($self->{w}, $self->{h});
		2373
		2374	if ($self->{rot90}) {
		2375	glRotate 90, 0, 0, 1;
		2376	glTranslate 0, -$self->{w}, 0;
		2377
		2378	($w, $h) = ($h, $w);
		2379	}
		2380
		2381	glEnable GL_TEXTURE_2D;
		2382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2383
		2384	$tex->draw_quad (0, 0, $w, $h);
		2385
		2386	glDisable GL_TEXTURE_2D;
		2387	}
		2388
		2389	#############################################################################
		2390
1997	package CFClient::UI::ImageButton;	2391	package CFPlus::UI::ImageButton;
1998		2392
1999	our @ISA = CFClient::UI::Image::;	2393	our @ISA = CFPlus::UI::Image::;
2000		2394
2001	use CFClient::OpenGL;	2395	use CFPlus::OpenGL;
2002		2396
2003	my %textures;	2397	my %textures;
2004		2398
2005	sub new {	2399	sub new {
2006	my $class = shift;	2400	my $class = shift;
…		…
2028	1	2422	1
2029	}	2423	}
2030		2424
2031	#############################################################################	2425	#############################################################################
2032		2426
2033	package CFClient::UI::CheckBox;
2034
2035	our @ISA = CFClient::UI::DrawBG::;
2036
2037	my @tex =
2038	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041	use CFClient::OpenGL;
2042
2043	sub new {
2044	my $class = shift;
2045
2046	$class->SUPER::new (
2047	padding_x => 2,
2048	padding_y => 2,
2049	fg => [1, 1, 1],
2050	active_fg => [1, 1, 0],
2051	bg => [0, 0, 0, 0.2],
2052	active_bg => [1, 1, 1, 0.5],
2053	state => 0,
2054	can_hover => 1,
2055	@_
2056	)
2057	}
2058
2059	sub size_request {
2060	my ($self) = @_;
2061
2062	(6) x 2
2063	}
2064
2065	sub invoke_button_down {
2066	my ($self, $ev, $x, $y) = @_;
2067
2068	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070	$self->{state} = !$self->{state};
2071	$self->emit (changed => $self->{state});
2072	} else {
2073	return 0
2074	}
2075
2076	1
2077	}
2078
2079	sub _draw {
2080	my ($self) = @_;
2081
2082	$self->SUPER::_draw;
2083
2084	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086	my ($w, $h) = @$self{qw(w h)};
2087
2088	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092	my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094	glEnable GL_TEXTURE_2D;
2095	$tex->draw_quad_alpha (0, 0, $s, $s);
2096	glDisable GL_TEXTURE_2D;
2097	}
2098
2099	#############################################################################
2100
2101	package CFClient::UI::Image;	2427	package CFPlus::UI::VGauge;
2102		2428
2103	our @ISA = CFClient::UI::Base::;	2429	our @ISA = CFPlus::UI::Base::;
2104
2105	use CFClient::OpenGL;
2106
2107	our %texture_cache;
2108
2109	sub new {
2110	my $class = shift;
2111
2112	my $self = $class->SUPER::new (
2113	can_events => 0,
2114	@_,
2115	);
2116
2117	$self->{path}
2118	or Carp::croak "required attribute 'path' not set";
2119
2120	$self->{tex} = $texture_cache{$self->{path}} ||=
2121	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123	Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127	$self
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	($self->{tex}{w}, $self->{tex}{h})
2134	}
2135
2136	sub _draw {
2137	my ($self) = @_;
2138
2139	my $tex = $self->{tex};
2140
2141	my ($w, $h) = ($self->{w}, $self->{h});
2142
2143	if ($self->{rot90}) {
2144	glRotate 90, 0, 0, 1;
2145	glTranslate 0, -$self->{w}, 0;
2146
2147	($w, $h) = ($h, $w);
2148	}
2149
2150	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153	$tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155	glDisable GL_TEXTURE_2D;
2156	}
2157
2158	#############################################################################
2159
2160	package CFClient::UI::VGauge;
2161
2162	our @ISA = CFClient::UI::Base::;
2163		2430
2164	use List::Util qw(min max);	2431	use List::Util qw(min max);
2165		2432
2166	use CFClient::OpenGL;	2433	use CFPlus::OpenGL;
2167		2434
2168	my %tex = (	2435	my %tex = (
2169	food => [	2436	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2438	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2439	],
2173	grace => [	2440	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2442	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176	],	2443	],
2177	hp => [	2444	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2446	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2447	],
2181	mana => [	2448	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2449	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2450	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184	],	2451	],
2185	);	2452	);
2186		2453
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2454	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2514	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2515	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2516
2250	my $h1 = $self->{h} * (1 - $ycut1);	2517	my $h1 = $self->{h} * (1 - $ycut1);
2251	my $h2 = $self->{h} * (1 - $ycut2);	2518	my $h2 = $self->{h} * (1 - $ycut2);
		2519	my $h3 = $self->{h};
		2520
		2521	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252		2522
2253	glEnable GL_BLEND;	2523	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2524	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2525	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2526	glEnable GL_TEXTURE_2D;
…		…
2275		2545
2276	if ($t3) {	2546	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2547	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2548	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2549	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2550	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2551	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2552	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2553	glEnd;
2284	}	2554	}
2285		2555
2286	glDisable GL_BLEND;	2556	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2288	}	2558	}
2289		2559
2290	#############################################################################	2560	#############################################################################
2291		2561
2292	package CFClient::UI::Gauge;	2562	package CFPlus::UI::Gauge;
2293		2563
2294	our @ISA = CFClient::UI::VBox::;	2564	our @ISA = CFPlus::UI::VBox::;
2295		2565
2296	sub new {	2566	sub new {
2297	my ($class, %arg) = @_;	2567	my ($class, %arg) = @_;
2298		2568
2299	my $self = $class->SUPER::new (	2569	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2571	can_hover => 1,
2302	can_events => 1,	2572	can_events => 1,
2303	%arg,	2573	%arg,
2304	);	2574	);
2305		2575
2306	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2576	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2577	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2578	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309		2579
2310	$self	2580	$self
2311	}	2581	}
2312		2582
2313	sub set_fontsize {	2583	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2604	$self->{value}->set_text ($val);
2335	}	2605	}
2336		2606
2337	#############################################################################	2607	#############################################################################
2338		2608
2339	package CFClient::UI::Slider;	2609	package CFPlus::UI::Slider;
2340		2610
2341	use strict;	2611	use strict;
2342		2612
2343	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2344		2614
2345	our @ISA = CFClient::UI::DrawBG::;	2615	our @ISA = CFPlus::UI::DrawBG::;
2346		2616
2347	my @tex =	2617	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2619	qw(s1_slider.png s1_slider_bg.png);
2350		2620
2351	sub new {	2621	sub new {
2352	my $class = shift;	2622	my $class = shift;
2353		2623
…		…
2442	}	2712	}
2443		2713
2444	1	2714	1
2445	}	2715	}
2446		2716
		2717	sub invoke_mouse_wheel {
		2718	my ($self, $ev) = @_;
		2719
		2720	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2721
		2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2723
		2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2725
		2726	! ! $delta
		2727	}
		2728
2447	sub update {	2729	sub update {
2448	my ($self) = @_;	2730	my ($self) = @_;
2449		2731
2450	delete $self->{knob_w};	2732	delete $self->{knob_w};
2451	$self->SUPER::update;	2733	$self->SUPER::update;
…		…
2498	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2499	}	2781	}
2500		2782
2501	#############################################################################	2783	#############################################################################
2502		2784
2503	package CFClient::UI::ValSlider;	2785	package CFPlus::UI::ValSlider;
2504		2786
2505	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFPlus::UI::HBox::;
2506		2788
2507	sub new {	2789	sub new {
2508	my ($class, %arg) = @_;	2790	my ($class, %arg) = @_;
2509		2791
2510	my $range = delete $arg{range};	2792	my $range = delete $arg{range};
2511		2793
2512	my $self = $class->SUPER::new (	2794	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2795	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2796	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	2797	to_value => sub { shift },
2516	from_value => sub { shift },	2798	from_value => sub { shift },
2517	%arg,	2799	%arg,
2518	);	2800	);
2519		2801
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	2821	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	2822	sub set_value { shift->{slider}->set_value (@_) }
2541		2823
2542	#############################################################################	2824	#############################################################################
2543		2825
2544	package CFClient::UI::TextScroller;	2826	package CFPlus::UI::TextScroller;
2545		2827
2546	our @ISA = CFClient::UI::HBox::;	2828	our @ISA = CFPlus::UI::HBox::;
2547		2829
2548	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2549		2831
2550	sub new {	2832	sub new {
2551	my $class = shift;	2833	my $class = shift;
2552		2834
2553	my $self = $class->SUPER::new (	2835	my $self = $class->SUPER::new (
2554	fontsize => 1,	2836	fontsize => 1,
2555	can_events => 0,	2837	can_events => 1,
2556	indent => 0,	2838	indent => 0,
2557	#font => default_font	2839	#font => default_font
2558	@_,	2840	@_,
2559		2841
2560	layout => (new CFClient::Layout 1),	2842	layout => (new CFPlus::Layout),
2561	par => [],	2843	par => [],
		2844	max_par => 0,
2562	height => 0,	2845	height => 0,
2563	children => [	2846	children => [
2564	(new CFClient::UI::Empty expand => 1),	2847	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	2848	(new CFPlus::UI::Slider vertical => 1),
2566	],	2849	],
2567	);	2850	);
2568		2851
2569	$self->{children}[1]->connect (changed => sub { $self->update });	2852	$self->{children}[1]->connect (changed => sub { $self->update });
2570		2853
…		…
2600		2883
2601	$self->reflow;	2884	$self->reflow;
2602		2885
2603	local $self->{children} = [$empty, $slider];	2886	local $self->{children} = [$empty, $slider];
2604	$self->SUPER::invoke_size_allocate ($w, $h)	2887	$self->SUPER::invoke_size_allocate ($w, $h)
		2888	}
		2889
		2890	sub invoke_mouse_wheel {
		2891	my ($self, $ev) = @_;
		2892
		2893	return 0 unless $ev->{dy}; # only vertical movements
		2894
		2895	$self->{children}[1]->emit (mouse_wheel => $ev);
		2896
		2897	1
2605	}	2898	}
2606		2899
2607	sub get_layout {	2900	sub get_layout {
2608	my ($self, $para) = @_;	2901	my ($self, $para) = @_;
2609		2902
…		…
2637		2930
2638	# todo: base offset on lines or so, not on pixels	2931	# todo: base offset on lines or so, not on pixels
2639	$self->{children}[1]->set_value ($offset);	2932	$self->{children}[1]->set_value ($offset);
2640	}	2933	}
2641		2934
		2935	sub current_paragraph {
		2936	my ($self) = @_;
		2937
		2938	$self->{top_paragraph} - 1
		2939	}
		2940
		2941	sub scroll_to {
		2942	my ($self, $para) = @_;
		2943
		2944	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2945
		2946	$self->{scroll_to} = $para;
		2947	$self->update;
		2948	}
		2949
2642	sub clear {	2950	sub clear {
2643	my ($self) = @_;	2951	my ($self) = @_;
2644		2952
2645	my (undef, undef, @other) = @{ $self->{children} };	2953	my (undef, undef, @other) = @{ $self->{children} };
2646	$self->remove ($_) for @other;	2954	$self->remove ($_) for @other;
…		…
2649	$self->{height} = 0;	2957	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2958	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	2959	}
2652		2960
2653	sub add_paragraph {	2961	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	2962	my $self = shift;
2655		2963
2656	my ($text, @w) = ref $para ? @$para : $para;	2964	for my $para (@_) {
2657
2658	$para = {	2965	$para = {
		2966	fg => [1, 1, 1, 1],
		2967	indent => 0,
		2968	markup => "",
		2969	widget => [],
		2970	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	2971	w => 1e10,
2660	wrapped => 1,	2972	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	2973	};
2666		2974
2667	$self->add (@w) if @w;	2975	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	2976	push @{$self->{par}}, $para;
		2977	}
		2978
		2979	if (my $max = $self->{max_par}) {
		2980	shift @{$self->{par}} while @{$self->{par}} > $max;
		2981	}
2669		2982
2670	$self->{need_reflow}++;	2983	$self->{need_reflow}++;
2671	$self->update;	2984	$self->update;
2672	}	2985	}
2673		2986
2674	sub scroll_to_bottom {	2987	sub scroll_to_bottom {
2675	my ($self) = @_;	2988	my ($self) = @_;
2676		2989
2677	$self->{scroll_to_bottom} = 1;	2990	$self->{scroll_to} = $#{$self->{par}};
2678	$self->update;	2991	$self->update;
2679	}	2992	}
2680		2993
		2994	sub force_uptodate {
		2995	my ($self) = @_;
		2996
		2997	if (delete $self->{need_reflow}) {
		2998	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2999
		3000	my $height = 0;
		3001
		3002	for my $para (@{$self->{par}}) {
		3003	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3004	my $layout = $self->get_layout ($para);
		3005	my ($w, $h) = $layout->size;
		3006
		3007	$para->{w} = $w + $para->{indent};
		3008	$para->{h} = $h;
		3009	$para->{wrapped} = $layout->has_wrapped;
		3010	}
		3011
		3012	$para->{y} = $height;
		3013	$height += $para->{h};
		3014	}
		3015
		3016	$self->{height} = $height;
		3017	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3018
		3019	delete $self->{texture};
		3020	}
		3021
		3022	if (my $paridx = delete $self->{scroll_to}) {
		3023	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3024	}
		3025	}
		3026
2681	sub update {	3027	sub update {
2682	my ($self) = @_;	3028	my ($self) = @_;
2683		3029
2684	$self->SUPER::update;	3030	$self->SUPER::update;
2685		3031
2686	return unless $self->{h} > 0;	3032	return unless $self->{h} > 0;
2687		3033
2688	delete $self->{texture};	3034	delete $self->{texture};
2689		3035
2690	$ROOT->on_post_alloc ($self => sub {	3036	$ROOT->on_post_alloc ($self => sub {
		3037	$self->force_uptodate;
		3038
2691	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3039	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692		3040
2693	if (delete $self->{need_reflow}) {
2694	my $height = 0;
2695
2696	for my $para (@{$self->{par}}) {
2697	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698	my $layout = $self->get_layout ($para);
2699	my ($w, $h) = $layout->size;
2700
2701	$para->{w} = $w + $para->{indent};
2702	$para->{h} = $h;
2703	$para->{wrapped} = $layout->has_wrapped;
2704	}
2705
2706	$height += $para->{h};
2707	}
2708
2709	$self->{height} = $height;
2710
2711	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713	delete $self->{texture};
2714	}
2715
2716	if (delete $self->{scroll_to_bottom}) {
2717	$self->{children}[1]->set_value (1e10);
2718	}
2719
2720	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3041	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	3042	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	3043	glClear GL_COLOR_BUFFER_BIT;
2723		3044
		3045	package CFPlus::UI::Base;
		3046	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3047	(0, 0, $self->{w}, $self->{h});
		3048
		3049	my $top = int $self->{children}[1]{range}[0];
		3050
		3051	my $paridx = 0;
		3052	my $top_paragraph;
2724	my $top = int $self->{children}[1]{range}[0];	3053	my $top = int $self->{children}[1]{range}[0];
2725		3054
2726	my $y0 = $top;	3055	my $y0 = $top;
2727	my $y1 = $top + $H;	3056	my $y1 = $top + $H;
2728		3057
2729	my $y = 0;
2730
2731	glEnable GL_BLEND;
2732	#TODO# not correct in windows where rgba is forced off
2733	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735	for my $para (@{$self->{par}}) {	3058	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	3059	my $h = $para->{h};
		3060	my $y = $para->{y};
2737		3061
2738	if ($y0 < $y + $h && $y < $y1) {	3062	if ($y0 < $y + $h && $y < $y1) {
2739
2740	my $layout = $self->get_layout ($para);	3063	my $layout = $self->get_layout ($para);
2741		3064
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	3065	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		3066
2747	if (my @w = @{ $para->{widget} }) {	3067	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	3068	my @s = $layout->get_shapes;
2749		3069
2750	glDisable GL_BLEND;
2751	for (@w) {	3070	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	3071	my ($dx, $dy) = splice @s, 0, 2, ();
2753		3072
2754	$_->{x} = $dx + $para->{indent};	3073	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	3074	$_->{y} = $dy + $y - $y0;
2756		3075
2757	$_->draw;	3076	$_->draw;
2758	}	3077	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	3078	}
2762	}	3079	}
2763		3080
2764	$y += $h;	3081	$paridx++;
		3082	$top_paragraph ||= $paridx if $y >= $top;
2765	}	3083	}
2766		3084
2767	glDisable GL_BLEND;	3085	$self->{top_paragraph} = $top_paragraph;
2768	};	3086	};
2769	});	3087	});
2770	}	3088	}
2771		3089
2772	sub reconfigure {	3090	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	3108	$self->{children}[1]->draw;
2791	}	3109	}
2792		3110
2793	#############################################################################	3111	#############################################################################
2794		3112
2795	package CFClient::UI::Animator;	3113	package CFPlus::UI::Animator;
2796		3114
2797	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2798		3116
2799	our @ISA = CFClient::UI::Bin::;	3117	our @ISA = CFPlus::UI::Bin::;
2800		3118
2801	sub moveto {	3119	sub moveto {
2802	my ($self, $x, $y) = @_;	3120	my ($self, $x, $y) = @_;
2803		3121
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3122	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	3150	glPopMatrix;
2833	}	3151	}
2834		3152
2835	#############################################################################	3153	#############################################################################
2836		3154
2837	package CFClient::UI::Flopper;	3155	package CFPlus::UI::Flopper;
2838		3156
2839	our @ISA = CFClient::UI::Button::;	3157	our @ISA = CFPlus::UI::Button::;
2840		3158
2841	sub new {	3159	sub new {
2842	my $class = shift;	3160	my $class = shift;
2843		3161
2844	my $self = $class->SUPER::new (	3162	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	3174	$self->{other}->toggle_visibility;
2857	}	3175	}
2858		3176
2859	#############################################################################	3177	#############################################################################
2860		3178
2861	package CFClient::UI::Tooltip;	3179	package CFPlus::UI::Tooltip;
2862		3180
2863	our @ISA = CFClient::UI::Bin::;	3181	our @ISA = CFPlus::UI::Bin::;
2864		3182
2865	use CFClient::OpenGL;	3183	use CFPlus::OpenGL;
2866		3184
2867	sub new {	3185	sub new {
2868	my $class = shift;	3186	my $class = shift;
2869		3187
2870	$class->SUPER::new (	3188	$class->SUPER::new (
…		…
2873	)	3191	)
2874	}	3192	}
2875		3193
2876	sub set_tooltip_from {	3194	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	3195	my ($self, $widget) = @_;
		3196
		3197	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3198	if $widget->{tooltip} =~ /^#(.*)$/;
2878		3199
2879	my $tooltip = $widget->{tooltip};	3200	my $tooltip = $widget->{tooltip};
2880		3201
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	3202	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	3203	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	3207	}
2887		3208
2888	$tooltip =~ s/^\n+//;	3209	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	3210	$tooltip =~ s/\n+$//;
2890		3211
2891	$self->add (new CFClient::UI::Label	3212	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	3213	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3214	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3215	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3216	style => 1, # FLAG_INVERSE
2896	ellipsise => 0,	3217	ellipsise => 0,
2897	font => ($widget->{tooltip_font} || $::FONT_PROP),	3218	font => ($widget->{tooltip_font} || $::FONT_PROP),
2898	);	3219	);
2899	}	3220	}
2900		3221
…		…
2919		3240
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3241	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3242	my $widget = $self->{owner}
2922	or return;	3243	or return;
2923		3244
		3245	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3246	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3247
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3248	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3249	if $x + $self->{w} > $self->{root}{w};
2928		3250
2929	$self->move_abs ($x, $y);	3251	$self->move_abs ($x, $y);
		3252	} else {
		3253	$self->hide;
		3254	}
2930	});	3255	});
2931	}	3256	}
2932		3257
2933	sub _draw {	3258	sub _draw {
2934	my ($self) = @_;	3259	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3283	$self->SUPER::_draw;
2959	}	3284	}
2960		3285
2961	#############################################################################	3286	#############################################################################
2962		3287
2963	package CFClient::UI::Face;	3288	package CFPlus::UI::Face;
2964		3289
2965	our @ISA = CFClient::UI::Base::;	3290	our @ISA = CFPlus::UI::DrawBG::;
2966		3291
2967	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
2968		3293
2969	sub new {	3294	sub new {
2970	my $class = shift;	3295	my $class = shift;
2971		3296
2972	my $self = $class->SUPER::new (	3297	my $self = $class->SUPER::new (
…		…
2974	can_events => 0,	3299	can_events => 0,
2975	@_,	3300	@_,
2976	);	3301	);
2977		3302
2978	if ($self->{anim} && $self->{animspeed}) {	3303	if ($self->{anim} && $self->{animspeed}) {
2979	Scalar::Util::weaken (my $widget = $self);	3304	CFPlus::weaken (my $widget = $self);
2980		3305
2981	$self->{timer} = Event->timer (	3306	$self->{timer} = Event->timer (
2982	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983	hard => 1,	3308	hard => 1,
2984	interval => $self->{animspeed},	3309	interval => $self->{animspeed},
…		…
3007	sub _draw {	3332	sub _draw {
3008	my ($self) = @_;	3333	my ($self) = @_;
3009		3334
3010	return unless $::CONN;	3335	return unless $::CONN;
3011		3336
		3337	$self->SUPER::_draw;
		3338
3012	my $face;	3339	my $face;
3013		3340
3014	if ($self->{frame}) {	3341	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];	3342	my $anim = $::CONN->{anim}[$self->{anim}];
3016		3343
…		…
3038	$self->SUPER::destroy;	3365	$self->SUPER::destroy;
3039	}	3366	}
3040		3367
3041	#############################################################################	3368	#############################################################################
3042		3369
3043	package CFClient::UI::Buttonbar;	3370	package CFPlus::UI::Buttonbar;
3044		3371
3045	our @ISA = CFClient::UI::HBox::;	3372	our @ISA = CFPlus::UI::HBox::;
3046		3373
3047	# TODO: should actualyl wrap buttons and other goodies.	3374	# TODO: should actually wrap buttons and other goodies.
3048		3375
3049	#############################################################################	3376	#############################################################################
3050		3377
3051	package CFClient::UI::Menu;	3378	package CFPlus::UI::Menu;
3052		3379
3053	our @ISA = CFClient::UI::FancyFrame::;	3380	our @ISA = CFPlus::UI::Toplevel::;
3054		3381
3055	use CFClient::OpenGL;	3382	use CFPlus::OpenGL;
3056		3383
3057	sub new {	3384	sub new {
3058	my $class = shift;	3385	my $class = shift;
3059		3386
3060	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
3061	items => [],	3388	items => [],
3062	z => 100,	3389	z => 100,
3063	@_,	3390	@_,
3064	);	3391	);
3065		3392
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3393	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3394
3068	for my $item (@{ $self->{items} }) {	3395	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3396	my ($widget, $cb, $tooltip) = @$item;
3070		3397
3071	# handle various types of items, only text for now	3398	# handle various types of items, only text for now
3072	if (!ref $widget) {	3399	if (!ref $widget) {
		3400	if ($widget =~ /\t/) {
		3401	my ($left, $right) = split /\t/, $widget, 2;
		3402
3073	$widget = new CFClient::UI::Label	3403	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3404	can_hover => 1,
3075	can_events => 1,	3405	can_events => 1,
		3406	tooltip => $tooltip,
		3407	children => [
		3408	(new CFPlus::UI::Label markup => $left, expand => 1),
		3409	(new CFPlus::UI::Label markup => $right, align => +1),
		3410	],
		3411	;
		3412
		3413	} else {
		3414	$widget = new CFPlus::UI::Label
		3415	can_hover => 1,
		3416	can_events => 1,
3076	markup => $widget,	3417	markup => $widget,
3077	tooltip => $tooltip	3418	tooltip => $tooltip;
		3419	}
3078	}	3420	}
3079		3421
3080	$self->{item}{$widget} = $item;	3422	$self->{item}{$widget} = $item;
3081		3423
3082	$self->{vbox}->add ($widget);	3424	$self->{vbox}->add ($widget);
…		…
3125	1	3467	1
3126	}	3468	}
3127		3469
3128	#############################################################################	3470	#############################################################################
3129		3471
3130	package CFClient::UI::Multiplexer;	3472	package CFPlus::UI::Multiplexer;
3131		3473
3132	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFPlus::UI::Container::;
3133		3475
3134	sub new {	3476	sub new {
3135	my $class = shift;	3477	my $class = shift;
3136		3478
3137	my $self = $class->SUPER::new (	3479	my $self = $class->SUPER::new (
…		…
3151		3493
3152	$self->{current} = $self->{children}[0]	3494	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3495	if @{ $self->{children} };
3154	}	3496	}
3155		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{current}
		3502	}
		3503
3156	sub set_current_page {	3504	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3505	my ($self, $page_or_widget) = @_;
3158		3506
3159	my $widget = ref $page_or_widget	3507	my $widget = ref $page_or_widget
3160	? $page_or_widget	3508	? $page_or_widget
…		…
3192	$self->{current}->draw;	3540	$self->{current}->draw;
3193	}	3541	}
3194		3542
3195	#############################################################################	3543	#############################################################################
3196		3544
3197	package CFClient::UI::Notebook;	3545	package CFPlus::UI::Notebook;
3198		3546
3199	our @ISA = CFClient::UI::VBox::;	3547	our @ISA = CFPlus::UI::VBox::;
3200		3548
3201	sub new {	3549	sub new {
3202	my $class = shift;	3550	my $class = shift;
3203		3551
3204	my $self = $class->SUPER::new (	3552	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3553	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3555	# filter => # will be put between multiplexer and $self
3208	@_,	3556	@_,
3209	);	3557	);
3210		3558
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3215	}	3563	}
3216		3564
3217	sub add {	3565	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3566	my ($self, $title, $widget, $tooltip) = @_;
3219		3567
3220	Scalar::Util::weaken $self;	3568	CFPlus::weaken $self;
3221		3569
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3571	markup => $title,
3224	tooltip => $tooltip,	3572	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3573	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3574	);
3227		3575
3228	$self->{multiplexer}->add ($widget);	3576	$self->{multiplexer}->add ($widget);
3229	}	3577	}
3230		3578
		3579	sub get_current_page {
		3580	my ($self) = @_;
		3581
		3582	$self->{multiplexer}->get_current_page
		3583	}
		3584
3231	sub set_current_page {	3585	sub set_current_page {
3232	my ($self, $page) = @_;	3586	my ($self, $page) = @_;
3233		3587
3234	$self->{multiplexer}->set_current_page ($page);	3588	$self->{multiplexer}->set_current_page ($page);
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3589	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3590	}
3237		3591
3238	#############################################################################	3592	#############################################################################
3239		3593
3240	package CFClient::UI::Combobox;	3594	package CFPlus::UI::Selector;
3241		3595
3242	use utf8;	3596	use utf8;
3243		3597
3244	our @ISA = CFClient::UI::Button::;	3598	our @ISA = CFPlus::UI::Button::;
3245		3599
3246	sub new {	3600	sub new {
3247	my $class = shift;	3601	my $class = shift;
3248		3602
3249	my $self = $class->SUPER::new (	3603	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3620	my ($value, $title, $tooltip) = @$_;
3267		3621
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3622	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3623	}
3270		3624
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3625	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3626	}
3273		3627
3274	sub _set_value {	3628	sub _set_value {
3275	my ($self, $value) = @_;	3629	my ($self, $value) = @_;
3276		3630
…		…
3291	$self->emit (changed => $value);	3645	$self->emit (changed => $value);
3292	}	3646	}
3293		3647
3294	#############################################################################	3648	#############################################################################
3295		3649
3296	package CFClient::UI::Statusbox;	3650	package CFPlus::UI::Statusbox;
3297		3651
3298	our @ISA = CFClient::UI::VBox::;	3652	our @ISA = CFPlus::UI::VBox::;
3299		3653
3300	sub new {	3654	sub new {
3301	my $class = shift;	3655	my $class = shift;
3302		3656
3303	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3304	fontsize => 0.8,	3658	fontsize => 0.8,
3305	@_,	3659	@_,
3306	);	3660	);
3307		3661
3308	Scalar::Util::weaken (my $this = $self);	3662	CFPlus::weaken (my $this = $self);
3309		3663
3310	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3664	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311		3665
3312	$self	3666	$self
3313	}	3667	}
…		…
3315	sub reorder {	3669	sub reorder {
3316	my ($self) = @_;	3670	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3671	my $NOW = Time::HiRes::time;
3318		3672
3319	# freeze display when hovering over any label	3673	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3674	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3675	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3676	values %{ $self->{item} };
3323		3677
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3678	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3679	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3680	}
…		…
3347	for ($short) {	3701	for ($short) {
3348	s/^\s+//;	3702	s/^\s+//;
3349	s/\s+/ /g;	3703	s/\s+/ /g;
3350	}	3704	}
3351		3705
3352	new CFClient::UI::Label	3706	new CFPlus::UI::Label
3353	markup => $short,	3707	markup => $short,
3354	tooltip => $item->{tooltip},	3708	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3709	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3710	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3711	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3437	}	3791	}
3438		3792
3439	#############################################################################	3793	#############################################################################
3440		3794
3441	package CFClient::UI::Inventory;
3442
3443	our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445	sub new {
3446	my $class = shift;
3447
3448	my $self = $class->SUPER::new (
3449	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450	@_,
3451	);
3452
3453	$self
3454	}
3455
3456	sub set_items {
3457	my ($self, $items) = @_;
3458
3459	$self->{child}->clear;
3460	return unless $items;
3461
3462	my @items = sort {
3463	($a->{type} <=> $b->{type})
3464	or ($a->{name} cmp $b->{name})
3465	} values %$items;
3466
3467	$self->{real_items} = \@items;
3468
3469	my $row = 0;
3470	for my $item (@items) {
3471	CFClient::Item::update_widgets $item;
3472
3473	$self->{child}->add (0, $row, $item->{face_widget});
3474	$self->{child}->add (1, $row, $item->{desc_widget});
3475	$self->{child}->add (2, $row, $item->{weight_widget});
3476
3477	$row++;
3478	}
3479	}
3480
3481	#############################################################################
3482
3483	package CFClient::UI::SpellList;
3484
3485	our @ISA = CFClient::UI::Table::;
3486
3487	sub new {
3488	my $class = shift;
3489
3490	my $self = $class->SUPER::new (
3491	binding => [],
3492	commands => [],
3493	@_,
3494	)
3495	}
3496
3497	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510	sub rebuild_spell_list {
3511	my ($self) = @_;
3512
3513	$CFClient::UI::ROOT->on_refresh ($self => sub {
3514	$self->clear;
3515
3516	return unless $::CONN;
3517
3518	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524	my $row = 0;
3525
3526	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527	my $spell = $self->{spell}{$_};
3528
3529	$row++;
3530
3531	my $spell_cb = sub {
3532	my ($widget, $ev) = @_;
3533
3534	if ($ev->{button} == 1) {
3535	$::CONN->user_send ("cast $spell->{name}");
3536	} elsif ($ev->{button} == 2) {
3537	$::CONN->user_send ("invoke $spell->{name}");
3538	} elsif ($ev->{button} == 3) {
3539	(new CFClient::UI::Menu
3540	items => [
3541	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543	],
3544	)->popup ($ev);
3545	} else {
3546	return 0;
3547	}
3548
3549	1
3550	};
3551
3552	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554	#TODO: add path info to tooltip
3555	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557	$self->add (0, $row, new CFClient::UI::Face
3558	face => $spell->{face},
3559	can_hover => 1,
3560	can_events => 1,
3561	tooltip => $tooltip,
3562	on_button_down => $spell_cb,
3563	);
3564
3565	$self->add (1, $row, new CFClient::UI::Label
3566	expand => 1,
3567	text => $spell->{name},
3568	can_hover => 1,
3569	can_events => 1,
3570	tooltip => $tooltip,
3571	on_button_down => $spell_cb,
3572	);
3573
3574	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578	}
3579	});
3580	}
3581
3582	sub add_spell {
3583	my ($self, $spell) = @_;
3584
3585	$self->{spell}->{$spell->{name}} = $spell;
3586	$self->rebuild_spell_list;
3587	}
3588
3589	sub remove_spell {
3590	my ($self, $spell) = @_;
3591
3592	delete $self->{spell}->{$spell->{name}};
3593	$self->rebuild_spell_list;
3594	}
3595
3596	sub clear_spells {
3597	my ($self) = @_;
3598
3599	$self->{spell} = {};
3600	$self->rebuild_spell_list;
3601	}
3602
3603	#############################################################################
3604
3605	package CFClient::UI::Root;	3795	package CFPlus::UI::Root;
3606		3796
3607	our @ISA = CFClient::UI::Container::;	3797	our @ISA = CFPlus::UI::Container::;
3608		3798
3609	use List::Util qw(min max);	3799	use List::Util qw(min max);
3610		3800
3611	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3612		3802
3613	sub new {	3803	sub new {
3614	my $class = shift;	3804	my $class = shift;
3615		3805
3616	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3617	visible => 1,	3807	visible => 1,
3618	@_,	3808	@_,
3619	);	3809	);
3620		3810
3621	Scalar::Util::weaken ($self->{root} = $self);	3811	CFPlus::weaken ($self->{root} = $self);
3622		3812
3623	$self	3813	$self
3624	}	3814	}
3625		3815
3626	sub size_request {	3816	sub size_request {
…		…
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3982	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		3983
3794	$w = 0 if $w < 0;	3984	$w = 0 if $w < 0;
3795	$h = 0 if $h < 0;	3985	$h = 0 if $h < 0;
3796		3986
		3987	$w = max $widget->{min_w}, $w;
		3988	$h = max $widget->{min_h}, $h;
		3989
		3990	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3991	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3992
		3993	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3994	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3995
3797	$w = int $w + 0.5;	3996	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	3997	$h = int $h + 0.5;
3799		3998
3800	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3999	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801	$widget->{old_w} = $widget->{w};	4000	$widget->{old_w} = $widget->{w};
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4023	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	4024	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	4025	glLoadIdentity;
3827		4026
3828	{	4027	{
3829	package CFClient::UI::Base;	4028	package CFPlus::UI::Base;
3830		4029
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4031	(0, 0, $self->{w}, $self->{h});
3833	}
3834		4032
3835	$self->_draw;	4033	$self->_draw;
		4034	}
3836	}	4035	}
3837		4036
3838	#############################################################################	4037	#############################################################################
3839		4038
3840	package CFClient::UI;	4039	package CFPlus::UI;
3841		4040
3842	$ROOT = new CFClient::UI::Root;	4041	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4042	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4043
3845	1	4044	1
3846		4045

Diff Legend

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