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.375 by root, Mon Jul 16 20:12:19 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
423	my ($self) = @_;	457	my ($self) = @_;
424		458
425	return if $FOCUS == $self;	459	return if $FOCUS == $self;
426	return unless $self->{can_focus};	460	return unless $self->{can_focus};
427		461
428	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
429		463
430	$focus->update if $focus;	464	$self->update;
431	$FOCUS->update;
432		465
433	0	466	0
434	}	467	}
435		468
436	sub invoke_focus_out {	469	sub invoke_focus_out {
437	my ($self) = @_;	470	my ($self) = @_;
438		471
439	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
440		473
441	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
442		475
443	$focus->update if $focus; #?	476	$self->update;
444		477
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	479	unless $FOCUS;
447		480
448	0	481	0
449	}	482	}
450		483
451	sub grab_focus {	484	sub grab_focus {
452	my ($self) = @_;	485	my ($self) = @_;
453		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
466		501
467	1	502	0
468	}	503	}
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
479	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
539	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
540		607
541	# update screen rectangle	608	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		611
547	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		615
…		…
573	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
576	glEnd;	641	glEnd;
577	glPopMatrix;	642	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	644	}
580		645
581	$self->_draw;	646	$self->_draw;
582	glPopMatrix;	647	glPopMatrix;
583	}	648	}
…		…
586	my ($self) = @_;	651	my ($self) = @_;
587		652
588	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
589	}	654	}
590		655
		656	my $cntx;#d#
591	sub DESTROY {	657	sub DESTROY {
592	my ($self) = @_;	658	my ($self) = @_;
593		659
594	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
595		661
596	eval { $self->destroy };	662	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
598	}	666	}
599		667
600	#############################################################################	668	#############################################################################
601		669
602	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
603		671
604	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
605		673
606	use strict;	674	use strict;
607	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
608		676
609	sub new {	677	sub new {
610	my $class = shift;	678	my $class = shift;
611		679
612	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
643	}	711	}
644	}	712	}
645		713
646	#############################################################################	714	#############################################################################
647		715
648	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
649		717
650	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
651		719
652	sub new {	720	sub new {
653	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
655	}	723	}
…		…
662		730
663	sub draw { }	731	sub draw { }
664		732
665	#############################################################################	733	#############################################################################
666		734
667	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
668		736
669	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
670		738
671	sub new {	739	sub new {
672	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
673		741
674	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
683	if $children;	751	if $children;
684		752
685	$self	753	$self
686	}	754	}
687		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
688	sub add {	764	sub add {
689	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
690		766
691	$_->set_parent ($self)	767	$_->set_parent ($self)
692	for @widgets;	768	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
753	}	829	}
754		830
755	#############################################################################	831	#############################################################################
756		832
757	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
758		834
759	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
760		836
761	sub new {	837	sub new {
762	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
763		839
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		841
766	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
767	}	843	}
768		844
769	sub add {	845	sub add {
…		…
776	sub remove {	852	sub remove {
777	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
778		854
779	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
780		856
781	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	858	unless @{$self->{children}};
783	}	859	}
784		860
785	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
786		862
…		…
798		874
799	#############################################################################	875	#############################################################################
800		876
801	# back-buffered drawing area	877	# back-buffered drawing area
802		878
803	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
804		880
805	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
806		882
807	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
808		884
809	sub new {	885	sub new {
810	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
811		887
812	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
834	}	910	}
835		911
836	sub render_child {	912	sub render_child {
837	my ($self) = @_;	913	my ($self) = @_;
838		914
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
842		918
843	{	919	{
844	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
845		921
846	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
848	}	926	}
849
850	$self->_render;
851	};	927	};
852	}	928	}
853		929
854	sub _draw {	930	sub _draw {
855	my ($self) = @_;	931	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		932
859	my $tex = $self->{texture}	933	my $tex = $self->{texture}
860	or return;	934	or return;
861		935
862	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
865		939
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
867		941
868	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
869	}	943	}
870		944
871	#############################################################################	945	#############################################################################
872		946
873	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
874		948
		949	use List::Util qw(min max);
		950
875	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
876		952
877	sub new {	953	sub new {
878	my $class = shift;	954	my $class = shift;
879		955
880	$class->SUPER::new (	956	$class->SUPER::new (
…		…
910	}	986	}
911		987
912	sub set_offset {	988	sub set_offset {
913	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
914		990
915	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
916	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
917		993
918	$self->update;	994	$self->update;
919	}	995	}
920		996
921	# hmm, this does not work for topleft of $self... but we should not ask for that	997	# hmm, this does not work for topleft of $self... but we should not ask for that
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1016	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1017	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1018	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1019	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1020	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1021	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1022	}
947	}	1023	}
948		1024
949	sub _render {	1025	sub _render {
950	my ($self) = @_;	1026	my ($self) = @_;
951		1027
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1028	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};	1029	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1030
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1031	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1032
957	$self->SUPER::_render;	1033	$self->SUPER::_render;
958	}	1034	}
959		1035
960	#############################################################################	1036	#############################################################################
961		1037
962	package CFClient::UI::ScrolledWindow;	1038	package CFPlus::UI::ScrolledWindow;
963		1039
964	our @ISA = CFClient::UI::HBox::;	1040	our @ISA = CFPlus::UI::Table::;
965		1041
966	sub new {	1042	sub new {
967	my ($class, %arg) = @_;	1043	my ($class, %arg) = @_;
968		1044
969	my $child = delete $arg{child};	1045	my $child = delete $arg{child};
970		1046
971	my $self;	1047	my $self;
972		1048
973	my $slider = new CFClient::UI::Slider	1049	my $hslider = new CFPlus::UI::Slider
		1050	vertical => 0,
		1051	range => [0, 0, 1, 0.01], # HACK fix
		1052	on_changed => sub {
		1053	$self->{hpos} = $_[1];
		1054	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1055	},
		1056	;
		1057
		1058	my $vslider = new CFPlus::UI::Slider
974	vertical => 1,	1059	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1060	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1061	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1062	$self->{vpos} = $_[1];
		1063	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1064	},
979	;	1065	;
980		1066
981	$self = $class->SUPER::new (	1067	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1068	scroll_x => 0,
		1069	scroll_y => 1,
		1070	can_events => 1,
983	slider => $slider,	1071	hslider => $hslider,
		1072	vslider => $vslider,
		1073	col_expand => [1, 0],
		1074	row_expand => [1, 0],
984	%arg,	1075	%arg,
985	);	1076	);
986		1077
		1078	$self->{vp} = new CFPlus::UI::ViewPort
		1079	expand => 1,
		1080	scroll_x => $self->{scroll_x},
		1081	scroll_y => $self->{scroll_y},
		1082	;
		1083
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->SUPER::add (0, 0, $self->{vp});
		1085
988	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
989		1087
990	$self	1088	$self
991	}	1089	}
		1090
		1091	#TODO# update range on size_allocate depending on child
992		1092
993	sub add {	1093	sub add {
994	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
995		1095
996	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
997	}	1097	}
998		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1105	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1106
		1107	my $visible = $w1 > $w2;
		1108	if ($visible != $self->{hslider}{visible}) {
		1109	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1110	: $self->{hslider}->hide;
		1111	}
		1112
		1113	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1114	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1115
		1116	my $visible = $h1 > $h2;
		1117	if ($visible != $self->{vslider}{visible}) {
		1118	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1119	: $self->{vslider}->hide;
		1120	}
		1121	}
		1122
