ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC

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

Diff Legend

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