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.374 by root, Mon Jul 16 12:36:48 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
875	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
876		950
877	sub new {	951	sub new {
878	my $class = shift;	952	my $class = shift;
879		953
880	$class->SUPER::new (	954	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1016	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1018	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1020	}
947	}	1021	}
948		1022
949	sub _render {	1023	sub _render {
950	my ($self) = @_;	1024	my ($self) = @_;
951		1025
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1028
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1030
957	$self->SUPER::_render;	1031	$self->SUPER::_render;
958	}	1032	}
959		1033
960	#############################################################################	1034	#############################################################################
961		1035
962	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
963		1037
964	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
965		1039
966	sub new {	1040	sub new {
967	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
968		1042
969	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
970		1044
971	my $self;	1045	my $self;
972		1046
973	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
974	vertical => 1,	1057	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1059	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1062	},
979	;	1063	;
980		1064
981	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1066	scroll_x => 0,
		1067	scroll_y => 1,
		1068	can_events => 1,
983	slider => $slider,	1069	hslider => $hslider,
		1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
984	%arg,	1073	%arg,
985	);	1074	);
986		1075
		1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add (0, 0, $self->{vp});
		1083
988	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
989		1085
990	$self	1086	$self
991	}	1087	}
		1088
		1089	#TODO# update range on size_allocate depending on child
992		1090
993	sub add {	1091	sub add {
994	my ($self, $widget) = @_;	1092	my ($self, $widget) = @_;
995		1093
996	$self->{vp}->add ($self->{child} = $widget);	1094	$self->{vp}->add ($self->{child} = $widget);
997	}	1095	}
998		1096
		1097	sub invoke_mouse_wheel {
		1098	my ($self, $ev) = @_;
		1099
		1100	return 0 unless $ev->{dy}; # only vertical movements for now
		1101
		1102	$self->{vslider}->emit (mouse_wheel => $ev);
		1103
		1104	1
		1105	}
		1106
		1107	sub update_slider {
		1108	my ($self) = @_;
		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
		1129	}
		1130
999	sub update {	1131	sub update {
1000	my ($self) = @_;	1132	my ($self) = @_;
1001		1133
1002	$self->SUPER::update;	1134	$self->SUPER::update;
1003		1135	$self->update_slider;
1004	# todo: overwrite size_allocate of child
1005	my $child = $self->{vp}->child;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007	}	1136	}
1008		1137
1009	sub invoke_size_allocate {	1138	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1139	my ($self, $w, $h) = @_;
1011		1140
1012	my $child = $self->{vp}->child;	1141	$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)	1142	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1143	}
1017		1144
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1145	#############################################################################
1022		1146
1023	package CFClient::UI::Frame;	1147	package CFPlus::UI::Frame;
1024		1148
1025	our @ISA = CFClient::UI::Bin::;	1149	our @ISA = CFPlus::UI::Bin::;
1026		1150
1027	use CFClient::OpenGL;	1151	use CFPlus::OpenGL;
1028		1152
1029	sub new {	1153	sub new {
1030	my $class = shift;	1154	my $class = shift;
1031		1155
1032	$class->SUPER::new (	1156	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1182	$self->SUPER::_draw;
1059	}	1183	}
1060		1184
1061	#############################################################################	1185	#############################################################################
1062		1186
1063	package CFClient::UI::FancyFrame;	1187	package CFPlus::UI::FancyFrame;
1064		1188
1065	our @ISA = CFClient::UI::Bin::;	1189	our @ISA = CFPlus::UI::Bin::;
1066		1190
1067	use CFClient::OpenGL;	1191	use CFPlus::OpenGL;
		1192
		1193	sub new {
		1194	my ($class, %arg) = @_;
		1195
		1196	if ((exists $arg{label}) && !ref $arg{label}) {
		1197	$arg{label} = new CFPlus::UI::Label
		1198	align => 1,
		1199	valign => 0,
		1200	text => $arg{label},
		1201	fontsize => ($arg{border} || 0.8) * 0.75;
		1202	}
		1203
		1204	my $self = $class->SUPER::new (
		1205	# label => "",
		1206	fg => [0.6, 0.3, 0.1],
		1207	border => 0.8,
		1208	style => 'single',
		1209	%arg,
		1210	);
		1211
		1212	$self
		1213	}
		1214
		1215	sub add {
		1216	my ($self, @widgets) = @_;
		1217
		1218	$self->SUPER::add (@widgets);
		1219	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1220	}
		1221
		1222	sub border {
		1223	int $_[0]{border} * $::FONTSIZE
		1224	}
		1225
		1226	sub size_request {
		1227	my ($self) = @_;
		1228
		1229	($self->{label_w}, undef) = $self->{label}->size_request
		1230	if $self->{label};
		1231
		1232	my ($w, $h) = $self->SUPER::size_request;
		1233
		1234	(
		1235	$w + $self->border * 2,
		1236	$h + $self->border * 2,
		1237	)
		1238	}
		1239
		1240	sub invoke_size_allocate {
		1241	my ($self, $w, $h) = @_;
		1242
		1243	my $border = $self->border;
		1244
		1245	$w -= List::Util::max 0, $border * 2;
		1246	$h -= List::Util::max 0, $border * 2;
		1247
		1248	if (my $label = $self->{label}) {
		1249	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1250	$label->{h} = List::Util::min $h, $border;
		1251	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1252	}
		1253
		1254	$self->child->configure ($border, $border, $w, $h);
		1255
		1256	1
		1257	}
		1258
		1259	sub _draw {
		1260	my ($self) = @_;
		1261
		1262	my $child = $self->{children}[0];
		1263
		1264	my $border = $self->border;
		1265	my ($w, $h) = ($self->{w}, $self->{h});
		1266
		1267	$child->draw;
		1268
		1269	glColor @{$self->{fg}};
		1270	glBegin GL_LINE_STRIP;
		1271	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1272	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1273	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1274	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1275	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1276	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1277	glEnd;
		1278
		1279	if ($self->{label}) {
		1280	glTranslate $border * 2, 0;
		1281	$self->{label}->_draw;
		1282	}
		1283	}
		1284
		1285	#############################################################################
		1286
		1287	package CFPlus::UI::Toplevel;
		1288
		1289	our @ISA = CFPlus::UI::Bin::;
		1290
		1291	use CFPlus::OpenGL;
1068		1292
1069	my $bg =	1293	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1294	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1295	mipmap => 1, wrap => 1;
1072		1296
1073	my @border =	1297	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1298	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);	1299	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1300
1077	sub new {	1301	sub new {
1078	my ($class, %arg) = @_;	1302	my ($class, %arg) = @_;
1079		1303
1080	my $self = $class->SUPER::new (	1304	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1305	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1306	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1307	border => 0.6,
1084	can_events => 1,	1308	can_events => 1,
1085	min_w => 16,	1309	min_w => 64,
1086	min_h => 16,	1310	min_h => 32,
1087	%arg,	1311	%arg,
1088	);	1312	);
1089		1313
1090	$self->{title_widget} = new CFClient::UI::Label	1314	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1315	align => 0,
1092	valign => 1,	1316	valign => 1,
1093	text => $self->{title},	1317	text => $self->{title},
1094	fontsize => $self->{border},	1318	fontsize => $self->{border},
1095	if exists $self->{title};	1319	if exists $self->{title};
1096		1320
1097	if ($self->{has_close_button}) {	1321	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1322	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1323	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1324	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1325	on_activate => sub { $self->emit ("delete") };
1102		1326
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1327	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1328	}
1105		1329
1106	$self	1330	$self
1107	}	1331	}
1108		1332
1109	sub add {	1333	sub add {
1110	my ($self, @widgets) = @_;	1334	my ($self, @widgets) = @_;
1111		1335
1112	$self->SUPER::add (@widgets);	1336	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1337	$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};	1338	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1339	}
1116		1340
1117	sub border {	1341	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1342	int $_[0]{border} * $::FONTSIZE
1119	}	1343	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1376	$self->child->configure ($border, $border, $w, $h);
1153		1377
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1378	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1379	if $self->{close_button};
1156		1380
		1381	1
		1382	}
		1383
		1384	sub invoke_delete {
		1385	my ($self) = @_;
		1386
		1387	$self->hide;
		1388
1157	1	1389	1
1158	}	1390	}
1159		1391
1160	sub invoke_button_down {	1392	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1393	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1451	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1452
1221	! ! $self->{motion}	1453	! ! $self->{motion}
1222	}	1454	}
1223		1455
		1456	sub invoke_visibility_change {
		1457	my ($self, $visible) = @_;
		1458
		1459	delete $self->{motion} unless $visible;
		1460
		1461	0
		1462	}
		1463
