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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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