999	sub update {	1123	sub update {
1000	my ($self) = @_;	1124	my ($self) = @_;
1001		1125
1002	$self->SUPER::update;	1126	$self->SUPER::update;
		1127	$self->update_slider;
		1128	}
1003		1129
1004	# todo: overwrite size_allocate of child	1130	sub invoke_mouse_wheel {
1005	my $child = $self->{vp}->child;	1131	my ($self, $ev) = @_;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1132
		1133	return 0 unless $ev->{dy}; # only vertical movements for now
		1134
		1135	$self->{vslider}->emit (mouse_wheel => $ev);
		1136
		1137	1
		1138	}
		1139
		1140	sub invoke_button_down {
		1141	my ($self, $ev, $x, $y) = @_;
		1142
		1143	if ($ev->{button} == 2) {
		1144	$self->grab_focus;
		1145
		1146	$self->{motion} = sub {
		1147	my ($ev, $x, $y) = @_;
		1148
		1149	$self->{vp}->set_offset (
		1150	$self->{vp}{view_x} - $ev->{xrel},
		1151	$self->{vp}{view_y} - $ev->{yrel},
		1152	);
		1153	};
		1154
		1155	return 1;
		1156	}
		1157
		1158	0
		1159	}
		1160
		1161	sub invoke_button_up {
		1162	my ($self, $ev, $x, $y) = @_;
		1163
		1164	if (delete $self->{motion}) {
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_mouse_motion {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if ($self->{motion}) {
		1175	$self->{motion}->($ev, $x, $y);
		1176	return 1;
		1177	}
		1178
		1179	0
1007	}	1180	}
1008		1181
1009	sub invoke_size_allocate {	1182	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1011		1184
1012	my $child = $self->{vp}->child;	1185	$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)	1186	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1187	}
1017		1188
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1189	#############################################################################
1022		1190
1023	package CFClient::UI::Frame;	1191	package CFPlus::UI::Frame;
1024		1192
1025	our @ISA = CFClient::UI::Bin::;	1193	our @ISA = CFPlus::UI::Bin::;
1026		1194
1027	use CFClient::OpenGL;	1195	use CFPlus::OpenGL;
1028		1196
1029	sub new {	1197	sub new {
1030	my $class = shift;	1198	my $class = shift;
1031		1199
1032	$class->SUPER::new (	1200	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1059	}	1227	}
1060		1228
1061	#############################################################################	1229	#############################################################################
1062		1230
1063	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1064		1232
1065	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1066		1234
1067	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1068		1336
1069	my $bg =	1337	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1072		1340
1073	my @border =	1341	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	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);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1344
1077	sub new {	1345	sub new {
1078	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1079		1347
1080	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1349	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1350	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1351	border => 0.6,
1084	can_events => 1,	1352	can_events => 1,
1085	min_w => 16,	1353	min_w => 64,
1086	min_h => 16,	1354	min_h => 32,
1087	%arg,	1355	%arg,
1088	);	1356	);
1089		1357
1090	$self->{title_widget} = new CFClient::UI::Label	1358	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1359	align => 0,
1092	valign => 1,	1360	valign => 1,
1093	text => $self->{title},	1361	text => $self->{title},
1094	fontsize => $self->{border},	1362	fontsize => $self->{border},
1095	if exists $self->{title};	1363	if exists $self->{title};
1096		1364
1097	if ($self->{has_close_button}) {	1365	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1366	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1367	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1368	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1369	on_activate => sub { $self->emit ("delete") };
1102		1370
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1371	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1372	}
1105		1373
1106	$self	1374	$self
1107	}	1375	}
1108		1376
1109	sub add {	1377	sub add {
1110	my ($self, @widgets) = @_;	1378	my ($self, @widgets) = @_;
1111		1379
1112	$self->SUPER::add (@widgets);	1380	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1381	$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};	1382	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1383	}
1116		1384
1117	sub border {	1385	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1386	int $_[0]{border} * $::FONTSIZE
1119	}	1387	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1420	$self->child->configure ($border, $border, $w, $h);
1153		1421
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1422	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1423	if $self->{close_button};
1156		1424
		1425	1
		1426	}
		1427
		1428	sub invoke_delete {
		1429	my ($self) = @_;
		1430
		1431	$self->hide;
		1432
1157	1	1433	1
1158	}	1434	}
1159		1435
1160	sub invoke_button_down {	1436	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1437	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1495	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1496
1221	! ! $self->{motion}	1497	! ! $self->{motion}
1222	}	1498	}
1223		1499
		1500	sub invoke_visibility_change {
		1501	my ($self, $visible) = @_;
		1502
		1503	delete $self->{motion} unless $visible;
		1504
		1505	0
		1506	}
		1507
1224	sub _draw {	1508	sub _draw {
1225	my ($self) = @_;	1509	my ($self) = @_;
1226		1510
1227	my $child = $self->{children}[0];	1511	my $child = $self->{children}[0];
1228		1512
…		…
1265	if $self->{close_button};	1549	if $self->{close_button};
1266	}	1550	}
1267		1551
1268	#############################################################################	1552	#############################################################################
1269		1553
1270	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1271		1555
1272	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Base::;
1273		1557
1274	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1275		1559
1276	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1277		1561
1278	sub new {	1562	sub new {
1279	my $class = shift;	1563	my $class = shift;
1280		1564
1281	$class->SUPER::new (	1565	$class->SUPER::new (
		1566	children => [],
1282	col_expand => [],	1567	col_expand => [],
		1568	row_expand => [],
1283	@_,	1569	@_,
1284	)	1570	)
1285	}	1571	}
1286		1572
1287	sub children {	1573	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1574	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1575	}
1290		1576
		1577	# TODO: store row/col info in child widget and use standard add/del
1291	sub add {	1578	sub add {
1292	my ($self, $x, $y, $child) = @_;	1579	my ($self) = shift;
1293		1580
		1581	while (@_) {
		1582	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1583	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1584	$self->{children}[$y][$x] = $child;
		1585	}
1296		1586
		1587	$self->{force_realloc} = 1;
		1588	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1589	$self->realloc;
1298	}	1590	}
1299		1591
1300	sub remove {	1592	sub remove {
1301	my ($self, $child) = @_;	1593	my ($self, $child) = @_;
1302		1594
1303	# TODO: not yet implemented	1595	for (@{ $self->{children} }) {
		1596	for (@{ $_ || [] }) {
		1597	$_ = undef if $_ == $child;
		1598	}
		1599	}
1304	}	1600	}
1305		1601
1306	# TODO: move to container class maybe? send children a signal on removal?	1602	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {	1603	sub clear {
1308	my ($self) = @_;	1604	my ($self) = @_;
…		…
1357	my ($ws, $hs) = $self->get_wh;	1653	my ($ws, $hs) = $self->get_wh;
1358		1654
1359	my $req_w = (sum @$ws) || 1;	1655	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1656	my $req_h = (sum @$hs) || 1;
1361		1657
1362	# TODO: nicer code && do row_expand	1658	# TODO: nicer code
1363	my @col_expand = @{$self->{col_expand}};	1659	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1660	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1661	my $col_expand = (sum @col_expand) || 1;
1366		1662
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1663	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1664
1371	CFClient::UI::harmonize $ws;	1665	CFPlus::UI::harmonize $ws;
		1666
		1667	my @row_expand = @{$self->{row_expand}};
		1668	@row_expand = (1) x @$ws unless @row_expand;
		1669	my $row_expand = (sum @row_expand) || 1;
		1670
		1671	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1672
1372	CFClient::UI::harmonize $hs;	1673	CFPlus::UI::harmonize $hs;
1373		1674
1374	my $y;	1675	my $y;
1375		1676
1376	for my $r (0 .. $#{$self->{children}}) {	1677	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1678	my $row = $self->{children}[$r]
…		…
1420	}	1721	}
1421	}	1722	}
1422		1723
1423	#############################################################################	1724	#############################################################################
1424		1725
1425	package CFClient::UI::Box;	1726	package CFPlus::UI::Fixed;
1426		1727
		1728	use List::Util qw(min max);
		1729