1224	sub _draw {	1464	sub _draw {
1225	my ($self) = @_;	1465	my ($self) = @_;
1226		1466
1227	my $child = $self->{children}[0];	1467	my $child = $self->{children}[0];
1228		1468
…		…
1265	if $self->{close_button};	1505	if $self->{close_button};
1266	}	1506	}
1267		1507
1268	#############################################################################	1508	#############################################################################
1269		1509
1270	package CFClient::UI::Table;	1510	package CFPlus::UI::Table;
1271		1511
1272	our @ISA = CFClient::UI::Base::;	1512	our @ISA = CFPlus::UI::Base::;
1273		1513
1274	use List::Util qw(max sum);	1514	use List::Util qw(max sum);
1275		1515
1276	use CFClient::OpenGL;	1516	use CFPlus::OpenGL;
1277		1517
1278	sub new {	1518	sub new {
1279	my $class = shift;	1519	my $class = shift;
1280		1520
1281	$class->SUPER::new (	1521	$class->SUPER::new (
		1522	children => [],
1282	col_expand => [],	1523	col_expand => [],
		1524	row_expand => [],
1283	@_,	1525	@_,
1284	)	1526	)
1285	}	1527	}
1286		1528
1287	sub children {	1529	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1530	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1531	}
1290		1532
		1533	# TODO: store row/col info in child widget and use standard add/del
1291	sub add {	1534	sub add {
1292	my ($self, $x, $y, $child) = @_;	1535	my ($self) = shift;
1293		1536
		1537	while (@_) {
		1538	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1539	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1540	$self->{children}[$y][$x] = $child;
		1541	}
1296		1542
		1543	$self->{force_realloc} = 1;
		1544	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1545	$self->realloc;
1298	}	1546	}
1299		1547
1300	sub remove {	1548	sub remove {
1301	my ($self, $child) = @_;	1549	my ($self, $child) = @_;
1302		1550
1303	# TODO: not yet implemented	1551	for (@{ $self->{children} }) {
		1552	for (@{ $_ || [] }) {
		1553	$_ = undef if $_ == $child;
		1554	}
		1555	}
1304	}	1556	}
1305		1557
1306	# TODO: move to container class maybe? send children a signal on removal?	1558	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {	1559	sub clear {
1308	my ($self) = @_;	1560	my ($self) = @_;
…		…
1357	my ($ws, $hs) = $self->get_wh;	1609	my ($ws, $hs) = $self->get_wh;
1358		1610
1359	my $req_w = (sum @$ws) || 1;	1611	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1612	my $req_h = (sum @$hs) || 1;
1361		1613
1362	# TODO: nicer code && do row_expand	1614	# TODO: nicer code
1363	my @col_expand = @{$self->{col_expand}};	1615	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1616	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1617	my $col_expand = (sum @col_expand) || 1;
1366		1618
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1619	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1620
1371	CFClient::UI::harmonize $ws;	1621	CFPlus::UI::harmonize $ws;
		1622
		1623	my @row_expand = @{$self->{row_expand}};
		1624	@row_expand = (1) x @$ws unless @row_expand;
		1625	my $row_expand = (sum @row_expand) || 1;
		1626
		1627	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1628
1372	CFClient::UI::harmonize $hs;	1629	CFPlus::UI::harmonize $hs;
1373		1630
1374	my $y;	1631	my $y;
1375		1632
1376	for my $r (0 .. $#{$self->{children}}) {	1633	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1634	my $row = $self->{children}[$r]
…		…
1420	}	1677	}
1421	}	1678	}
1422		1679
1423	#############################################################################	1680	#############################################################################
1424		1681
1425	package CFClient::UI::Box;	1682	package CFPlus::UI::Fixed;
1426		1683
		1684	use List::Util qw(min max);
		1685
1427	our @ISA = CFClient::UI::Container::;	1686	our @ISA = CFPlus::UI::Container::;
		1687
		1688	sub add {
		1689	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1690
		1691	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1692	$self->SUPER::add ($child);
		1693	}
		1694
		1695	sub _scale($$$) {
		1696	my ($mode, $val, $max) = @_;
		1697
		1698	$mode eq "abs" ? $val
		1699	: $mode eq "rel" ? $val * $max
		1700	: 0
		1701	}
		1702
		1703	sub size_request {
		1704	my ($self) = @_;
		1705
		1706	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1707
		1708	# determine overall size by querying abs widgets
		1709	for my $child ($self->visible_children) {
		1710	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1711
		1712	if ($pos eq "abs") {
		1713	$w = _scale $size, $w, $child->{req_w};
		1714	$h = _scale $size, $h, $child->{req_h};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1718	}
		1719	}
		1720
		1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1727
		1728	if ($pos ne "abs") {
		1729	$x = _scale $pos, $x, $W;
		1730	$y = _scale $pos, $x, $H;
		1731	$w = _scale $size, $w, $child->{req_w};
		1732	$h = _scale $size, $h, $child->{req_h};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	$x = _scale $pos, $x, $W;
		1752	$y = _scale $pos, $x, $H;
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$child->configure ($x, $y, $w, $h);
		1757	}
		1758
		1759	1
		1760	}
		1761
		1762	#############################################################################
		1763
		1764	package CFPlus::UI::Box;
		1765
		1766	our @ISA = CFPlus::UI::Container::;
