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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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