1427	our @ISA = CFClient::UI::Container::;	1730	our @ISA = CFPlus::UI::Container::;
		1731
		1732	sub add {
		1733	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1734
		1735	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1736	$self->SUPER::add ($child);
		1737	}
		1738
		1739	sub _scale($$$) {
		1740	my ($mode, $val, $max) = @_;
		1741
		1742	$mode eq "abs" ? $val
		1743	: $mode eq "rel" ? $val * $max
		1744	: 0
		1745	}
		1746
		1747	sub size_request {
		1748	my ($self) = @_;
		1749
		1750	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1751
		1752	# determine overall size by querying abs widgets
		1753	for my $child ($self->visible_children) {
		1754	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1755
		1756	if ($pos eq "abs") {
		1757	$w = _scale $size, $w, $child->{req_w};
		1758	$h = _scale $size, $h, $child->{req_h};
		1759
		1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1762	}
		1763	}
		1764
		1765	my $W = $x2 - $x1;
		1766	my $H = $y2 - $y1;
		1767
		1768	# now layout remaining widgets
		1769	for my $child ($self->visible_children) {
		1770	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1771
		1772	if ($pos ne "abs") {
		1773	$x = _scale $pos, $x, $W;
		1774	$y = _scale $pos, $x, $H;
		1775	$w = _scale $size, $w, $child->{req_w};
		1776	$h = _scale $size, $h, $child->{req_h};
		1777
		1778	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1779	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1780	}
		1781	}
		1782
		1783	my $W = $x2 - $x1;
		1784	my $H = $y2 - $y1;
		1785
		1786	($W, $H)
		1787	}
		1788
		1789	sub invoke_size_allocate {
		1790	my ($self, $W, $H) = @_;
		1791
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	$x = _scale $pos, $x, $W;
		1796	$y = _scale $pos, $x, $H;
		1797	$w = _scale $size, $w, $child->{req_w};
		1798	$h = _scale $size, $h, $child->{req_h};
		1799
		1800	$child->configure ($x, $y, $w, $h);
		1801	}
		1802
		1803	1
		1804	}
		1805
		1806	#############################################################################
		1807
		1808	package CFPlus::UI::Box;
		1809
		1810	our @ISA = CFPlus::UI::Container::;
1428		1811
1429	sub size_request {	1812	sub size_request {
1430	my ($self) = @_;	1813	my ($self) = @_;
1431		1814
1432	$self->{vertical}	1815	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1849	for 0 .. $#children;
1467	}	1850	}
1468	}	1851	}
1469		1852
1470	CFClient::UI::harmonize \@req;	1853	CFPlus::UI::harmonize \@req;
1471		1854
1472	my $pos = 0;	1855	my $pos = 0;
1473	for (0 .. $#children) {	1856	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1858	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1863	1
1481	}	1864	}
1482		1865
1483	#############################################################################	1866	#############################################################################
1484		1867
1485	package CFClient::UI::HBox;	1868	package CFPlus::UI::HBox;
1486		1869
1487	our @ISA = CFClient::UI::Box::;	1870	our @ISA = CFPlus::UI::Box::;
1488		1871
1489	sub new {	1872	sub new {
1490	my $class = shift;	1873	my $class = shift;
1491		1874
1492	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1495	)	1878	)
1496	}	1879	}
1497		1880
1498	#############################################################################	1881	#############################################################################
1499		1882
1500	package CFClient::UI::VBox;	1883	package CFPlus::UI::VBox;
1501		1884
1502	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1503		1886
1504	sub new {	1887	sub new {
1505	my $class = shift;	1888	my $class = shift;
1506		1889
1507	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1510	)	1893	)
1511	}	1894	}
1512		1895
1513	#############################################################################	1896	#############################################################################
1514		1897
1515	package CFClient::UI::Label;	1898	package CFPlus::UI::Label;
1516		1899
1517	our @ISA = CFClient::UI::DrawBG::;	1900	our @ISA = CFPlus::UI::DrawBG::;
1518		1901
1519	use CFClient::OpenGL;	1902	use CFPlus::OpenGL;
1520		1903
1521	sub new {	1904	sub new {
1522	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1523		1906
1524	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1910	#active_bg => none
1528	#font => default_font	1911	#font => default_font
1529	#text => initial text	1912	#text => initial text
1530	#markup => initial narkup	1913	#markup => initial narkup
1531	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
		1915	#style => 0, # render flags
1532	ellipsise => 3, # end	1916	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1917	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1918	fontsize => 1,
1535	align => -1,	1919	align => -1,
1536	valign => -1,	1920	valign => -1,
1537	padding_x => 2,	1921	padding_x => 2,
1538	padding_y => 2,	1922	padding_y => 2,
1539	can_events => 0,	1923	can_events => 0,
1540	%arg	1924	%arg
1541	);	1925	);
1542		1926
1543	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1928	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1930	$self->{template} = $layout;
1547	}	1931	}
1548		1932
1549	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1553	}	1937	}
1554		1938
1555	$self	1939	$self
1556	}	1940	}
1557		1941
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 {	1942	sub update {
1569	my ($self) = @_;	1943	my ($self) = @_;
1570		1944
1571	delete $self->{texture};	1945	delete $self->{texture};
1572	$self->SUPER::update;	1946	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1957	my ($self, $text) = @_;
1584		1958
1585	return if $self->{text} eq "T$text";	1959	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1960	$self->{text} = "T$text";
1587		1961
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1962	$self->{layout}->set_text ($text);
1590		1963
1591	delete $self->{size_req};	1964	delete $self->{size_req};
1592	$self->realloc;	1965	$self->realloc;
1593	$self->update;	1966	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1972	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1973	$self->{text} = "M$markup";
1601		1974
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1975	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1976
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1977	$self->{layout}->set_markup ($markup);
1606		1978
1607	delete $self->{size_req};	1979	delete $self->{size_req};
1608	$self->realloc;	1980	$self->realloc;
1609	$self->update;	1981	$self->update;
…		…
1621		1993
1622	my ($w, $h) = $self->{layout}->size;	1994	my ($w, $h) = $self->{layout}->size;
1623		1995
1624	if (exists $self->{template}) {	1996	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1997	$self->{template}->set_font ($self->{font}) if $self->{font};
		1998	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1999	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		2000
1628	my ($w2, $h2) = $self->{template}->size;	2001	my ($w2, $h2) = $self->{template}->size;
1629		2002
1630	$w = List::Util::max $w, $w2;	2003	$w = List::Util::max $w, $w2;
…		…
1654		2027
1655	sub set_fontsize {	2028	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	2029	my ($self, $fontsize) = @_;
1657		2030
1658	$self->{fontsize} = $fontsize;	2031	$self->{fontsize} = $fontsize;
		2032	delete $self->{size_req};
1659	delete $self->{texture};	2033	delete $self->{texture};
1660		2034
1661	$self->realloc;	2035	$self->realloc;
1662	}	2036	}
1663		2037
1664	sub reconfigure {	2038	sub reconfigure {
1665	my ($self) = @_;	2039	my ($self) = @_;
1666		2040
1667	delete $self->{size_req};	2041	delete $self->{size_req};
		2042	delete $self->{texture};
1668		2043
1669	$self->SUPER::reconfigure;	2044	$self->SUPER::reconfigure;
1670	}	2045	}
1671		2046
1672	sub _draw {	2047	sub _draw {
1673	my ($self) = @_;	2048	my ($self) = @_;
1674		2049
1675	$self->SUPER::_draw; # draw background, if applicable	2050	$self->SUPER::_draw; # draw background, if applicable
1676		2051
1677	my $tex = $self->{texture} ||= do {	2052	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2053	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2054	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2055	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2056	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2057	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2058	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2059
1685	new_from_layout CFClient::Texture $self->{layout}	2060	[$self->{layout}->size]
1686	};	2061	};
1687		2062
1688	unless (exists $self->{ox}) {	2063	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2064	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2065	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2066	: ($self->{w} - $size->[0]) * 0.5);
1692		2067
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2068	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2069	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2070	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2071	};
1697		2072
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2073	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2074	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		2075
1703	if ($tex->{format} == GL_ALPHA) {	2076	$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	}	2077	}
1714		2078
1715	#############################################################################	2079	#############################################################################
1716		2080
1717	package CFClient::UI::EntryBase;	2081	package CFPlus::UI::EntryBase;
1718		2082
1719	our @ISA = CFClient::UI::Label::;	2083	our @ISA = CFPlus::UI::Label::;
1720		2084
1721	use CFClient::OpenGL;	2085	use CFPlus::OpenGL;
1722		2086
1723	sub new {	2087	sub new {
1724	my $class = shift;	2088	my $class = shift;
1725		2089
1726	$class->SUPER::new (	2090	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2094	active_fg => [0, 0, 0],
1731	can_hover => 1,	2095	can_hover => 1,
1732	can_focus => 1,	2096	can_focus => 1,
1733	valign => 0,	2097	valign => 0,
1734	can_events => 1,	2098	can_events => 1,
		2099	ellipsise => 0,
1735	#text => ...	2100	#text => ...
1736	#hidden => "*",	2101	#hidden => "*",
1737	@_	2102	@_
1738	)	2103	)
1739	}	2104	}
…		…
1784	my $sym = $ev->{sym};	2149	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2150	my $uni = $ev->{unicode};
1786		2151
1787	my $text = $self->get_text;	2152	my $text = $self->get_text;
1788		2153
		2154	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2155