1428		1767
1429	sub size_request {	1768	sub size_request {
1430	my ($self) = @_;	1769	my ($self) = @_;
1431		1770
1432	$self->{vertical}	1771	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1804	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1805	for 0 .. $#children;
1467	}	1806	}
1468	}	1807	}
1469		1808
1470	CFClient::UI::harmonize \@req;	1809	CFPlus::UI::harmonize \@req;
1471		1810
1472	my $pos = 0;	1811	my $pos = 0;
1473	for (0 .. $#children) {	1812	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1813	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1814	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1819	1
1481	}	1820	}
1482		1821
1483	#############################################################################	1822	#############################################################################
1484		1823
1485	package CFClient::UI::HBox;	1824	package CFPlus::UI::HBox;
1486		1825
1487	our @ISA = CFClient::UI::Box::;	1826	our @ISA = CFPlus::UI::Box::;
1488		1827
1489	sub new {	1828	sub new {
1490	my $class = shift;	1829	my $class = shift;
1491		1830
1492	$class->SUPER::new (	1831	$class->SUPER::new (
…		…
1495	)	1834	)
1496	}	1835	}
1497		1836
1498	#############################################################################	1837	#############################################################################
1499		1838
1500	package CFClient::UI::VBox;	1839	package CFPlus::UI::VBox;
1501		1840
1502	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1503		1842
1504	sub new {	1843	sub new {
1505	my $class = shift;	1844	my $class = shift;
1506		1845
1507	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1510	)	1849	)
1511	}	1850	}
1512		1851
1513	#############################################################################	1852	#############################################################################
1514		1853
1515	package CFClient::UI::Label;	1854	package CFPlus::UI::Label;
1516		1855
1517	our @ISA = CFClient::UI::DrawBG::;	1856	our @ISA = CFPlus::UI::DrawBG::;
1518		1857
1519	use CFClient::OpenGL;	1858	use CFPlus::OpenGL;
1520		1859
1521	sub new {	1860	sub new {
1522	my ($class, %arg) = @_;	1861	my ($class, %arg) = @_;
1523		1862
1524	my $self = $class->SUPER::new (	1863	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1866	#active_bg => none
1528	#font => default_font	1867	#font => default_font
1529	#text => initial text	1868	#text => initial text
1530	#markup => initial narkup	1869	#markup => initial narkup
1531	#max_w => maximum pixel width	1870	#max_w => maximum pixel width
		1871	#style => 0, # render flags
1532	ellipsise => 3, # end	1872	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1873	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1874	fontsize => 1,
1535	align => -1,	1875	align => -1,
1536	valign => -1,	1876	valign => -1,
1537	padding_x => 2,	1877	padding_x => 2,
1538	padding_y => 2,	1878	padding_y => 2,
1539	can_events => 0,	1879	can_events => 0,
1540	%arg	1880	%arg
1541	);	1881	);
1542		1882
1543	if (exists $self->{template}) {	1883	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1884	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1885	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1886	$self->{template} = $layout;
1547	}	1887	}
1548		1888
1549	if (exists $self->{markup}) {	1889	if (exists $self->{markup}) {
…		…
1553	}	1893	}
1554		1894
1555	$self	1895	$self
1556	}	1896	}
1557		1897
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 {	1898	sub update {
1569	my ($self) = @_;	1899	my ($self) = @_;
1570		1900
1571	delete $self->{texture};	1901	delete $self->{texture};
1572	$self->SUPER::update;	1902	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1913	my ($self, $text) = @_;
1584		1914
1585	return if $self->{text} eq "T$text";	1915	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1916	$self->{text} = "T$text";
1587		1917
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1918	$self->{layout}->set_text ($text);
1590		1919
1591	delete $self->{size_req};	1920	delete $self->{size_req};
1592	$self->realloc;	1921	$self->realloc;
1593	$self->update;	1922	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1928	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1929	$self->{text} = "M$markup";
1601		1930
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1931	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1932
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1933	$self->{layout}->set_markup ($markup);
1606		1934
1607	delete $self->{size_req};	1935	delete $self->{size_req};
1608	$self->realloc;	1936	$self->realloc;
1609	$self->update;	1937	$self->update;
…		…
1621		1949
1622	my ($w, $h) = $self->{layout}->size;	1950	my ($w, $h) = $self->{layout}->size;
1623		1951
1624	if (exists $self->{template}) {	1952	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1953	$self->{template}->set_font ($self->{font}) if $self->{font};
		1954	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1955	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1956
1628	my ($w2, $h2) = $self->{template}->size;	1957	my ($w2, $h2) = $self->{template}->size;
1629		1958
1630	$w = List::Util::max $w, $w2;	1959	$w = List::Util::max $w, $w2;
…		…
1654		1983
1655	sub set_fontsize {	1984	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1985	my ($self, $fontsize) = @_;
1657		1986
1658	$self->{fontsize} = $fontsize;	1987	$self->{fontsize} = $fontsize;
		1988	delete $self->{size_req};
1659	delete $self->{texture};	1989	delete $self->{texture};
1660		1990
1661	$self->realloc;	1991	$self->realloc;
1662	}	1992	}
1663		1993
1664	sub reconfigure {	1994	sub reconfigure {
1665	my ($self) = @_;	1995	my ($self) = @_;
1666		1996
1667	delete $self->{size_req};	1997	delete $self->{size_req};
		1998	delete $self->{texture};
1668		1999
1669	$self->SUPER::reconfigure;	2000	$self->SUPER::reconfigure;
1670	}	2001	}
1671		2002
1672	sub _draw {	2003	sub _draw {
1673	my ($self) = @_;	2004	my ($self) = @_;
1674		2005
1675	$self->SUPER::_draw; # draw background, if applicable	2006	$self->SUPER::_draw; # draw background, if applicable
1676		2007
1677	my $tex = $self->{texture} ||= do {	2008	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2009	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2010	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2011	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2012	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2013	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2014	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2015
1685	new_from_layout CFClient::Texture $self->{layout}	2016	[$self->{layout}->size]
1686	};	2017	};
1687		2018
1688	unless (exists $self->{ox}) {	2019	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2020	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2021	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2022	: ($self->{w} - $size->[0]) * 0.5);
1692		2023
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2024	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2025	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2026	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2027	};
1697		2028
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2029	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2030	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		2031
1703	if ($tex->{format} == GL_ALPHA) {	2032	$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	}	2033	}
1714		2034
1715	#############################################################################	2035	#############################################################################
1716		2036
1717	package CFClient::UI::EntryBase;	2037	package CFPlus::UI::EntryBase;
1718		2038
1719	our @ISA = CFClient::UI::Label::;	2039	our @ISA = CFPlus::UI::Label::;
1720		2040
1721	use CFClient::OpenGL;	2041	use CFPlus::OpenGL;
1722		2042
1723	sub new {	2043	sub new {
1724	my $class = shift;	2044	my $class = shift;
1725		2045
1726	$class->SUPER::new (	2046	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2050	active_fg => [0, 0, 0],
1731	can_hover => 1,	2051	can_hover => 1,
1732	can_focus => 1,	2052	can_focus => 1,
1733	valign => 0,	2053	valign => 0,
1734	can_events => 1,	2054	can_events => 1,
		2055	ellipsise => 0,
1735	#text => ...	2056	#text => ...
1736	#hidden => "*",	2057	#hidden => "*",
1737	@_	2058	@_
1738	)	2059	)
1739	}	2060	}
…		…
1784	my $sym = $ev->{sym};	2105	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2106	my $uni = $ev->{unicode};
1786		2107
1787	my $text = $self->get_text;	2108	my $text = $self->get_text;
1788		2109
		2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2111
1789	if ($uni == 8) {	2112	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2114	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2115	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2116	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2117	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2119	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2120	} elsif ($sym == CFPlus::SDLK_HOME) {
		2121	# what a hack
		2122	$self->{cursor} =
		2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2124	? length $1
		2125	: 0;
		2126	} elsif ($sym == CFPlus::SDLK_END) {
		2127	# uh, again
		2128	$self->{cursor} =
		2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2130	? $self->{cursor} + length $1
		2131	: length $self->{text};
		2132	} elsif ($uni == 21) { # ctrl-u
		2133	$text = "";
1798	$self->{cursor} = 0;	2134	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2135	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2136	$self->emit ('escape');
1803	} elsif ($uni) {	2137	} elsif ($uni == 0x0d) {
		2138	substr $text, $self->{cursor}++, 0, "\012";
		2139	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2140	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2141	} else {
1806	return 0;	2142	return 0;
1807	}	2143	}
1808		2144
1809	$self->_set_text ($text);	2145	$self->_set_text ($text);
1810		2146
1811	$self->realloc;	2147	$self->realloc;
		2148	$self->update;
1812		2149
1813	1	2150	1
1814	}	2151	}
1815		2152
1816	sub invoke_focus_in {	2153	sub invoke_focus_in {
…		…
1828		2165
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2166	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2167
1831	# byte-index to char-index	2168	# byte-index to char-index
1832	my $text = $self->{text};	2169	my $text = $self->{text};
1833	utf8::encode $text;	2170	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2171	$self->{cursor} = length $text;
1835		2172
1836	$self->_set_text ($self->{text});	2173	$self->_set_text ($self->{text});
1837	$self->update;	2174	$self->update;
1838		2175
1839	1	2176	1
…		…
1878	utf8::encode $text;	2215	utf8::encode $text;
1879		2216
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2218	}
1882		2219
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2220	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2221	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};	2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2223	glEnd;
1888	}	2224	}
1889	}	2225	}
1890		2226
		2227	#############################################################################
		2228
1891	package CFClient::UI::Entry;	2229	package CFPlus::UI::Entry;
1892		2230
1893	our @ISA = CFClient::UI::EntryBase::;	2231	our @ISA = CFPlus::UI::EntryBase::;
1894		2232
1895	use CFClient::OpenGL;	2233	use CFPlus::OpenGL;
1896		2234
1897	sub invoke_key_down {	2235	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2236	my ($self, $ev) = @_;
1899		2237
1900	my $sym = $ev->{sym};	2238	my $sym = $ev->{sym};
1901		2239
1902	if ($sym == 13) {	2240	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2241	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2242	my $txt = $self->get_text;
1905		2243
1906	$self->{history_pointer} = -1;	2244	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2245	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2246	$self->emit (activate => $txt);
1909	$self->update;	2247	$self->update;
1910		2248
1911	} elsif ($sym == CFClient::SDLK_UP) {	2249	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2250	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2251	$self->{history_saveback} = $self->get_text;
1914	}	2252	}
1915	if (@{$self->{history} || []} > 0) {	2253	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2254	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2256	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2257	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2259	}
1922		2260
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2261	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2262	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2264
1927	if ($self->{history_pointer} >= 0) {	2265	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2275	1
1938	}	2276	}
1939		2277
1940	#############################################################################	2278	#############################################################################
1941		2279
		2280	package CFPlus::UI::TextEdit;
		2281
		2282	our @ISA = CFPlus::UI::EntryBase::;
		2283
		2284	use CFPlus::OpenGL;
		2285
		2286	sub move_cursor_ver {
		2287	my ($self, $dy) = @_;
		2288
		2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2290
		2291	$y += $dy;
		2292
		2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2294	$self->{cursor} = $index;
		2295	delete $self->{cur_h};
		2296	$self->update;
		2297	return;
		2298	}
		2299	}
		2300
		2301	sub invoke_key_down {
		2302	my ($self, $ev) = @_;
		2303
		2304	my $sym = $ev->{sym};
		2305
		2306	if ($sym == CFPlus::SDLK_UP) {
		2307	$self->move_cursor_ver (-1);
		2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2309	$self->move_cursor_ver (+1);
		2310	} else {
		2311	return $self->SUPER::invoke_key_down ($ev)
		2312	}
		2313
		2314	1
		2315	}
		2316
		2317	#############################################################################
		2318
1942	package CFClient::UI::Button;	2319	package CFPlus::UI::Button;
1943		2320
1944	our @ISA = CFClient::UI::Label::;	2321	our @ISA = CFPlus::UI::Label::;
1945		2322
1946	use CFClient::OpenGL;	2323	use CFPlus::OpenGL;
1947		2324
1948	my @tex =	2325	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2327	qw(b1_button_active.png);
1951		2328
1952	sub new {	2329	sub new {
1953	my $class = shift;	2330	my $class = shift;
1954		2331
…		…
1991	$self->SUPER::_draw;	2368	$self->SUPER::_draw;
1992	}	2369	}
1993		2370
1994	#############################################################################	2371	#############################################################################
1995		2372
		2373	package CFPlus::UI::CheckBox;
		2374
		2375	our @ISA = CFPlus::UI::DrawBG::;
		2376
		2377	my @tex =
		2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2379	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2380
		2381	use CFPlus::OpenGL;
		2382
		2383	sub new {
		2384	my $class = shift;
		2385
		2386	$class->SUPER::new (
		2387	padding_x => 2,
		2388	padding_y => 2,
		2389	fg => [1, 1, 1],
		2390	active_fg => [1, 1, 0],
		2391	bg => [0, 0, 0, 0.2],
		2392	active_bg => [1, 1, 1, 0.5],
		2393	state => 0,
		2394	can_hover => 1,
		2395	@_
		2396	)
		2397	}
		2398
		2399	sub size_request {
		2400	my ($self) = @_;
		2401
		2402	(6) x 2
		2403	}
		2404
		2405	sub toggle {
		2406	my ($self) = @_;
		2407
		2408	$self->{state} = !$self->{state};
		2409	$self->emit (changed => $self->{state});
		2410	$self->update;
		2411	}
		2412
		2413	sub invoke_button_down {
		2414	my ($self, $ev, $x, $y) = @_;
		2415
		2416	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2417	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2418	$self->toggle;
		2419	} else {
		2420	return 0
		2421	}
		2422
		2423	1
		2424	}
		2425
		2426	sub _draw {
		2427	my ($self) = @_;
		2428
		2429	$self->SUPER::_draw;
		2430
		2431	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2432
		2433	my ($w, $h) = @$self{qw(w h)};
		2434
		2435	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2436
		2437	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2438
		2439	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2440
		2441	glEnable GL_TEXTURE_2D;
		2442	$tex->draw_quad_alpha (0, 0, $s, $s);
		2443	glDisable GL_TEXTURE_2D;
		2444	}
		2445
		2446	#############################################################################
		2447
		2448	package CFPlus::UI::Image;
		2449
		2450	our @ISA = CFPlus::UI::Base::;
		2451
		2452	use CFPlus::OpenGL;
		2453
		2454	our %texture_cache;
		2455
		2456	sub new {
		2457	my $class = shift;
		2458
		2459	my $self = $class->SUPER::new (
		2460	can_events => 0,
		2461	@_,
		2462	);
		2463
		2464	$self->{path} || $self->{tex}
		2465	or Carp::croak "'path' or 'tex' attributes required";
		2466
		2467	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2468	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2469
		2470	CFPlus::weaken $texture_cache{$self->{path}};
		2471
		2472	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2473
		2474	$self
		2475	}
		2476
		2477	sub STORABLE_freeze {
		2478	my ($self, $cloning) = @_;
		2479
		2480	$self->{path}
		2481	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2482
		2483	$self->{path}
		2484	}
		2485
		2486	sub STORABLE_attach {
		2487	my ($self, $cloning, $path) = @_;
		2488
		2489	$self->new (path => $path)
		2490	}
		2491
		2492	sub size_request {
		2493	my ($self) = @_;
		2494
		2495	($self->{tex}{w}, $self->{tex}{h})
		2496	}
		2497
		2498	sub _draw {
		2499	my ($self) = @_;
		2500
		2501	my $tex = $self->{tex};
		2502
		2503	my ($w, $h) = ($self->{w}, $self->{h});
		2504
		2505	if ($self->{rot90}) {
		2506	glRotate 90, 0, 0, 1;
		2507	glTranslate 0, -$self->{w}, 0;
		2508
		2509	($w, $h) = ($h, $w);
		2510	}
		2511
		2512	glEnable GL_TEXTURE_2D;
		2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2514
		2515	$tex->draw_quad (0, 0, $w, $h);
		2516
		2517	glDisable GL_TEXTURE_2D;
		2518	}
		2519
		2520	#############################################################################
		2521