1789	if ($uni == 8) {	2156	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2157	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2158	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2159	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2160	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2161	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2162	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2163	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2164	} elsif ($sym == CFPlus::SDLK_HOME) {
		2165	# what a hack
		2166	$self->{cursor} =
		2167	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2168	? length $1
		2169	: 0;
		2170	} elsif ($sym == CFPlus::SDLK_END) {
		2171	# uh, again
		2172	$self->{cursor} =
		2173	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2174	? $self->{cursor} + length $1
		2175	: length $self->{text};
		2176	} elsif ($uni == 21) { # ctrl-u
		2177	$text = "";
1798	$self->{cursor} = 0;	2178	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2179	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2180	$self->emit ('escape');
1803	} elsif ($uni) {	2181	} elsif ($uni == 0x0d) {
		2182	substr $text, $self->{cursor}++, 0, "\012";
		2183	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2184	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2185	} else {
1806	return 0;	2186	return 0;
1807	}	2187	}
1808		2188
1809	$self->_set_text ($text);	2189	$self->_set_text ($text);
1810		2190
1811	$self->realloc;	2191	$self->realloc;
		2192	$self->update;
1812		2193
1813	1	2194	1
1814	}	2195	}
1815		2196
1816	sub invoke_focus_in {	2197	sub invoke_focus_in {
…		…
1828		2209
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2210	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2211
1831	# byte-index to char-index	2212	# byte-index to char-index
1832	my $text = $self->{text};	2213	my $text = $self->{text};
1833	utf8::encode $text;	2214	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2215	$self->{cursor} = length $text;
1835		2216
1836	$self->_set_text ($self->{text});	2217	$self->_set_text ($self->{text});
1837	$self->update;	2218	$self->update;
1838		2219
1839	1	2220	1
…		…
1878	utf8::encode $text;	2259	utf8::encode $text;
1879		2260
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2261	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2262	}
1882		2263
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2264	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2265	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};	2266	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2267	glEnd;
1888	}	2268	}
1889	}	2269	}
1890		2270
		2271	#############################################################################
		2272
1891	package CFClient::UI::Entry;	2273	package CFPlus::UI::Entry;
1892		2274
1893	our @ISA = CFClient::UI::EntryBase::;	2275	our @ISA = CFPlus::UI::EntryBase::;
1894		2276
1895	use CFClient::OpenGL;	2277	use CFPlus::OpenGL;
1896		2278
1897	sub invoke_key_down {	2279	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2280	my ($self, $ev) = @_;
1899		2281
1900	my $sym = $ev->{sym};	2282	my $sym = $ev->{sym};
1901		2283
1902	if ($sym == 13) {	2284	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2285	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2286	my $txt = $self->get_text;
1905		2287
1906	$self->{history_pointer} = -1;	2288	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2289	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2290	$self->emit (activate => $txt);
1909	$self->update;	2291	$self->update;
1910		2292
1911	} elsif ($sym == CFClient::SDLK_UP) {	2293	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2294	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2295	$self->{history_saveback} = $self->get_text;
1914	}	2296	}
1915	if (@{$self->{history} || []} > 0) {	2297	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2298	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2300	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2301	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2303	}
1922		2304
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2305	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2306	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2307	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2308
1927	if ($self->{history_pointer} >= 0) {	2309	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2319	1
1938	}	2320	}
1939		2321
1940	#############################################################################	2322	#############################################################################
1941		2323
		2324	package CFPlus::UI::TextEdit;
		2325
		2326	our @ISA = CFPlus::UI::EntryBase::;
		2327
		2328	use CFPlus::OpenGL;
		2329
		2330	sub move_cursor_ver {
		2331	my ($self, $dy) = @_;
		2332
		2333	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2334
		2335	$y += $dy;
		2336
		2337	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2338	$self->{cursor} = $index;
		2339	delete $self->{cur_h};
		2340	$self->update;
		2341	return;
		2342	}
		2343	}
		2344
		2345	sub invoke_key_down {
		2346	my ($self, $ev) = @_;
		2347
		2348	my $sym = $ev->{sym};
		2349
		2350	if ($sym == CFPlus::SDLK_UP) {
		2351	$self->move_cursor_ver (-1);
		2352	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2353	$self->move_cursor_ver (+1);
		2354	} else {
		2355	return $self->SUPER::invoke_key_down ($ev)
		2356	}
		2357
		2358	1
		2359	}
		2360
		2361	#############################################################################
		2362
1942	package CFClient::UI::Button;	2363	package CFPlus::UI::Button;
1943		2364
1944	our @ISA = CFClient::UI::Label::;	2365	our @ISA = CFPlus::UI::Label::;
1945		2366
1946	use CFClient::OpenGL;	2367	use CFPlus::OpenGL;
1947		2368
1948	my @tex =	2369	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2371	qw(b1_button_active.png);
1951		2372
1952	sub new {	2373	sub new {
1953	my $class = shift;	2374	my $class = shift;
1954		2375
…		…
1991	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
1992	}	2413	}
1993		2414
1994	#############################################################################	2415	#############################################################################
1995		2416
		2417	package CFPlus::UI::CheckBox;
		2418
		2419	our @ISA = CFPlus::UI::DrawBG::;
		2420
		2421	my @tex =
		2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2423	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2424
		2425	use CFPlus::OpenGL;
		2426
		2427	sub new {
		2428	my $class = shift;
		2429
		2430	$class->SUPER::new (
		2431	padding_x => 2,
		2432	padding_y => 2,
		2433	fg => [1, 1, 1],
		2434	active_fg => [1, 1, 0],
		2435	bg => [0, 0, 0, 0.2],
		2436	active_bg => [1, 1, 1, 0.5],
		2437	state => 0,
		2438	can_hover => 1,
		2439	@_
		2440	)
		2441	}
		2442
		2443	sub size_request {
		2444	my ($self) = @_;
		2445
		2446	(6) x 2
		2447	}
		2448
		2449	sub toggle {
		2450	my ($self) = @_;
		2451
		2452	$self->{state} = !$self->{state};
		2453	$self->emit (changed => $self->{state});
		2454	$self->update;
		2455	}
		2456
		2457	sub invoke_button_down {
		2458	my ($self, $ev, $x, $y) = @_;
		2459
		2460	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2461	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2462	$self->toggle;
		2463	} else {
		2464	return 0
		2465	}
		2466
		2467	1
		2468	}
		2469
		2470	sub _draw {
		2471	my ($self) = @_;
		2472
		2473	$self->SUPER::_draw;
		2474
		2475	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2476
		2477	my ($w, $h) = @$self{qw(w h)};
		2478
		2479	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2480
		2481	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2482
		2483	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2484
		2485	glEnable GL_TEXTURE_2D;
		2486	$tex->draw_quad_alpha (0, 0, $s, $s);
		2487	glDisable GL_TEXTURE_2D;
		2488	}
		2489
		2490	#############################################################################
		2491
		2492	package CFPlus::UI::Image;
		2493
		2494	our @ISA = CFPlus::UI::Base::;
		2495
		2496	use CFPlus::OpenGL;
		2497
		2498	our %texture_cache;
		2499
		2500	sub new {
		2501	my $class = shift;
		2502
		2503	my $self = $class->SUPER::new (
		2504	can_events => 0,
		2505	@_,
		2506	);
		2507
		2508	$self->{path} || $self->{tex}
		2509	or Carp::croak "'path' or 'tex' attributes required";
		2510
		2511	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2512	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2513
		2514	CFPlus::weaken $texture_cache{$self->{path}};
		2515
		2516	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2517
		2518	$self
		2519	}
		2520
		2521	sub STORABLE_freeze {
		2522	my ($self, $cloning) = @_;
		2523
		2524	$self->{path}
		2525	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2526
		2527	$self->{path}
		2528	}
		2529
		2530	sub STORABLE_attach {
		2531	my ($self, $cloning, $path) = @_;
		2532
		2533	$self->new (path => $path)
		2534	}
		2535
		2536	sub size_request {
		2537	my ($self) = @_;
		2538
		2539	($self->{tex}{w}, $self->{tex}{h})
		2540	}
		2541
		2542	sub _draw {
		2543	my ($self) = @_;
		2544
		2545	my $tex = $self->{tex};
		2546
		2547	my ($w, $h) = ($self->{w}, $self->{h});
		2548
		2549	if ($self->{rot90}) {
		2550	glRotate 90, 0, 0, 1;
		2551	glTranslate 0, -$self->{w}, 0;
		2552
		2553	($w, $h) = ($h, $w);
		2554	}
		2555
		2556	glEnable GL_TEXTURE_2D;
		2557	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2558
		2559	$tex->draw_quad (0, 0, $w, $h);
		2560
		2561	glDisable GL_TEXTURE_2D;
		2562	}
		2563
		2564	#############################################################################
		2565
1996	package CFClient::UI::ImageButton;	2566	package CFPlus::UI::ImageButton;
1997		2567
1998	our @ISA = CFClient::UI::Image::;	2568	our @ISA = CFPlus::UI::Image::;
1999		2569
2000	use CFClient::OpenGL;	2570	use CFPlus::OpenGL;
2001		2571
2002	my %textures;	2572	my %textures;
2003		2573
2004	sub new {	2574	sub new {
2005	my $class = shift;	2575	my $class = shift;
…		…
2027	1	2597	1
2028	}	2598	}
2029		2599
2030	#############################################################################	2600	#############################################################################
2031		2601
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;	2602	package CFPlus::UI::VGauge;
2101		2603
2102	our @ISA = CFClient::UI::Base::;	2604	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		2605
2163	use List::Util qw(min max);	2606	use List::Util qw(min max);
2164		2607
2165	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2166		2609
2167	my %tex = (	2610	my %tex = (
2168	food => [	2611	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2614	],
2172	grace => [	2615	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	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/	2617	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2618	],
2176	hp => [	2619	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2622	],
2180	mana => [	2623	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	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/	2625	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2626	],
2184	);	2627	);
2185		2628
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2689	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2690	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2691
2249	my $h1 = $self->{h} * (1 - $ycut1);	2692	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2693	my $h2 = $self->{h} * (1 - $ycut2);
		2694	my $h3 = $self->{h};
		2695
		2696	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2697
2252	glEnable GL_BLEND;	2698	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2699	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2700	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2701	glEnable GL_TEXTURE_2D;
…		…
2274		2720
2275	if ($t3) {	2721	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2722	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2723	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2724	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2725	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2726	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2727	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2728	glEnd;
2283	}	2729	}
2284		2730
2285	glDisable GL_BLEND;	2731	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2287	}	2733	}
2288		2734
2289	#############################################################################	2735	#############################################################################
2290		2736
2291	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2292		2738
2293	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2294		2740
2295	sub new {	2741	sub new {
2296	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2297		2743
2298	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2746	can_hover => 1,
2301	can_events => 1,	2747	can_events => 1,
2302	%arg,	2748	%arg,
2303	);	2749	);
2304		2750
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2751	$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);	2752	$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");	2753	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2754
2309	$self	2755	$self
2310	}	2756	}
2311		2757
2312	sub set_fontsize {	2758	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2334	}	2780	}
2335		2781
2336	#############################################################################	2782	#############################################################################
2337		2783
2338	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2339		2785
2340	use strict;	2786	use strict;
2341		2787
2342	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2343		2789
2344	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2345		2791
2346	my @tex =	2792	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2349		2795
2350	sub new {	2796	sub new {
2351	my $class = shift;	2797	my $class = shift;
2352		2798
…		…
2441	}	2887	}
2442		2888
2443	1	2889	1
2444	}	2890	}
2445		2891
		2892	sub invoke_mouse_wheel {
		2893	my ($self, $ev) = @_;
		2894
		2895	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2896
		2897	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2898
		2899	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2900
		2901	! ! $delta
		2902	}
		2903