1996	package CFClient::UI::ImageButton;	2522	package CFPlus::UI::ImageButton;
1997		2523
1998	our @ISA = CFClient::UI::Image::;	2524	our @ISA = CFPlus::UI::Image::;
1999		2525
2000	use CFClient::OpenGL;	2526	use CFPlus::OpenGL;
2001		2527
2002	my %textures;	2528	my %textures;
2003		2529
2004	sub new {	2530	sub new {
2005	my $class = shift;	2531	my $class = shift;
…		…
2027	1	2553	1
2028	}	2554	}
2029		2555
2030	#############################################################################	2556	#############################################################################
2031		2557
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;	2558	package CFPlus::UI::VGauge;
2101		2559
2102	our @ISA = CFClient::UI::Base::;	2560	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		2561
2163	use List::Util qw(min max);	2562	use List::Util qw(min max);
2164		2563
2165	use CFClient::OpenGL;	2564	use CFPlus::OpenGL;
2166		2565
2167	my %tex = (	2566	my %tex = (
2168	food => [	2567	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2568	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2569	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2570	],
2172	grace => [	2571	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2572	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/	2573	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2574	],
2176	hp => [	2575	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2576	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2577	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2578	],
2180	mana => [	2579	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2580	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/	2581	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2582	],
2184	);	2583	);
2185		2584
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2585	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2645	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2646	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2647
2249	my $h1 = $self->{h} * (1 - $ycut1);	2648	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2649	my $h2 = $self->{h} * (1 - $ycut2);
		2650	my $h3 = $self->{h};
		2651
		2652	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2653
2252	glEnable GL_BLEND;	2654	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2655	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2656	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2657	glEnable GL_TEXTURE_2D;
…		…
2274		2676
2275	if ($t3) {	2677	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2678	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2679	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2680	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2681	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2682	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2683	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2684	glEnd;
2283	}	2685	}
2284		2686
2285	glDisable GL_BLEND;	2687	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2688	glDisable GL_TEXTURE_2D;
2287	}	2689	}
2288		2690
2289	#############################################################################	2691	#############################################################################
2290		2692
2291	package CFClient::UI::Gauge;	2693	package CFPlus::UI::Gauge;
2292		2694
2293	our @ISA = CFClient::UI::VBox::;	2695	our @ISA = CFPlus::UI::VBox::;
2294		2696
2295	sub new {	2697	sub new {
2296	my ($class, %arg) = @_;	2698	my ($class, %arg) = @_;
2297		2699
2298	my $self = $class->SUPER::new (	2700	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2702	can_hover => 1,
2301	can_events => 1,	2703	can_events => 1,
2302	%arg,	2704	%arg,
2303	);	2705	);
2304		2706
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2707	$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);	2708	$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");	2709	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2710
2309	$self	2711	$self
2310	}	2712	}
2311		2713
2312	sub set_fontsize {	2714	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2735	$self->{value}->set_text ($val);
2334	}	2736	}
2335		2737
2336	#############################################################################	2738	#############################################################################
2337		2739
2338	package CFClient::UI::Slider;	2740	package CFPlus::UI::Slider;
2339		2741
2340	use strict;	2742	use strict;
2341		2743
2342	use CFClient::OpenGL;	2744	use CFPlus::OpenGL;
2343		2745
2344	our @ISA = CFClient::UI::DrawBG::;	2746	our @ISA = CFPlus::UI::DrawBG::;
2345		2747
2346	my @tex =	2748	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2749	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2750	qw(s1_slider.png s1_slider_bg.png);
2349		2751
2350	sub new {	2752	sub new {
2351	my $class = shift;	2753	my $class = shift;
2352		2754
…		…
2441	}	2843	}
2442		2844
2443	1	2845	1
2444	}	2846	}
2445		2847
		2848	sub invoke_mouse_wheel {
		2849	my ($self, $ev) = @_;
		2850
		2851	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2852
		2853	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2854
		2855	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2856
		2857	! ! $delta
		2858	}
		2859
2446	sub update {	2860	sub update {
2447	my ($self) = @_;	2861	my ($self) = @_;
2448		2862
2449	delete $self->{knob_w};	2863	delete $self->{knob_w};
2450	$self->SUPER::update;	2864	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2911	glDisable GL_TEXTURE_2D;
2498	}	2912	}
2499		2913
2500	#############################################################################	2914	#############################################################################
2501		2915
2502	package CFClient::UI::ValSlider;	2916	package CFPlus::UI::ValSlider;
2503		2917
2504	our @ISA = CFClient::UI::HBox::;	2918	our @ISA = CFPlus::UI::HBox::;
2505		2919
2506	sub new {	2920	sub new {
2507	my ($class, %arg) = @_;	2921	my ($class, %arg) = @_;
2508		2922
2509	my $range = delete $arg{range};	2923	my $range = delete $arg{range};
2510		2924
2511	my $self = $class->SUPER::new (	2925	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2926	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2927	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2928	to_value => sub { shift },
2515	from_value => sub { shift },	2929	from_value => sub { shift },
2516	%arg,	2930	%arg,
2517	);	2931	);
2518		2932
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2952	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2953	sub set_value { shift->{slider}->set_value (@_) }
2540		2954
2541	#############################################################################	2955	#############################################################################
2542		2956
2543	package CFClient::UI::TextScroller;	2957	package CFPlus::UI::TextScroller;
2544		2958
2545	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2546		2960
2547	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2548		2962
2549	sub new {	2963	sub new {
2550	my $class = shift;	2964	my $class = shift;
2551		2965
2552	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2553	fontsize => 1,	2967	fontsize => 1,
2554	can_events => 0,	2968	can_events => 1,
2555	indent => 0,	2969	indent => 0,
2556	#font => default_font	2970	#font => default_font
2557	@_,	2971	@_,
2558		2972
2559	layout => (new CFClient::Layout 1),	2973	layout => (new CFPlus::Layout),
2560	par => [],	2974	par => [],
		2975	max_par => 0,
2561	height => 0,	2976	height => 0,
2562	children => [	2977	children => [
2563	(new CFClient::UI::Empty expand => 1),	2978	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2979	(new CFPlus::UI::Slider vertical => 1),
2565	],	2980	],
2566	);	2981	);
2567		2982
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2983	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2984
…		…
2575		2990
2576	$self->{fontsize} = $fontsize;	2991	$self->{fontsize} = $fontsize;
2577	$self->reflow;	2992	$self->reflow;
2578	}	2993	}
2579		2994
2580	sub visible_children {	2995	sub size_request {
2581	my ($self) = @_;	2996	my ($self) = @_;
2582		2997
2583	@{$self->{children}}[0,1]	2998	my ($empty, $slider) = @{ $self->{children} };
		2999
		3000	local $self->{children} = [$empty, $slider];
		3001	$self->SUPER::size_request
2584	}	3002	}
2585		3003
2586	sub invoke_size_allocate {	3004	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	3005	my ($self, $w, $h) = @_;
2588		3006
…		…
2594	$self->{layout}->set_width ($empty->{w});	3012	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3013	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		3014
2597	$self->reflow;	3015	$self->reflow;
2598		3016
		3017	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	3018	$self->SUPER::invoke_size_allocate ($w, $h)
		3019	}
		3020
		3021	sub invoke_mouse_wheel {
		3022	my ($self, $ev) = @_;
		3023
		3024	return 0 unless $ev->{dy}; # only vertical movements
		3025
		3026	$self->{children}[1]->emit (mouse_wheel => $ev);
		3027
		3028	1
2600	}	3029	}
2601		3030
2602	sub get_layout {	3031	sub get_layout {
2603	my ($self, $para) = @_;	3032	my ($self, $para) = @_;
2604		3033
…		…
2632		3061
2633	# todo: base offset on lines or so, not on pixels	3062	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	3063	$self->{children}[1]->set_value ($offset);
2635	}	3064	}
2636		3065
		3066	sub current_paragraph {
		3067	my ($self) = @_;
		3068
		3069	$self->{top_paragraph} - 1
		3070	}
		3071
		3072	sub scroll_to {
		3073	my ($self, $para) = @_;
		3074
		3075	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3076
		3077	$self->{scroll_to} = $para;
		3078	$self->update;
		3079	}
		3080