2446	sub update {	2904	sub update {
2447	my ($self) = @_;	2905	my ($self) = @_;
2448		2906
2449	delete $self->{knob_w};	2907	delete $self->{knob_w};
2450	$self->SUPER::update;	2908	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2955	glDisable GL_TEXTURE_2D;
2498	}	2956	}
2499		2957
2500	#############################################################################	2958	#############################################################################
2501		2959
2502	package CFClient::UI::ValSlider;	2960	package CFPlus::UI::ValSlider;
2503		2961
2504	our @ISA = CFClient::UI::HBox::;	2962	our @ISA = CFPlus::UI::HBox::;
2505		2963
2506	sub new {	2964	sub new {
2507	my ($class, %arg) = @_;	2965	my ($class, %arg) = @_;
2508		2966
2509	my $range = delete $arg{range};	2967	my $range = delete $arg{range};
2510		2968
2511	my $self = $class->SUPER::new (	2969	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2970	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2971	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2972	to_value => sub { shift },
2515	from_value => sub { shift },	2973	from_value => sub { shift },
2516	%arg,	2974	%arg,
2517	);	2975	);
2518		2976
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2996	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2997	sub set_value { shift->{slider}->set_value (@_) }
2540		2998
2541	#############################################################################	2999	#############################################################################
2542		3000
2543	package CFClient::UI::TextScroller;	3001	package CFPlus::UI::TextScroller;
2544		3002
2545	our @ISA = CFClient::UI::HBox::;	3003	our @ISA = CFPlus::UI::HBox::;
2546		3004
2547	use CFClient::OpenGL;	3005	use CFPlus::OpenGL;
2548		3006
2549	sub new {	3007	sub new {
2550	my $class = shift;	3008	my $class = shift;
2551		3009
2552	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
2553	fontsize => 1,	3011	fontsize => 1,
2554	can_events => 0,	3012	can_events => 1,
2555	indent => 0,	3013	indent => 0,
2556	#font => default_font	3014	#font => default_font
2557	@_,	3015	@_,
2558		3016
2559	layout => (new CFClient::Layout 1),	3017	layout => (new CFPlus::Layout),
2560	par => [],	3018	par => [],
		3019	max_par => 0,
2561	height => 0,	3020	height => 0,
2562	children => [	3021	children => [
2563	(new CFClient::UI::Empty expand => 1),	3022	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3023	(new CFPlus::UI::Slider vertical => 1),
2565	],	3024	],
2566	);	3025	);
2567		3026
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3027	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3028
…		…
2575		3034
2576	$self->{fontsize} = $fontsize;	3035	$self->{fontsize} = $fontsize;
2577	$self->reflow;	3036	$self->reflow;
2578	}	3037	}
2579		3038
2580	sub visible_children {	3039	sub size_request {
2581	my ($self) = @_;	3040	my ($self) = @_;
2582		3041
2583	@{$self->{children}}[0,1]	3042	my ($empty, $slider) = @{ $self->{children} };
		3043
		3044	local $self->{children} = [$empty, $slider];
		3045	$self->SUPER::size_request
2584	}	3046	}
2585		3047
2586	sub invoke_size_allocate {	3048	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	3049	my ($self, $w, $h) = @_;
2588		3050
…		…
2594	$self->{layout}->set_width ($empty->{w});	3056	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3057	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		3058
2597	$self->reflow;	3059	$self->reflow;
2598		3060
		3061	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	3062	$self->SUPER::invoke_size_allocate ($w, $h)
		3063	}
		3064
		3065	sub invoke_mouse_wheel {
		3066	my ($self, $ev) = @_;
		3067
		3068	return 0 unless $ev->{dy}; # only vertical movements
		3069
		3070	$self->{children}[1]->emit (mouse_wheel => $ev);
		3071
		3072	1
2600	}	3073	}
2601		3074
2602	sub get_layout {	3075	sub get_layout {
2603	my ($self, $para) = @_;	3076	my ($self, $para) = @_;
2604		3077
…		…
2632		3105
2633	# todo: base offset on lines or so, not on pixels	3106	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	3107	$self->{children}[1]->set_value ($offset);
2635	}	3108	}
2636		3109
		3110	sub current_paragraph {
		3111	my ($self) = @_;
		3112
		3113	$self->{top_paragraph} - 1
		3114	}
		3115
		3116	sub scroll_to {
		3117	my ($self, $para) = @_;
		3118
		3119	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3120
		3121	$self->{scroll_to} = $para;
		3122	$self->update;
		3123	}
		3124
2637	sub clear {	3125	sub clear {
2638	my ($self) = @_;	3126	my ($self) = @_;
2639		3127
2640	my (undef, undef, @other) = @{ $self->{children} };	3128	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	3129	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	3132	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3133	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	3134	}
2647		3135
2648	sub add_paragraph {	3136	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	3137	my $self = shift;
2650		3138
2651	my ($text, @w) = ref $para ? @$para : $para;	3139	for my $para (@_) {
2652
2653	$para = {	3140	$para = {
		3141	fg => [1, 1, 1, 1],
		3142	indent => 0,
		3143	markup => "",
		3144	widget => [],
		3145	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	3146	w => 1e10,
2655	wrapped => 1,	3147	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	3148	};
2661		3149
2662	$self->add (@w) if @w;	3150	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	3151	push @{$self->{par}}, $para;
		3152	}
		3153
		3154	if (my $max = $self->{max_par}) {
		3155	shift @{$self->{par}} while @{$self->{par}} > $max;
		3156	}
2664		3157
2665	$self->{need_reflow}++;	3158	$self->{need_reflow}++;
2666	$self->update;	3159	$self->update;
2667	}	3160	}
2668		3161
2669	sub scroll_to_bottom {	3162	sub scroll_to_bottom {
2670	my ($self) = @_;	3163	my ($self) = @_;
2671		3164
2672	$self->{scroll_to_bottom} = 1;	3165	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	3166	$self->update;
2674	}	3167	}
2675		3168
		3169	sub force_uptodate {
		3170	my ($self) = @_;
		3171
		3172	if (delete $self->{need_reflow}) {
		3173	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3174
		3175	my $height = 0;
		3176
		3177	for my $para (@{$self->{par}}) {
		3178	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3179	my $layout = $self->get_layout ($para);
		3180	my ($w, $h) = $layout->size;
		3181
		3182	$para->{w} = $w + $para->{indent};
		3183	$para->{h} = $h;
		3184	$para->{wrapped} = $layout->has_wrapped;
		3185	}
		3186
		3187	$para->{y} = $height;
		3188	$height += $para->{h};
		3189	}
		3190
		3191	$self->{height} = $height;
		3192	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3193
		3194	delete $self->{texture};
		3195	}
		3196
		3197	if (my $paridx = delete $self->{scroll_to}) {
		3198	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3199	}
		3200	}
		3201
2676	sub update {	3202	sub update {
2677	my ($self) = @_;	3203	my ($self) = @_;
2678		3204
2679	$self->SUPER::update;	3205	$self->SUPER::update;
2680		3206
2681	return unless $self->{h} > 0;	3207	return unless $self->{h} > 0;
2682		3208
2683	delete $self->{texture};	3209	delete $self->{texture};
2684		3210
2685	$ROOT->on_post_alloc ($self => sub {	3211	$ROOT->on_post_alloc ($self => sub {
		3212	$self->force_uptodate;
		3213
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3214	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3215
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 {	3216	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3217	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2718		3219
		3220	package CFPlus::UI::Base;
		3221	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3222	(0, 0, $self->{w}, $self->{h});
		3223
		3224	my $top = int $self->{children}[1]{range}[0];
		3225
		3226	my $paridx = 0;
		3227	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3228	my $top = int $self->{children}[1]{range}[0];
2720		3229
2721	my $y0 = $top;	3230	my $y0 = $top;
2722	my $y1 = $top + $H;	3231	my $y1 = $top + $H;
2723		3232
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}}) {	3233	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3234	my $h = $para->{h};
		3235	my $y = $para->{y};
2732		3236
2733	if ($y0 < $y + $h && $y < $y1) {	3237	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3238	my $layout = $self->get_layout ($para);
2736		3239
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3240	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3241
2742	if (my @w = @{ $para->{widget} }) {	3242	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3243	my @s = $layout->get_shapes;
2744		3244
2745	for (@w) {	3245	for (@w) {
…		…
2751	$_->draw;	3251	$_->draw;
2752	}	3252	}
2753	}	3253	}
2754	}	3254	}
2755		3255
2756	$y += $h;	3256	$paridx++;
		3257	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3258	}
2758		3259
2759	glDisable GL_BLEND;	3260	$self->{top_paragraph} = $top_paragraph;
2760	};	3261	};
2761	});	3262	});
2762	}	3263	}
2763		3264
2764	sub reconfigure {	3265	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3283	$self->{children}[1]->draw;
2783	}	3284	}
2784		3285
2785	#############################################################################	3286	#############################################################################
2786		3287
2787	package CFClient::UI::Animator;	3288	package CFPlus::UI::Animator;
2788		3289
2789	use CFClient::OpenGL;	3290	use CFPlus::OpenGL;
2790		3291
2791	our @ISA = CFClient::UI::Bin::;	3292	our @ISA = CFPlus::UI::Bin::;
2792		3293
2793	sub moveto {	3294	sub moveto {
2794	my ($self, $x, $y) = @_;	3295	my ($self, $x, $y) = @_;
2795		3296
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3325	glPopMatrix;
2825	}	3326	}
2826		3327
2827	#############################################################################	3328	#############################################################################
2828		3329
2829	package CFClient::UI::Flopper;	3330	package CFPlus::UI::Flopper;
2830		3331
2831	our @ISA = CFClient::UI::Button::;	3332	our @ISA = CFPlus::UI::Button::;
2832		3333
2833	sub new {	3334	sub new {
2834	my $class = shift;	3335	my $class = shift;
2835		3336
2836	my $self = $class->SUPER::new (	3337	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3349	$self->{other}->toggle_visibility;
2849	}	3350	}
2850		3351
2851	#############################################################################	3352	#############################################################################
2852		3353
2853	package CFClient::UI::Tooltip;	3354	package CFPlus::UI::Tooltip;
2854		3355
2855	our @ISA = CFClient::UI::Bin::;	3356	our @ISA = CFPlus::UI::Bin::;
2856		3357
2857	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2858		3359
2859	sub new {	3360	sub new {
2860	my $class = shift;	3361	my $class = shift;
2861		3362
2862	$class->SUPER::new (	3363	$class->SUPER::new (
…		…
2865	)	3366	)
2866	}	3367	}
2867		3368
2868	sub set_tooltip_from {	3369	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3370	my ($self, $widget) = @_;
		3371
		3372	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3373	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3374
2871	my $tooltip = $widget->{tooltip};	3375	my $tooltip = $widget->{tooltip};
2872		3376
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3377	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3378	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3382	}
2879		3383
2880	$tooltip =~ s/^\n+//;	3384	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3385	$tooltip =~ s/\n+$//;
2882		3386
2883	$self->add (new CFClient::UI::Label	3387	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3388	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3389	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3390	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3391	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3392	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3393	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3394	);
2891	}	3395	}
2892		3396
…		…
2911		3415
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3416	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3417	my $widget = $self->{owner}
2914	or return;	3418	or return;
2915		3419
		3420	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3421	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3422
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3423	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3424	if $x + $self->{w} > $self->{root}{w};
2920		3425
2921	$self->move_abs ($x, $y);	3426	$self->move_abs ($x, $y);
		3427	} else {
		3428	$self->hide;
		3429	}
2922	});	3430	});
2923	}	3431	}
2924		3432
2925	sub _draw {	3433	sub _draw {
2926	my ($self) = @_;	3434	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3458	$self->SUPER::_draw;
2951	}	3459	}
2952		3460
2953	#############################################################################	3461	#############################################################################
2954		3462
2955	package CFClient::UI::Face;	3463	package CFPlus::UI::Face;
2956		3464
2957	our @ISA = CFClient::UI::Base::;	3465	our @ISA = CFPlus::UI::DrawBG::;
2958		3466
2959	use CFClient::OpenGL;	3467	use CFPlus::OpenGL;
2960		3468
2961	sub new {	3469	sub new {
2962	my $class = shift;	3470	my $class = shift;
2963		3471
2964	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
		3473	size_w => 32,
		3474	size_h => 8,
2965	aspect => 1,	3475	aspect => 1,
2966	can_events => 0,	3476	can_events => 0,
2967	@_,	3477	@_,
2968	);	3478	);
2969		3479
2970	if ($self->{anim} && $self->{animspeed}) {	3480	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3481	CFPlus::weaken (my $widget = $self);
2972		3482
2973	$self->{timer} = Event->timer (	3483	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3484	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3485	hard => 1,
2976	interval => $self->{animspeed},	3486	interval => $self->{animspeed},
2977	cb => sub {	3487	cb => sub {
		3488	return unless $::CONN;
		3489
2978	++$widget->{frame};	3490	++$widget->{frame};
		3491	$self->update_face;
2979	$widget->update;	3492	$self->update;
2980	},	3493	},
2981	);	3494	);
		3495
		3496	$self->update_face;
2982	}	3497	}
2983		3498
2984	$self	3499	$self
2985	}	3500	}
2986		3501
		3502	sub update_face {
		3503	my ($self) = @_;
		3504
		3505	return unless $::CONN;
		3506
		3507	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3508	if ($anim && @$anim) {
		3509	delete $self->{wait_face};
		3510	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3511	}
		3512	}
		3513	}
		3514
2987	sub size_request {	3515	sub size_request {
2988	(32, 8)	3516	my ($self) = @_;
		3517
		3518	if ($::CONN) {
		3519	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3520	if (my $tex = $::CONN->{texture}[$faceid]) {
		3521	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3522	} else {
		3523	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3524	$self->realloc;
		3525	});
		3526	}
		3527	}
		3528	}
		3529
		3530	($self->{size_w} || 8, $self->{size_h} || 8)