2637	sub clear {	3081	sub clear {
2638	my ($self) = @_;	3082	my ($self) = @_;
2639		3083
2640	my (undef, undef, @other) = @{ $self->{children} };	3084	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	3085	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	3088	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3089	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	3090	}
2647		3091
2648	sub add_paragraph {	3092	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	3093	my $self = shift;
2650		3094
2651	my ($text, @w) = ref $para ? @$para : $para;	3095	for my $para (@_) {
2652
2653	$para = {	3096	$para = {
		3097	fg => [1, 1, 1, 1],
		3098	indent => 0,
		3099	markup => "",
		3100	widget => [],
		3101	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	3102	w => 1e10,
2655	wrapped => 1,	3103	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	3104	};
2661		3105
2662	$self->add (@w) if @w;	3106	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	3107	push @{$self->{par}}, $para;
		3108	}
		3109
		3110	if (my $max = $self->{max_par}) {
		3111	shift @{$self->{par}} while @{$self->{par}} > $max;
		3112	}
2664		3113
2665	$self->{need_reflow}++;	3114	$self->{need_reflow}++;
2666	$self->update;	3115	$self->update;
2667	}	3116	}
2668		3117
2669	sub scroll_to_bottom {	3118	sub scroll_to_bottom {
2670	my ($self) = @_;	3119	my ($self) = @_;
2671		3120
2672	$self->{scroll_to_bottom} = 1;	3121	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	3122	$self->update;
2674	}	3123	}
2675		3124
		3125	sub force_uptodate {
		3126	my ($self) = @_;
		3127
		3128	if (delete $self->{need_reflow}) {
		3129	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3130
		3131	my $height = 0;
		3132
		3133	for my $para (@{$self->{par}}) {
		3134	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3135	my $layout = $self->get_layout ($para);
		3136	my ($w, $h) = $layout->size;
		3137
		3138	$para->{w} = $w + $para->{indent};
		3139	$para->{h} = $h;
		3140	$para->{wrapped} = $layout->has_wrapped;
		3141	}
		3142
		3143	$para->{y} = $height;
		3144	$height += $para->{h};
		3145	}
		3146
		3147	$self->{height} = $height;
		3148	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3149
		3150	delete $self->{texture};
		3151	}
		3152
		3153	if (my $paridx = delete $self->{scroll_to}) {
		3154	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3155	}
		3156	}
		3157
2676	sub update {	3158	sub update {
2677	my ($self) = @_;	3159	my ($self) = @_;
2678		3160
2679	$self->SUPER::update;	3161	$self->SUPER::update;
2680		3162
2681	return unless $self->{h} > 0;	3163	return unless $self->{h} > 0;
2682		3164
2683	delete $self->{texture};	3165	delete $self->{texture};
2684		3166
2685	$ROOT->on_post_alloc ($self => sub {	3167	$ROOT->on_post_alloc ($self => sub {
		3168	$self->force_uptodate;
		3169
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3171
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 {	3172	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3173	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3174	glClear GL_COLOR_BUFFER_BIT;
2718		3175
		3176	package CFPlus::UI::Base;
		3177	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3178	(0, 0, $self->{w}, $self->{h});
		3179
		3180	my $top = int $self->{children}[1]{range}[0];
		3181
		3182	my $paridx = 0;
		3183	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3184	my $top = int $self->{children}[1]{range}[0];
2720		3185
2721	my $y0 = $top;	3186	my $y0 = $top;
2722	my $y1 = $top + $H;	3187	my $y1 = $top + $H;
2723		3188
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}}) {	3189	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3190	my $h = $para->{h};
		3191	my $y = $para->{y};
2732		3192
2733	if ($y0 < $y + $h && $y < $y1) {	3193	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3194	my $layout = $self->get_layout ($para);
2736		3195
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3196	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3197
2742	if (my @w = @{ $para->{widget} }) {	3198	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3199	my @s = $layout->get_shapes;
2744		3200
2745	for (@w) {	3201	for (@w) {
…		…
2751	$_->draw;	3207	$_->draw;
2752	}	3208	}
2753	}	3209	}
2754	}	3210	}
2755		3211
2756	$y += $h;	3212	$paridx++;
		3213	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3214	}
2758		3215
2759	glDisable GL_BLEND;	3216	$self->{top_paragraph} = $top_paragraph;
2760	};	3217	};
2761	});	3218	});
2762	}	3219	}
2763		3220
2764	sub reconfigure {	3221	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3239	$self->{children}[1]->draw;
2783	}	3240	}
2784		3241
2785	#############################################################################	3242	#############################################################################
2786		3243
2787	package CFClient::UI::Animator;	3244	package CFPlus::UI::Animator;
2788		3245
2789	use CFClient::OpenGL;	3246	use CFPlus::OpenGL;
2790		3247
2791	our @ISA = CFClient::UI::Bin::;	3248	our @ISA = CFPlus::UI::Bin::;
2792		3249
2793	sub moveto {	3250	sub moveto {
2794	my ($self, $x, $y) = @_;	3251	my ($self, $x, $y) = @_;
2795		3252
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3253	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3281	glPopMatrix;
2825	}	3282	}
2826		3283
2827	#############################################################################	3284	#############################################################################
2828		3285
2829	package CFClient::UI::Flopper;	3286	package CFPlus::UI::Flopper;
2830		3287
2831	our @ISA = CFClient::UI::Button::;	3288	our @ISA = CFPlus::UI::Button::;
2832		3289
2833	sub new {	3290	sub new {
2834	my $class = shift;	3291	my $class = shift;
2835		3292
2836	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3305	$self->{other}->toggle_visibility;
2849	}	3306	}
2850		3307
2851	#############################################################################	3308	#############################################################################
2852		3309
2853	package CFClient::UI::Tooltip;	3310	package CFPlus::UI::Tooltip;
2854		3311
2855	our @ISA = CFClient::UI::Bin::;	3312	our @ISA = CFPlus::UI::Bin::;
2856		3313
2857	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2858		3315
2859	sub new {	3316	sub new {
2860	my $class = shift;	3317	my $class = shift;
2861		3318
2862	$class->SUPER::new (	3319	$class->SUPER::new (
…		…
2865	)	3322	)
2866	}	3323	}
2867		3324
2868	sub set_tooltip_from {	3325	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3326	my ($self, $widget) = @_;
		3327
		3328	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3329	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3330
2871	my $tooltip = $widget->{tooltip};	3331	my $tooltip = $widget->{tooltip};
2872		3332
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3333	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3334	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3338	}
2879		3339
2880	$tooltip =~ s/^\n+//;	3340	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3341	$tooltip =~ s/\n+$//;
2882		3342
2883	$self->add (new CFClient::UI::Label	3343	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3344	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3345	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3346	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3347	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3348	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3349	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3350	);
2891	}	3351	}
2892		3352
…		…
2911		3371
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3372	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3373	my $widget = $self->{owner}
2914	or return;	3374	or return;
2915		3375
		3376	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3377	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3378
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3379	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3380	if $x + $self->{w} > $self->{root}{w};
2920		3381
2921	$self->move_abs ($x, $y);	3382	$self->move_abs ($x, $y);
		3383	} else {
		3384	$self->hide;
		3385	}
2922	});	3386	});
2923	}	3387	}
2924		3388
2925	sub _draw {	3389	sub _draw {
2926	my ($self) = @_;	3390	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3414	$self->SUPER::_draw;
2951	}	3415	}
2952		3416
2953	#############################################################################	3417	#############################################################################
2954		3418
2955	package CFClient::UI::Face;	3419	package CFPlus::UI::Face;
2956		3420
2957	our @ISA = CFClient::UI::Base::;	3421	our @ISA = CFPlus::UI::DrawBG::;
2958		3422
2959	use CFClient::OpenGL;	3423	use CFPlus::OpenGL;
2960		3424
2961	sub new {	3425	sub new {
2962	my $class = shift;	3426	my $class = shift;
2963		3427
2964	my $self = $class->SUPER::new (	3428	my $self = $class->SUPER::new (
		3429	size_w => 32,
		3430	size_h => 8,
2965	aspect => 1,	3431	aspect => 1,
2966	can_events => 0,	3432	can_events => 0,
2967	@_,	3433	@_,
2968	);	3434	);
2969		3435
2970	if ($self->{anim} && $self->{animspeed}) {	3436	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3437	CFPlus::weaken (my $widget = $self);
2972		3438
2973	$self->{timer} = Event->timer (	3439	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3440	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3441	hard => 1,
2976	interval => $self->{animspeed},	3442	interval => $self->{animspeed},
2977	cb => sub {	3443	cb => sub {
		3444	return unless $::CONN;
		3445
2978	++$widget->{frame};	3446	++$widget->{frame};
		3447	$self->update_face;
2979	$widget->update;	3448	$self->update;
2980	},	3449	},
2981	);	3450	);
		3451
		3452	$self->update_face;
2982	}	3453	}
2983		3454
2984	$self	3455	$self
2985	}	3456	}
2986		3457
		3458	sub update_face {
		3459	my ($self) = @_;
		3460
		3461	return unless $::CONN;
		3462
		3463	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3464	if ($anim && @$anim) {
		3465	delete $self->{wait_face};
		3466	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3467	}
		3468	}
		3469	}
		3470
2987	sub size_request {	3471	sub size_request {
2988	(32, 8)	3472	my ($self) = @_;
		3473
		3474	if ($::CONN) {
		3475	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3476	if (my $tex = $::CONN->{texture}[$faceid]) {
		3477	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3478	} else {
		3479	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3480	$self->realloc;
		3481	});
		3482	}
		3483	}
		3484	}
		3485
		3486	($self->{size_w} || 8, $self->{size_h} || 8)
2989	}	3487	}
2990		3488
2991	sub update {	3489	sub update {
2992	my ($self) = @_;	3490	my ($self) = @_;
2993		3491
…		…
2999	sub _draw {	3497	sub _draw {
3000	my ($self) = @_;	3498	my ($self) = @_;
3001		3499
3002	return unless $::CONN;	3500	return unless $::CONN;
3003		3501
3004	my $face;	3502	$self->SUPER::_draw;
3005		3503
3006	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3504	my $faceid = $::CONN->{faceid}[$self->{face}]
3008		3505	or return;
3009	$face = $anim->[ $self->{frame} % @$anim ]
3010	if $anim && @$anim;
3011	}
3012		3506
3013	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3507	my $tex = $::CONN->{texture}[$faceid];
3014		3508
3015	if ($tex) {	3509	if ($tex) {
3016	glEnable GL_TEXTURE_2D;	3510	glEnable GL_TEXTURE_2D;
3017	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018	glColor 0, 0, 0, 1;	3512	glColor 0, 0, 0, 1;
…		…
3030	$self->SUPER::destroy;	3524	$self->SUPER::destroy;
3031	}	3525	}
3032		3526
3033	#############################################################################	3527	#############################################################################
3034		3528
3035	package CFClient::UI::Buttonbar;	3529	package CFPlus::UI::Buttonbar;
3036		3530
3037	our @ISA = CFClient::UI::HBox::;	3531	our @ISA = CFPlus::UI::HBox::;
3038		3532
3039	# TODO: should actualyl wrap buttons and other goodies.	3533	# TODO: should actually wrap buttons and other goodies.
3040		3534
3041	#############################################################################	3535	#############################################################################
3042		3536
3043	package CFClient::UI::Menu;	3537	package CFPlus::UI::Menu;
3044		3538
3045	our @ISA = CFClient::UI::FancyFrame::;	3539	our @ISA = CFPlus::UI::Toplevel::;
3046		3540
3047	use CFClient::OpenGL;	3541	use CFPlus::OpenGL;
3048		3542
3049	sub new {	3543	sub new {
3050	my $class = shift;	3544	my $class = shift;
3051		3545
3052	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3053	items => [],	3547	items => [],
3054	z => 100,	3548	z => 100,
3055	@_,	3549	@_,
3056	);	3550	);
3057		3551
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3552	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3553
3060	for my $item (@{ $self->{items} }) {	3554	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3555	my ($widget, $cb, $tooltip) = @$item;
3062		3556
3063	# handle various types of items, only text for now	3557	# handle various types of items, only text for now
3064	if (!ref $widget) {	3558	if (!ref $widget) {
		3559	if ($widget =~ /\t/) {
		3560	my ($left, $right) = split /\t/, $widget, 2;
		3561
3065	$widget = new CFClient::UI::Label	3562	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3563	can_hover => 1,
3067	can_events => 1,	3564	can_events => 1,
		3565	tooltip => $tooltip,
		3566	children => [
		3567	(new CFPlus::UI::Label markup => $left, expand => 1),
		3568	(new CFPlus::UI::Label markup => $right, align => +1),
		3569	],
		3570	;
		3571
		3572	} else {
		3573	$widget = new CFPlus::UI::Label
		3574	can_hover => 1,
		3575	can_events => 1,
3068	markup => $widget,	3576	markup => $widget,
3069	tooltip => $tooltip	3577	tooltip => $tooltip;
		3578	}
3070	}	3579	}
3071		3580
3072	$self->{item}{$widget} = $item;	3581	$self->{item}{$widget} = $item;
3073		3582
3074	$self->{vbox}->add ($widget);	3583	$self->{vbox}->add ($widget);
…		…
3117	1	3626	1
3118	}	3627	}
3119		3628
3120	#############################################################################	3629	#############################################################################
3121		3630
3122	package CFClient::UI::Multiplexer;	3631	package CFPlus::UI::Multiplexer;
3123		3632
3124	our @ISA = CFClient::UI::Container::;	3633	our @ISA = CFPlus::UI::Container::;
3125		3634
3126	sub new {	3635	sub new {
3127	my $class = shift;	3636	my $class = shift;
3128		3637
3129	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
…		…
3143		3652
3144	$self->{current} = $self->{children}[0]	3653	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3654	if @{ $self->{children} };
3146	}	3655	}
3147		3656
		3657	sub get_current_page {
		3658	my ($self) = @_;
		3659
		3660	$self->{current}
		3661	}
		3662
3148	sub set_current_page {	3663	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3664	my ($self, $page_or_widget) = @_;
3150		3665
3151	my $widget = ref $page_or_widget	3666	my $widget = ref $page_or_widget
3152	? $page_or_widget	3667	? $page_or_widget
…		…
3184	$self->{current}->draw;	3699	$self->{current}->draw;
3185	}	3700	}
3186		3701
3187	#############################################################################	3702	#############################################################################
3188		3703
3189	package CFClient::UI::Notebook;	3704	package CFPlus::UI::Notebook;
3190		3705
3191	our @ISA = CFClient::UI::VBox::;	3706	our @ISA = CFPlus::UI::VBox::;
3192		3707
3193	sub new {	3708	sub new {
3194	my $class = shift;	3709	my $class = shift;
3195		3710
3196	my $self = $class->SUPER::new (	3711	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3712	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3713	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3714	# filter => # will be put between multiplexer and $self
3200	@_,	3715	@_,
3201	);	3716	);
3202		3717
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3718	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3722	}
3208		3723
3209	sub add {	3724	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3725	my ($self, $title, $widget, $tooltip) = @_;
3211		3726
3212	Scalar::Util::weaken $self;	3727	CFPlus::weaken $self;
3213		3728
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3729	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3730	markup => $title,
3216	tooltip => $tooltip,	3731	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3732	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3733	);
3219		3734
3220	$self->{multiplexer}->add ($widget);	3735	$self->{multiplexer}->add ($widget);
3221	}	3736	}
3222		3737
		3738	sub get_current_page {
		3739	my ($self) = @_;
		3740
		3741	$self->{multiplexer}->get_current_page
		3742	}
		3743