2989	}	3531	}
2990		3532
2991	sub update {	3533	sub update {
2992	my ($self) = @_;	3534	my ($self) = @_;
2993		3535
…		…
2999	sub _draw {	3541	sub _draw {
3000	my ($self) = @_;	3542	my ($self) = @_;
3001		3543
3002	return unless $::CONN;	3544	return unless $::CONN;
3003		3545
3004	my $face;	3546	$self->SUPER::_draw;
3005		3547
3006	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3548	my $faceid = $::CONN->{faceid}[$self->{face}]
3008		3549	or return;
3009	$face = $anim->[ $self->{frame} % @$anim ]
3010	if $anim && @$anim;
3011	}
3012		3550
3013	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3551	my $tex = $::CONN->{texture}[$faceid];
3014		3552
3015	if ($tex) {	3553	if ($tex) {
3016	glEnable GL_TEXTURE_2D;	3554	glEnable GL_TEXTURE_2D;
3017	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018	glColor 0, 0, 0, 1;	3556	glColor 0, 0, 0, 1;
…		…
3030	$self->SUPER::destroy;	3568	$self->SUPER::destroy;
3031	}	3569	}
3032		3570
3033	#############################################################################	3571	#############################################################################
3034		3572
3035	package CFClient::UI::Buttonbar;	3573	package CFPlus::UI::Buttonbar;
3036		3574
3037	our @ISA = CFClient::UI::HBox::;	3575	our @ISA = CFPlus::UI::HBox::;
3038		3576
3039	# TODO: should actualyl wrap buttons and other goodies.	3577	# TODO: should actually wrap buttons and other goodies.
3040		3578
3041	#############################################################################	3579	#############################################################################
3042		3580
3043	package CFClient::UI::Menu;	3581	package CFPlus::UI::Menu;
3044		3582
3045	our @ISA = CFClient::UI::FancyFrame::;	3583	our @ISA = CFPlus::UI::Toplevel::;
3046		3584
3047	use CFClient::OpenGL;	3585	use CFPlus::OpenGL;
3048		3586
3049	sub new {	3587	sub new {
3050	my $class = shift;	3588	my $class = shift;
3051		3589
3052	my $self = $class->SUPER::new (	3590	my $self = $class->SUPER::new (
3053	items => [],	3591	items => [],
3054	z => 100,	3592	z => 100,
3055	@_,	3593	@_,
3056	);	3594	);
3057		3595
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3596	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3597
3060	for my $item (@{ $self->{items} }) {	3598	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3599	my ($widget, $cb, $tooltip) = @$item;
3062		3600
3063	# handle various types of items, only text for now	3601	# handle various types of items, only text for now
3064	if (!ref $widget) {	3602	if (!ref $widget) {
		3603	if ($widget =~ /\t/) {
		3604	my ($left, $right) = split /\t/, $widget, 2;
		3605
3065	$widget = new CFClient::UI::Label	3606	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3607	can_hover => 1,
3067	can_events => 1,	3608	can_events => 1,
		3609	tooltip => $tooltip,
		3610	children => [
		3611	(new CFPlus::UI::Label markup => $left, expand => 1),
		3612	(new CFPlus::UI::Label markup => $right, align => +1),
		3613	],
		3614	;
		3615
		3616	} else {
		3617	$widget = new CFPlus::UI::Label
		3618	can_hover => 1,
		3619	can_events => 1,
3068	markup => $widget,	3620	markup => $widget,
3069	tooltip => $tooltip	3621	tooltip => $tooltip;
		3622	}
3070	}	3623	}
3071		3624
3072	$self->{item}{$widget} = $item;	3625	$self->{item}{$widget} = $item;
3073		3626
3074	$self->{vbox}->add ($widget);	3627	$self->{vbox}->add ($widget);
…		…
3117	1	3670	1
3118	}	3671	}
3119		3672
3120	#############################################################################	3673	#############################################################################
3121		3674
3122	package CFClient::UI::Multiplexer;	3675	package CFPlus::UI::Multiplexer;
3123		3676
3124	our @ISA = CFClient::UI::Container::;	3677	our @ISA = CFPlus::UI::Container::;
3125		3678
3126	sub new {	3679	sub new {
3127	my $class = shift;	3680	my $class = shift;
3128		3681
3129	my $self = $class->SUPER::new (	3682	my $self = $class->SUPER::new (
…		…
3143		3696
3144	$self->{current} = $self->{children}[0]	3697	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3698	if @{ $self->{children} };
3146	}	3699	}
3147		3700
		3701	sub get_current_page {
		3702	my ($self) = @_;
		3703
		3704	$self->{current}
		3705	}
		3706
3148	sub set_current_page {	3707	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3708	my ($self, $page_or_widget) = @_;
3150		3709
3151	my $widget = ref $page_or_widget	3710	my $widget = ref $page_or_widget
3152	? $page_or_widget	3711	? $page_or_widget
…		…
3184	$self->{current}->draw;	3743	$self->{current}->draw;
3185	}	3744	}
3186		3745
3187	#############################################################################	3746	#############################################################################
3188		3747
3189	package CFClient::UI::Notebook;	3748	package CFPlus::UI::Notebook;
3190		3749
3191	our @ISA = CFClient::UI::VBox::;	3750	our @ISA = CFPlus::UI::VBox::;
3192		3751
3193	sub new {	3752	sub new {
3194	my $class = shift;	3753	my $class = shift;
3195		3754
3196	my $self = $class->SUPER::new (	3755	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3756	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3757	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3758	# filter => # will be put between multiplexer and $self
3200	@_,	3759	@_,
3201	);	3760	);
3202		3761
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3762	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3766	}
3208		3767
3209	sub add {	3768	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3769	my ($self, $title, $widget, $tooltip) = @_;
3211		3770
3212	Scalar::Util::weaken $self;	3771	CFPlus::weaken $self;
3213		3772
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3773	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3774	markup => $title,
3216	tooltip => $tooltip,	3775	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3776	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3777	);
3219		3778
3220	$self->{multiplexer}->add ($widget);	3779	$self->{multiplexer}->add ($widget);
3221	}	3780	}
3222		3781
		3782	sub get_current_page {
		3783	my ($self) = @_;
		3784
		3785	$self->{multiplexer}->get_current_page
		3786	}
		3787
3223	sub set_current_page {	3788	sub set_current_page {
3224	my ($self, $page) = @_;	3789	my ($self, $page) = @_;
3225		3790
3226	$self->{multiplexer}->set_current_page ($page);	3791	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3792	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3793	}
3229		3794
3230	#############################################################################	3795	#############################################################################
3231		3796
3232	package CFClient::UI::Combobox;	3797	package CFPlus::UI::Selector;
3233		3798
3234	use utf8;	3799	use utf8;
3235		3800
3236	our @ISA = CFClient::UI::Button::;	3801	our @ISA = CFPlus::UI::Button::;
3237		3802
3238	sub new {	3803	sub new {
3239	my $class = shift;	3804	my $class = shift;
3240		3805
3241	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3823	my ($value, $title, $tooltip) = @$_;
3259		3824
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3825	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3826	}
3262		3827
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3828	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3829	}
3265		3830
3266	sub _set_value {	3831	sub _set_value {
3267	my ($self, $value) = @_;	3832	my ($self, $value) = @_;
3268		3833
…		…
3283	$self->emit (changed => $value);	3848	$self->emit (changed => $value);
3284	}	3849	}
3285		3850
3286	#############################################################################	3851	#############################################################################
3287		3852
3288	package CFClient::UI::Statusbox;	3853	package CFPlus::UI::Statusbox;
3289		3854
3290	our @ISA = CFClient::UI::VBox::;	3855	our @ISA = CFPlus::UI::VBox::;
3291		3856
3292	sub new {	3857	sub new {
3293	my $class = shift;	3858	my $class = shift;
3294		3859
3295	my $self = $class->SUPER::new (	3860	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3861	fontsize => 0.8,
3297	@_,	3862	@_,
3298	);	3863	);
3299		3864
3300	Scalar::Util::weaken (my $this = $self);	3865	CFPlus::weaken (my $this = $self);
3301		3866
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3867	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3868
3304	$self	3869	$self
3305	}	3870	}
…		…
3307	sub reorder {	3872	sub reorder {
3308	my ($self) = @_;	3873	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3874	my $NOW = Time::HiRes::time;
3310		3875
3311	# freeze display when hovering over any label	3876	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3877	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3878	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3879	values %{ $self->{item} };
3315		3880
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3881	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3882	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3883	}
…		…
3339	for ($short) {	3904	for ($short) {
3340	s/^\s+//;	3905	s/^\s+//;
3341	s/\s+/ /g;	3906	s/\s+/ /g;
3342	}	3907	}
3343		3908
3344	new CFClient::UI::Label	3909	new CFPlus::UI::Label
3345	markup => $short,	3910	markup => $short,
3346	tooltip => $item->{tooltip},	3911	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3912	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3913	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3914	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3968	count => 1,
3404	%arg,	3969	%arg,
3405	};	3970	};
3406	}	3971	}
3407		3972
		3973	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3974	$self->reorder;
		3975	});
3409	}	3976	}
3410		3977
3411	sub reconfigure {	3978	sub reconfigure {
3412	my ($self) = @_;	3979	my ($self) = @_;
3413		3980
…		…
3426	$self->SUPER::destroy;	3993	$self->SUPER::destroy;
3427	}	3994	}
3428		3995
3429	#############################################################################	3996	#############################################################################
3430		3997
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;	3998	package CFPlus::UI::Root;
3804		3999
3805	our @ISA = CFClient::UI::Container::;	4000	our @ISA = CFPlus::UI::Container::;
3806		4001
3807	use List::Util qw(min max);	4002	use List::Util qw(min max);
3808		4003
3809	use CFClient::OpenGL;	4004	use CFPlus::OpenGL;
3810		4005
3811	sub new {	4006	sub new {
3812	my $class = shift;	4007	my $class = shift;
3813		4008
3814	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3815	visible => 1,	4010	visible => 1,
3816	@_,	4011	@_,
3817	);	4012	);
3818		4013
3819	Scalar::Util::weaken ($self->{root} = $self);	4014	CFPlus::weaken ($self->{root} = $self);
3820		4015
3821	$self	4016	$self
3822	}	4017	}
3823		4018
3824	sub size_request {	4019	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4185	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4186
3992	$w = 0 if $w < 0;	4187	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4188	$h = 0 if $h < 0;
3994		4189
		4190	$w = max $widget->{min_w}, $w;
		4191	$h = max $widget->{min_h}, $h;
		4192
		4193	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4194	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4195
		4196	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4197	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4198
3995	$w = int $w + 0.5;	4199	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4200	$h = int $h + 0.5;
3997		4201
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4202	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4203	$widget->{old_w} = $widget->{w};
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4227	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4228	glLoadIdentity;
4025		4229
4026	{	4230	{
4027	package CFClient::UI::Base;	4231	package CFPlus::UI::Base;
4028		4232
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4233	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4234	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4235
4033	$self->_draw;	4236	$self->_draw;
		4237	}
4034	}	4238	}
4035		4239
4036	#############################################################################	4240	#############################################################################
4037		4241
4038	package CFClient::UI;	4242	package CFPlus::UI;
4039		4243
4040	$ROOT = new CFClient::UI::Root;	4244	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4245	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4246
4043	1	4247	1
4044		4248

Diff Legend

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