3223	sub set_current_page {	3744	sub set_current_page {
3224	my ($self, $page) = @_;	3745	my ($self, $page) = @_;
3225		3746
3226	$self->{multiplexer}->set_current_page ($page);	3747	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3748	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3749	}
3229		3750
3230	#############################################################################	3751	#############################################################################
3231		3752
3232	package CFClient::UI::Combobox;	3753	package CFPlus::UI::Selector;
3233		3754
3234	use utf8;	3755	use utf8;
3235		3756
3236	our @ISA = CFClient::UI::Button::;	3757	our @ISA = CFPlus::UI::Button::;
3237		3758
3238	sub new {	3759	sub new {
3239	my $class = shift;	3760	my $class = shift;
3240		3761
3241	my $self = $class->SUPER::new (	3762	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3779	my ($value, $title, $tooltip) = @$_;
3259		3780
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3781	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3782	}
3262		3783
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3784	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3785	}
3265		3786
3266	sub _set_value {	3787	sub _set_value {
3267	my ($self, $value) = @_;	3788	my ($self, $value) = @_;
3268		3789
…		…
3283	$self->emit (changed => $value);	3804	$self->emit (changed => $value);
3284	}	3805	}
3285		3806
3286	#############################################################################	3807	#############################################################################
3287		3808
3288	package CFClient::UI::Statusbox;	3809	package CFPlus::UI::Statusbox;
3289		3810
3290	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3291		3812
3292	sub new {	3813	sub new {
3293	my $class = shift;	3814	my $class = shift;
3294		3815
3295	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3817	fontsize => 0.8,
3297	@_,	3818	@_,
3298	);	3819	);
3299		3820
3300	Scalar::Util::weaken (my $this = $self);	3821	CFPlus::weaken (my $this = $self);
3301		3822
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3823	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3824
3304	$self	3825	$self
3305	}	3826	}
…		…
3307	sub reorder {	3828	sub reorder {
3308	my ($self) = @_;	3829	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3830	my $NOW = Time::HiRes::time;
3310		3831
3311	# freeze display when hovering over any label	3832	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3833	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3834	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3835	values %{ $self->{item} };
3315		3836
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3837	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3838	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3839	}
…		…
3339	for ($short) {	3860	for ($short) {
3340	s/^\s+//;	3861	s/^\s+//;
3341	s/\s+/ /g;	3862	s/\s+/ /g;
3342	}	3863	}
3343		3864
3344	new CFClient::UI::Label	3865	new CFPlus::UI::Label
3345	markup => $short,	3866	markup => $short,
3346	tooltip => $item->{tooltip},	3867	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3868	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3869	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3870	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3924	count => 1,
3404	%arg,	3925	%arg,
3405	};	3926	};
3406	}	3927	}
3407		3928
		3929	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3930	$self->reorder;
		3931	});
3409	}	3932	}
3410		3933
3411	sub reconfigure {	3934	sub reconfigure {
3412	my ($self) = @_;	3935	my ($self) = @_;
3413		3936
…		…
3426	$self->SUPER::destroy;	3949	$self->SUPER::destroy;
3427	}	3950	}
3428		3951
3429	#############################################################################	3952	#############################################################################
3430		3953
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;	3954	package CFPlus::UI::Root;
3804		3955
3805	our @ISA = CFClient::UI::Container::;	3956	our @ISA = CFPlus::UI::Container::;
3806		3957
3807	use List::Util qw(min max);	3958	use List::Util qw(min max);
3808		3959
3809	use CFClient::OpenGL;	3960	use CFPlus::OpenGL;
3810		3961
3811	sub new {	3962	sub new {
3812	my $class = shift;	3963	my $class = shift;
3813		3964
3814	my $self = $class->SUPER::new (	3965	my $self = $class->SUPER::new (
3815	visible => 1,	3966	visible => 1,
3816	@_,	3967	@_,
3817	);	3968	);
3818		3969
3819	Scalar::Util::weaken ($self->{root} = $self);	3970	CFPlus::weaken ($self->{root} = $self);
3820		3971
3821	$self	3972	$self
3822	}	3973	}
3823		3974
3824	sub size_request {	3975	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4141	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4142
3992	$w = 0 if $w < 0;	4143	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4144	$h = 0 if $h < 0;
3994		4145
		4146	$w = max $widget->{min_w}, $w;
		4147	$h = max $widget->{min_h}, $h;
		4148
		4149	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4150	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4151
		4152	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4153	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4154
3995	$w = int $w + 0.5;	4155	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4156	$h = int $h + 0.5;
3997		4157
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4158	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4159	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4182	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4183	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4184	glLoadIdentity;
4025		4185
4026	{	4186	{
4027	package CFClient::UI::Base;	4187	package CFPlus::UI::Base;
4028		4188
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4189	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4190	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4191
4033	$self->_draw;	4192	$self->_draw;
		4193	}
4034	}	4194	}
4035		4195
4036	#############################################################################	4196	#############################################################################
4037		4197
4038	package CFClient::UI;	4198	package CFPlus::UI;
4039		4199
4040	$ROOT = new CFClient::UI::Root;	4200	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4201	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4202
4043	1	4203	1
4044		4204

Diff Legend

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