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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19: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	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	532	# I do not really like this solution, but I do not like duplication
		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
476	($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
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	550	}
479		551
480	sub find_widget {	552	#sub find_widget {
481	my ($self, $x, $y) = @_;	553	# in .xs
482
483	return () unless $self->{can_events};
484
485	return $self
486	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489	()
490	}
491		554
492	sub set_parent {	555	sub set_parent {
493	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
494		557
495	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
497	}	560	}
498		561
499	sub realloc {	562	sub realloc {
500	my ($self) = @_;	563	my ($self) = @_;
…		…
534	return unless $self->{h} && $self->{w};	597	return unless $self->{h} && $self->{w};
535		598
536	# update screen rectangle	599	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	600	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	601	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		602
542	# skip widgets that are entirely outside the drawing area	603	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	604	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	605	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		606
…		…
568	glVertex $self->{w} - 1, 0;	629	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	630	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	631	glVertex 0 , $self->{h} - 1;
571	glEnd;	632	glEnd;
572	glPopMatrix;	633	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	634	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	635	}
575		636
576	$self->_draw;	637	$self->_draw;
577	glPopMatrix;	638	glPopMatrix;
578	}	639	}
…		…
581	my ($self) = @_;	642	my ($self) = @_;
582		643
583	warn "no draw defined for $self\n";	644	warn "no draw defined for $self\n";
584	}	645	}
585		646
		647	my $cntx;#d#
586	sub DESTROY {	648	sub DESTROY {
587	my ($self) = @_;	649	my ($self) = @_;
588		650
589	delete $WIDGET{$self+0};	651	return if CFPlus::in_destruct;
590		652
591	eval { $self->destroy };	653	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	654	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		655
		656	delete $WIDGET{$self+0};
593	}	657	}
594		658
595	#############################################################################	659	#############################################################################
596		660
597	package CFClient::UI::DrawBG;	661	package CFPlus::UI::DrawBG;
598		662
599	our @ISA = CFClient::UI::Base::;	663	our @ISA = CFPlus::UI::Base::;
600		664
601	use strict;	665	use strict;
602	use CFClient::OpenGL;	666	use CFPlus::OpenGL;
603		667
604	sub new {	668	sub new {
605	my $class = shift;	669	my $class = shift;
606		670
607	# range [value, low, high, page]	671	# range [value, low, high, page]
…		…
638	}	702	}
639	}	703	}
640		704
641	#############################################################################	705	#############################################################################
642		706
643	package CFClient::UI::Empty;	707	package CFPlus::UI::Empty;
644		708
645	our @ISA = CFClient::UI::Base::;	709	our @ISA = CFPlus::UI::Base::;
646		710
647	sub new {	711	sub new {
648	my ($class, %arg) = @_;	712	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	713	$class->SUPER::new (can_events => 0, %arg);
650	}	714	}
…		…
657		721
658	sub draw { }	722	sub draw { }
659		723
660	#############################################################################	724	#############################################################################
661		725
662	package CFClient::UI::Container;	726	package CFPlus::UI::Container;
663		727
664	our @ISA = CFClient::UI::Base::;	728	our @ISA = CFPlus::UI::Base::;
665		729
666	sub new {	730	sub new {
667	my ($class, %arg) = @_;	731	my ($class, %arg) = @_;
668		732
669	my $children = delete $arg{children};	733	my $children = delete $arg{children};
…		…
678	if $children;	742	if $children;
679		743
680	$self	744	$self
681	}	745	}
682		746
		747	sub realloc {
		748	my ($self) = @_;
		749
		750	$self->{force_realloc} = 1;
		751	$self->{force_size_alloc} = 1;
		752	$self->SUPER::realloc;
		753	}
		754
683	sub add {	755	sub add {
684	my ($self, @widgets) = @_;	756	my ($self, @widgets) = @_;
685		757
686	$_->set_parent ($self)	758	$_->set_parent ($self)
687	for @widgets;	759	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	819	$_->draw for @{$self->{children}};
748	}	820	}
749		821
750	#############################################################################	822	#############################################################################
751		823
752	package CFClient::UI::Bin;	824	package CFPlus::UI::Bin;
753		825
754	our @ISA = CFClient::UI::Container::;	826	our @ISA = CFPlus::UI::Container::;
755		827
756	sub new {	828	sub new {
757	my ($class, %arg) = @_;	829	my ($class, %arg) = @_;
758		830
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	831	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		832
761	$class->SUPER::new (children => [$child], %arg)	833	$class->SUPER::new (children => [$child], %arg)
762	}	834	}
763		835
764	sub add {	836	sub add {
…		…
771	sub remove {	843	sub remove {
772	my ($self, $widget) = @_;	844	my ($self, $widget) = @_;
773		845
774	$self->SUPER::remove ($widget);	846	$self->SUPER::remove ($widget);
775		847
776	$self->{children} = [new CFClient::UI::Empty]	848	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	849	unless @{$self->{children}};
778	}	850	}
779		851
780	sub child { $_[0]->{children}[0] }	852	sub child { $_[0]->{children}[0] }
781		853
…		…
793		865
794	#############################################################################	866	#############################################################################
795		867
796	# back-buffered drawing area	868	# back-buffered drawing area
797		869
798	package CFClient::UI::Window;	870	package CFPlus::UI::Window;
799		871
800	our @ISA = CFClient::UI::Bin::;	872	our @ISA = CFPlus::UI::Bin::;
801		873
802	use CFClient::OpenGL;	874	use CFPlus::OpenGL;
803		875
804	sub new {	876	sub new {
805	my ($class, %arg) = @_;	877	my ($class, %arg) = @_;
806		878
807	my $self = $class->SUPER::new (%arg);	879	my $self = $class->SUPER::new (%arg);
…		…
829	}	901	}
830		902
831	sub render_child {	903	sub render_child {
832	my ($self) = @_;	904	my ($self) = @_;
833		905
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	906	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	907	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	908	glClear GL_COLOR_BUFFER_BIT;
837		909
838	{	910	{
839	package CFClient::UI::Base;	911	package CFPlus::UI::Base;
840		912
841	($draw_x, $draw_y, $draw_w, $draw_h) =	913	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	914	(0, 0, $self->{w}, $self->{h});
		915
		916	$self->_render;
843	}	917	}
844
845	$self->_render;
846	};	918	};
847	}	919	}
848		920
849	sub _draw {	921	sub _draw {
850	my ($self) = @_;	922	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		923
854	my $tex = $self->{texture}	924	my $tex = $self->{texture}
855	or return;	925	or return;
856		926
857	glEnable GL_TEXTURE_2D;	927	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	928	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	929	glColor 0, 0, 0, 1;
860		930
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	931	$tex->draw_quad_alpha_premultiplied (0, 0);
862		932
863	glDisable GL_TEXTURE_2D;	933	glDisable GL_TEXTURE_2D;
864	}	934	}
865		935
866	#############################################################################	936	#############################################################################
867		937
868	package CFClient::UI::ViewPort;	938	package CFPlus::UI::ViewPort;
869		939
		940	use List::Util qw(min max);
		941
870	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
871		943
872	sub new {	944	sub new {
873	my $class = shift;	945	my $class = shift;
874		946
875	$class->SUPER::new (	947	$class->SUPER::new (
…		…
905	}	977	}
906		978
907	sub set_offset {	979	sub set_offset {
908	my ($self, $x, $y) = @_;	980	my ($self, $x, $y) = @_;
909		981
		982	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		983	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		984
		985	if ($x != $self->{view_x} or $y != $self->{view_y}) {
910	$self->{view_x} = int $x;	986	$self->{view_x} = $x;
911	$self->{view_y} = int $y;	987	$self->{view_y} = $y;
912		988
		989	$self->emit (changed => $x, $y);
913	$self->update;	990	$self->update;
		991	}
914	}	992	}
915		993
916	# hmm, this does not work for topleft of $self... but we should not ask for that	994	# hmm, this does not work for topleft of $self... but we should not ask for that
917	sub coord2local {	995	sub coord2local {
918	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
…		…
933	my ($self, $x, $y) = @_;	1011	my ($self, $x, $y) = @_;
934		1012
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1013	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1014	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1015	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1016	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	1017	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1018	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1019	}
942	}	1020	}
943		1021
944	sub _render {	1022	sub _render {
945	my ($self) = @_;	1023	my ($self) = @_;
946		1024
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1025	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1026	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1027
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1028	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1029
952	$self->SUPER::_render;	1030	$self->SUPER::_render;
953	}	1031	}
954		1032
955	#############################################################################	1033	#############################################################################
956		1034
957	package CFClient::UI::ScrolledWindow;	1035	package CFPlus::UI::ScrolledWindow;
958		1036
959	our @ISA = CFClient::UI::HBox::;	1037	our @ISA = CFPlus::UI::Table::;
960		1038
961	sub new {	1039	sub new {
962	my ($class, %arg) = @_;	1040	my ($class, %arg) = @_;
963		1041
964	my $child = delete $arg{child};	1042	my $child = delete $arg{child};
965		1043
966	my $self;	1044	my $self;
967		1045
968	my $slider = new CFClient::UI::Slider	1046	my $hslider = new CFPlus::UI::Slider
		1047	vertical => 0,
		1048	range => [0, 0, 1, 0.01], # HACK fix
		1049	on_changed => sub {
		1050	$self->{hpos} = $_[1];
		1051	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1052	},
		1053	;
		1054
		1055	my $vslider = new CFPlus::UI::Slider
969	vertical => 1,	1056	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1057	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1058	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1059	$self->{vpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973	},	1061	},
974	;	1062	;
975		1063
976	$self = $class->SUPER::new (	1064	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1065	scroll_x => 0,
		1066	scroll_y => 1,
		1067	can_events => 1,
978	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
979	%arg,	1072	%arg,
980	);	1073	);
981		1074
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1075	$self->{vp} = new CFPlus::UI::ViewPort
		1076	expand => 1,
		1077	scroll_x => $self->{scroll_x},
		1078	scroll_y => $self->{scroll_y},
		1079	on_changed => sub {
		1080	my ($vp, $x, $y) = @_;
		1081
		1082	$vp->{parent}{hslider}->set_value ($x);
		1083	$vp->{parent}{vslider}->set_value ($y);
		1084
		1085	0
		1086	},
		1087	;
		1088
		1089	$self->SUPER::add_at (0, 0, $self->{vp});
		1090
983	$self->add ($child) if $child;	1091	$self->add ($child) if $child;
984		1092
985	$self	1093	$self
986	}	1094	}
		1095
		1096	#TODO# update range on size_allocate depending on child
987		1097
988	sub add {	1098	sub add {
989	my ($self, $widget) = @_;	1099	my ($self, $widget) = @_;
990		1100
991	$self->{vp}->add ($self->{child} = $widget);	1101	$self->{vp}->add ($self->{child} = $widget);
992	}	1102	}
993		1103
		1104	sub update_slider {
		1105	my ($self) = @_;
		1106
		1107	my $child = ($self->{vp} or return)->child;
		1108
		1109	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1111
		1112	my $visible = $w1 > $w2;
		1113	if ($visible != $self->{hslider}{visible}) {
		1114	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1115	: $self->{hslider}->hide;
		1116	}
		1117
		1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1124	: $self->{vslider}->hide;
		1125	}
		1126	}
		1127
994	sub update {	1128	sub update {
995	my ($self) = @_;	1129	my ($self) = @_;
996		1130
		1131	$self->update_slider;
997	$self->SUPER::update;	1132	$self->SUPER::update;
		1133	}
998		1134
999	# todo: overwrite size_allocate of child	1135	sub invoke_mouse_wheel {
1000	my $child = $self->{vp}->child;	1136	my ($self, $ev) = @_;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1137
		1138	return 0 unless $ev->{dy}; # only vertical movements for now
		1139
		1140	$self->{vslider}->emit (mouse_wheel => $ev);
		1141
		1142	1
		1143	}
		1144
		1145	sub invoke_button_down {
		1146	my ($self, $ev, $x, $y) = @_;
		1147
		1148	if ($ev->{button} == 2) {
		1149	$self->grab_focus;
		1150
		1151	my $ox = $self->{vp}{view_x} + $ev->{x};
		1152	my $oy = $self->{vp}{view_y} + $ev->{y};
		1153
		1154	$self->{motion} = sub {
		1155	my ($ev, $x, $y) = @_;
		1156
		1157	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1158	$self->update;
		1159	};
		1160
		1161	return 1;
		1162	}
		1163
		1164	0
		1165	}
		1166
		1167	sub invoke_button_up {
		1168	my ($self, $ev, $x, $y) = @_;
		1169
		1170	if (delete $self->{motion}) {
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_mouse_motion {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if ($self->{motion}) {
		1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
		1184
		1185	0
1002	}	1186	}
1003		1187
1004	sub invoke_size_allocate {	1188	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1006		1190
1007	my $child = $self->{vp}->child;	1191	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1192	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1193	}
1012		1194
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1195	#############################################################################
1017		1196
1018	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1019		1198
1020	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1021		1200
1022	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1023		1202
1024	sub new {	1203	sub new {
1025	my $class = shift;	1204	my $class = shift;
1026		1205
1027	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1232	$self->SUPER::_draw;
1054	}	1233	}
1055		1234
1056	#############################################################################	1235	#############################################################################
1057		1236
1058	package CFClient::UI::FancyFrame;	1237	package CFPlus::UI::FancyFrame;
1059		1238
1060	our @ISA = CFClient::UI::Bin::;	1239	our @ISA = CFPlus::UI::Bin::;
1061		1240
1062	use CFClient::OpenGL;	1241	use CFPlus::OpenGL;
		1242
		1243	sub new {
		1244	my ($class, %arg) = @_;
		1245
		1246	if ((exists $arg{label}) && !ref $arg{label}) {
		1247	$arg{label} = new CFPlus::UI::Label
		1248	align => 1,
		1249	valign => 0,
		1250	text => $arg{label},
		1251	fontsize => ($arg{border} || 0.8) * 0.75;
		1252	}
		1253
		1254	my $self = $class->SUPER::new (
		1255	# label => "",
		1256	fg => [0.6, 0.3, 0.1],
		1257	border => 0.8,
		1258	style => 'single',
		1259	%arg,
		1260	);
		1261
		1262	$self
		1263	}
		1264
		1265	sub add {
		1266	my ($self, @widgets) = @_;
		1267
		1268	$self->SUPER::add (@widgets);
		1269	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1270	}
		1271
		1272	sub border {
		1273	int $_[0]{border} * $::FONTSIZE
		1274	}
		1275
		1276	sub size_request {
		1277	my ($self) = @_;
		1278
		1279	($self->{label_w}, undef) = $self->{label}->size_request
		1280	if $self->{label};
		1281
		1282	my ($w, $h) = $self->SUPER::size_request;
		1283
		1284	(
		1285	$w + $self->border * 2,
		1286	$h + $self->border * 2,
		1287	)
		1288	}
		1289
		1290	sub invoke_size_allocate {
		1291	my ($self, $w, $h) = @_;
		1292
		1293	my $border = $self->border;
		1294
		1295	$w -= List::Util::max 0, $border * 2;
		1296	$h -= List::Util::max 0, $border * 2;
		1297
		1298	if (my $label = $self->{label}) {
		1299	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1300	$label->{h} = List::Util::min $h, $border;
		1301	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1302	}
		1303
		1304	$self->child->configure ($border, $border, $w, $h);
		1305
		1306	1
		1307	}
		1308
		1309	sub _draw {
		1310	my ($self) = @_;
		1311
		1312	my $child = $self->{children}[0];
		1313
		1314	my $border = $self->border;
		1315	my ($w, $h) = ($self->{w}, $self->{h});
		1316
		1317	$child->draw;
		1318
		1319	glColor @{$self->{fg}};
		1320	glBegin GL_LINE_STRIP;
		1321	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1322	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1323	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1324	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1325	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1327	glEnd;
		1328
		1329	if ($self->{label}) {
		1330	glTranslate $border * 2, 0;
		1331	$self->{label}->_draw;
		1332	}
		1333	}
		1334
		1335	#############################################################################
		1336
		1337	package CFPlus::UI::Toplevel;
		1338
		1339	our @ISA = CFPlus::UI::Bin::;
		1340
		1341	use CFPlus::OpenGL;
1063		1342
1064	my $bg =	1343	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1344	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1345	mipmap => 1, wrap => 1;
1067		1346
1068	my @border =	1347	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1348	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1349	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1350
		1351	my @icon =
		1352	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1353	qw(x1_move.png x1_resize.png);
1071		1354
1072	sub new {	1355	sub new {
1073	my ($class, %arg) = @_;	1356	my ($class, %arg) = @_;
1074		1357
1075	my $self = $class->SUPER::new (	1358	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1359	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1360	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1361	border => 0.6,
1079	can_events => 1,	1362	can_events => 1,
1080	min_w => 16,	1363	min_w => 64,
1081	min_h => 16,	1364	min_h => 32,
1082	%arg,	1365	%arg,
1083	);	1366	);
1084		1367
1085	$self->{title_widget} = new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1369	align => 0,
1087	valign => 1,	1370	valign => 1,
1088	text => $self->{title},	1371	text => $self->{title},
1089	fontsize => $self->{border},	1372	fontsize => $self->{border},
1090	if exists $self->{title};	1373	if exists $self->{title};
1091		1374
1092	if ($self->{has_close_button}) {	1375	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1376	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1377	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1378	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1379	on_activate => sub { $self->emit ("delete") };
1097		1380
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1381	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1382	}
1100		1383
1101	$self	1384	$self
1102	}	1385	}
1103		1386
1104	sub add {	1387	sub add {
1105	my ($self, @widgets) = @_;	1388	my ($self, @widgets) = @_;
1106		1389
1107	$self->SUPER::add (@widgets);	1390	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1391	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1393	}
1111		1394
1112	sub border {	1395	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1114	}	1397	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1430	$self->child->configure ($border, $border, $w, $h);
1148		1431
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1432	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1433	if $self->{close_button};
1151		1434
		1435	1
		1436	}
		1437
		1438	sub invoke_delete {
		1439	my ($self) = @_;
		1440
		1441	$self->hide;
		1442
1152	1	1443	1
1153	}	1444	}
1154		1445
1155	sub invoke_button_down {	1446	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1447	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1505	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1506
1216	! ! $self->{motion}	1507	! ! $self->{motion}
1217	}	1508	}
1218		1509
		1510	sub invoke_visibility_change {
		1511	my ($self, $visible) = @_;
		1512
		1513	delete $self->{motion} unless $visible;
		1514
		1515	0
		1516	}
		1517
1219	sub _draw {	1518	sub _draw {
1220	my ($self) = @_;	1519	my ($self) = @_;
1221		1520
1222	my $child = $self->{children}[0];	1521	my $child = $self->{children}[0];
1223		1522
…		…
1228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229		1528
1230	my $border = $self->border;	1529	my $border = $self->border;
1231		1530
1232	glColor @{ $self->{border_bg} };	1531	glColor @{ $self->{border_bg} };
1233	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1532	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1533	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1535	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1536
		1537	# move
		1538	my $w2 = ($w - $border) * .5;
		1539	my $h2 = ($h - $border) * .5;
		1540	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1541	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1542	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1543
		1544	# resize
		1545	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1546	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1547	unless $self->{has_close_button};
		1548	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237		1550
1238	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1551	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239	glColor @{ $self->{bg} };	1552	glColor @{ $self->{bg} };
1240		1553
1241	# TODO: repeat texture not scale	1554	# TODO: repeat texture not scale
…		…
1260	if $self->{close_button};	1573	if $self->{close_button};
1261	}	1574	}
1262		1575
1263	#############################################################################	1576	#############################################################################
1264		1577
1265	package CFClient::UI::Table;	1578	package CFPlus::UI::Table;
1266		1579
1267	our @ISA = CFClient::UI::Base::;	1580	our @ISA = CFPlus::UI::Base::;
1268		1581
1269	use List::Util qw(max sum);	1582	use List::Util qw(max sum);
1270		1583
1271	use CFClient::OpenGL;	1584	use CFPlus::OpenGL;
1272		1585
1273	sub new {	1586	sub new {
1274	my $class = shift;	1587	my $class = shift;
1275		1588
1276	$class->SUPER::new (	1589	$class->SUPER::new (
		1590	children => [],
1277	col_expand => [],	1591	col_expand => [],
		1592	row_expand => [],
1278	@_,	1593	@_,
1279	)	1594	)
1280	}	1595	}
1281		1596
1282	sub children {	1597	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1599	}
1285		1600
		1601	# TODO: store row/col info in child widget and use standard add/del
1286	sub add {	1602	sub add {
1287	my ($self, $x, $y, $child) = @_;	1603	my $self = shift;
1288		1604
		1605	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1606	$self->add_at (@_);
		1607	}
		1608
		1609	sub add_at {
		1610	my $self = shift;
		1611
		1612	while (@_) {
		1613	my ($col, $row, $child) = splice @_, 0, 3, ();
		1614
1289	$child->set_parent ($self);	1615	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1616	$self->{children}[$row][$col] = $child;
		1617	}
1291		1618
		1619	$self->{force_realloc} = 1;
		1620	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1621	$self->realloc;
1293	}	1622	}
1294		1623
1295	sub remove {	1624	sub remove {
1296	my ($self, $child) = @_;	1625	my ($self, $child) = @_;
1297		1626
1298	# TODO: not yet implemented	1627	for (@{ $self->{children} }) {
		1628	for (@{ $_ || [] }) {
		1629	$_ = undef if $_ == $child;
		1630	}
		1631	}
1299	}	1632	}
1300		1633
1301	# TODO: move to container class maybe? send children a signal on removal?	1634	# TODO: move to container class maybe? send children a signal on removal?
1302	sub clear {	1635	sub clear {
1303	my ($self) = @_;	1636	my ($self) = @_;
…		…
1352	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1353		1686
1354	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1355	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1356		1689
1357	# TODO: nicer code && do row_expand	1690	# TODO: nicer code
1358	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1359	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1360	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1361		1694
1362	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1696
1366	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1367	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1368		1706
1369	my $y;	1707	my $y;
1370		1708
1371	for my $r (0 .. $#{$self->{children}}) {	1709	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1710	my $row = $self->{children}[$r]
…		…
1415	}	1753	}
1416	}	1754	}
1417		1755
1418	#############################################################################	1756	#############################################################################
1419		1757
1420	package CFClient::UI::Box;	1758	package CFPlus::UI::Fixed;
1421		1759
		1760	use List::Util qw(min max);
		1761
1422	our @ISA = CFClient::UI::Container::;	1762	our @ISA = CFPlus::UI::Container::;
		1763
		1764	sub add {
		1765	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1766
		1767	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1768	$self->SUPER::add ($child);
		1769	}
		1770
		1771	sub _scale($$$) {
		1772	my ($mode, $val, $max) = @_;
		1773
		1774	$mode eq "abs" ? $val
		1775	: $mode eq "rel" ? $val * $max
		1776	: 0
		1777	}
		1778
		1779	sub size_request {
		1780	my ($self) = @_;
		1781
		1782	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1783
		1784	# determine overall size by querying abs widgets
		1785	for my $child ($self->visible_children) {
		1786	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1787
		1788	if ($pos eq "abs") {
		1789	$w = _scale $size, $w, $child->{req_w};
		1790	$h = _scale $size, $h, $child->{req_h};
		1791
		1792	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1793	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1794	}
		1795	}
		1796
		1797	my $W = $x2 - $x1;
		1798	my $H = $y2 - $y1;
		1799
		1800	# now layout remaining widgets
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	if ($pos ne "abs") {
		1805	$x = _scale $pos, $x, $W;
		1806	$y = _scale $pos, $x, $H;
		1807	$w = _scale $size, $w, $child->{req_w};
		1808	$h = _scale $size, $h, $child->{req_h};
		1809
		1810	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1811	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1812	}
		1813	}
		1814
		1815	my $W = $x2 - $x1;
		1816	my $H = $y2 - $y1;
		1817
		1818	($W, $H)
		1819	}
		1820
		1821	sub invoke_size_allocate {
		1822	my ($self, $W, $H) = @_;
		1823
		1824	for my $child ($self->visible_children) {
		1825	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1826
		1827	$x = _scale $pos, $x, $W;
		1828	$y = _scale $pos, $x, $H;
		1829	$w = _scale $size, $w, $child->{req_w};
		1830	$h = _scale $size, $h, $child->{req_h};
		1831
		1832	$child->configure ($x, $y, $w, $h);
		1833	}
		1834
		1835	1
		1836	}
		1837
		1838	#############################################################################
		1839
		1840	package CFPlus::UI::Box;
		1841
		1842	our @ISA = CFPlus::UI::Container::;
1423		1843
1424	sub size_request {	1844	sub size_request {
1425	my ($self) = @_;	1845	my ($self) = @_;
1426		1846
1427	$self->{vertical}	1847	$self->{vertical}
…		…
1437		1857
1438	sub invoke_size_allocate {	1858	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1859	my ($self, $w, $h) = @_;
1440		1860
1441	my $space = $self->{vertical} ? $h : $w;	1861	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1862	my @children = $self->visible_children;
1443		1863
1444	my @req;	1864	my @req;
1445		1865
1446	if ($self->{homogeneous}) {	1866	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1867	@req = ($space / (@children || 1)) x @children;
1448	} else {	1868	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1869	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1870	my $req = List::Util::sum @req;
1451		1871
1452	if ($req > $space) {	1872	if ($req > $space) {
1453	# ah well, not enough space	1873	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1874	$_ *= $space / $req for @req;
1455	} else {	1875	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1876	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1877
1458	$space = ($space - $req) / $expand; # remaining space to give away	1878	$space = ($space - $req) / $expand; # remaining space to give away
1459		1879
1460	$req[$_] += $space * $children->[$_]{expand}	1880	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1881	for 0 .. $#children;
1462	}	1882	}
1463	}	1883	}
1464		1884
1465	CFClient::UI::harmonize \@req;	1885	CFPlus::UI::harmonize \@req;
1466		1886
1467	my $pos = 0;	1887	my $pos = 0;
1468	for (0 .. $#$children) {	1888	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1889	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1890	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1891
1472	$pos += $alloc;	1892	$pos += $alloc;
1473	}	1893	}
1474		1894
1475	1	1895	1
1476	}	1896	}
1477		1897
1478	#############################################################################	1898	#############################################################################
1479		1899
1480	package CFClient::UI::HBox;	1900	package CFPlus::UI::HBox;
1481		1901
1482	our @ISA = CFClient::UI::Box::;	1902	our @ISA = CFPlus::UI::Box::;
1483		1903
1484	sub new {	1904	sub new {
1485	my $class = shift;	1905	my $class = shift;
1486		1906
1487	$class->SUPER::new (	1907	$class->SUPER::new (
…		…
1490	)	1910	)
1491	}	1911	}
1492		1912
1493	#############################################################################	1913	#############################################################################
1494		1914
1495	package CFClient::UI::VBox;	1915	package CFPlus::UI::VBox;
1496		1916
1497	our @ISA = CFClient::UI::Box::;	1917	our @ISA = CFPlus::UI::Box::;
1498		1918
1499	sub new {	1919	sub new {
1500	my $class = shift;	1920	my $class = shift;
1501		1921
1502	$class->SUPER::new (	1922	$class->SUPER::new (
…		…
1505	)	1925	)
1506	}	1926	}
1507		1927
1508	#############################################################################	1928	#############################################################################
1509		1929
1510	package CFClient::UI::Label;	1930	package CFPlus::UI::Label;
1511		1931
1512	our @ISA = CFClient::UI::DrawBG::;	1932	our @ISA = CFPlus::UI::DrawBG::;
1513		1933
1514	use CFClient::OpenGL;	1934	use CFPlus::OpenGL;
1515		1935
1516	sub new {	1936	sub new {
1517	my ($class, %arg) = @_;	1937	my ($class, %arg) = @_;
1518		1938
1519	my $self = $class->SUPER::new (	1939	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1942	#active_bg => none
1523	#font => default_font	1943	#font => default_font
1524	#text => initial text	1944	#text => initial text
1525	#markup => initial narkup	1945	#markup => initial narkup
1526	#max_w => maximum pixel width	1946	#max_w => maximum pixel width
		1947	#style => 0, # render flags
1527	ellipsise => 3, # end	1948	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1949	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1950	fontsize => 1,
1530	align => -1,	1951	align => -1,
1531	valign => -1,	1952	valign => -1,
1532	padding_x => 2,	1953	padding_x => 2,
1533	padding_y => 2,	1954	padding_y => 2,
1534	can_events => 0,	1955	can_events => 0,
1535	%arg	1956	%arg
1536	);	1957	);
1537		1958
1538	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1960	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1961	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1962	$self->{template} = $layout;
1542	}	1963	}
1543		1964
1544	if (exists $self->{markup}) {	1965	if (exists $self->{markup}) {
…		…
1548	}	1969	}
1549		1970
1550	$self	1971	$self
1551	}	1972	}
1552		1973
1553	sub escape($) {
1554	local $_ = $_[0];
1555
1556	s/&/&amp;/g;
1557	s/>/&gt;/g;
1558	s/</&lt;/g;
1559
1560	$_
1561	}
1562
1563	sub update {	1974	sub update {
1564	my ($self) = @_;	1975	my ($self) = @_;
1565		1976
1566	delete $self->{texture};	1977	delete $self->{texture};
1567	$self->SUPER::update;	1978	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1989	my ($self, $text) = @_;
1579		1990
1580	return if $self->{text} eq "T$text";	1991	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1992	$self->{text} = "T$text";
1582		1993
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1994	$self->{layout}->set_text ($text);
1585		1995
1586	delete $self->{size_req};	1996	delete $self->{size_req};
1587	$self->realloc;	1997	$self->realloc;
1588	$self->update;	1998	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	2004	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	2005	$self->{text} = "M$markup";
1596		2006
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2007	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		2008
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	2009	$self->{layout}->set_markup ($markup);
1601		2010
1602	delete $self->{size_req};	2011	delete $self->{size_req};
1603	$self->realloc;	2012	$self->realloc;
1604	$self->update;	2013	$self->update;
…		…
1616		2025
1617	my ($w, $h) = $self->{layout}->size;	2026	my ($w, $h) = $self->{layout}->size;
1618		2027
1619	if (exists $self->{template}) {	2028	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	2029	$self->{template}->set_font ($self->{font}) if $self->{font};
		2030	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		2032
1623	my ($w2, $h2) = $self->{template}->size;	2033	my ($w2, $h2) = $self->{template}->size;
1624		2034
1625	$w = List::Util::max $w, $w2;	2035	$w = List::Util::max $w, $w2;
…		…
1630	};	2040	};
1631		2041
1632	@{ $self->{size_req} }	2042	@{ $self->{size_req} }
1633	}	2043	}
1634		2044
		2045	sub baseline_shift {
		2046	$_[0]{layout}->descent
		2047	}
		2048
1635	sub invoke_size_allocate {	2049	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	2050	my ($self, $w, $h) = @_;
1637		2051
1638	delete $self->{ox};	2052	delete $self->{ox};
1639		2053
…		…
1645		2059
1646	sub set_fontsize {	2060	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	2061	my ($self, $fontsize) = @_;
1648		2062
1649	$self->{fontsize} = $fontsize;	2063	$self->{fontsize} = $fontsize;
		2064	delete $self->{size_req};
1650	delete $self->{texture};	2065	delete $self->{texture};
1651		2066
1652	$self->realloc;	2067	$self->realloc;
1653	}	2068	}
1654		2069
1655	sub reconfigure {	2070	sub reconfigure {
1656	my ($self) = @_;	2071	my ($self) = @_;
1657		2072
1658	delete $self->{size_req};	2073	delete $self->{size_req};
		2074	delete $self->{texture};
1659		2075
1660	$self->SUPER::reconfigure;	2076	$self->SUPER::reconfigure;
1661	}	2077	}
1662		2078
1663	sub _draw {	2079	sub _draw {
1664	my ($self) = @_;	2080	my ($self) = @_;
1665		2081
1666	$self->SUPER::_draw; # draw background, if applicable	2082	$self->SUPER::_draw; # draw background, if applicable
1667		2083
1668	my $tex = $self->{texture} ||= do {	2084	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	2085	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	2086	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	2087	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	2088	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2089	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2090	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		2091
1676	new_from_layout CFClient::Texture $self->{layout}	2092	[$self->{layout}->size]
1677	};	2093	};
1678		2094
1679	unless (exists $self->{ox}) {	2095	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2096	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2097	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	2098	: ($self->{w} - $size->[0]) * 0.5);
1683		2099
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	2102	: ($self->{h} - $size->[1]) * 0.5);
1687	};	2103	};
1688		2104
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2105	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2106	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		2107
1694	if ($tex->{format} == GL_ALPHA) {	2108	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696	glColor @{$self->{fg}};
1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698	} else {
1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	2109	}
1705		2110
1706	#############################################################################	2111	#############################################################################
1707		2112
1708	package CFClient::UI::EntryBase;	2113	package CFPlus::UI::EntryBase;
1709		2114
1710	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1711		2116
1712	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1713		2118
1714	sub new {	2119	sub new {
1715	my $class = shift;	2120	my $class = shift;
1716		2121
1717	$class->SUPER::new (	2122	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	2126	active_fg => [0, 0, 0],
1722	can_hover => 1,	2127	can_hover => 1,
1723	can_focus => 1,	2128	can_focus => 1,
1724	valign => 0,	2129	valign => 0,
1725	can_events => 1,	2130	can_events => 1,
		2131	ellipsise => 0,
1726	#text => ...	2132	#text => ...
1727	#hidden => "*",	2133	#hidden => "*",
1728	@_	2134	@_
1729	)	2135	)
1730	}	2136	}
…		…
1775	my $sym = $ev->{sym};	2181	my $sym = $ev->{sym};
1776	my $uni = $ev->{unicode};	2182	my $uni = $ev->{unicode};
1777		2183
1778	my $text = $self->get_text;	2184	my $text = $self->get_text;
1779		2185
		2186	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2187
1780	if ($uni == 8) {	2188	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2189	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	2190	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	2191	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	2192	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	2193	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	2194	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	2195	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	2196	} elsif ($sym == CFPlus::SDLK_HOME) {
		2197	# what a hack
		2198	$self->{cursor} =
		2199	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2200	? length $1
		2201	: 0;
		2202	} elsif ($sym == CFPlus::SDLK_END) {
		2203	# uh, again
		2204	$self->{cursor} =
		2205	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2206	? $self->{cursor} + length $1
		2207	: length $self->{text};
		2208	} elsif ($uni == 21) { # ctrl-u
		2209	$text = "";
1789	$self->{cursor} = 0;	2210	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	2211	} elsif ($uni == 27) {
1793	$self->emit ('escape');	2212	$self->emit ('escape');
1794	} elsif ($uni) {	2213	} elsif ($uni == 0x0d) {
		2214	substr $text, $self->{cursor}++, 0, "\012";
		2215	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2216	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2217	} else {
1797	return 0;	2218	return 0;
1798	}	2219	}
1799		2220
1800	$self->_set_text ($text);	2221	$self->_set_text ($text);
1801		2222
1802	$self->realloc;	2223	$self->realloc;
		2224	$self->update;
1803		2225
1804	1	2226	1
1805	}	2227	}
1806		2228
1807	sub invoke_focus_in {	2229	sub invoke_focus_in {
…		…
1819		2241
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2242	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2243
1822	# byte-index to char-index	2244	# byte-index to char-index
1823	my $text = $self->{text};	2245	my $text = $self->{text};
1824	utf8::encode $text;	2246	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2247	$self->{cursor} = length $text;
1826		2248
1827	$self->_set_text ($self->{text});	2249	$self->_set_text ($self->{text});
1828	$self->update;	2250	$self->update;
1829		2251
1830	1	2252	1
…		…
1869	utf8::encode $text;	2291	utf8::encode $text;
1870		2292
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2293	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2294	}
1873		2295
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2296	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2297	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2298	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2299	glEnd;
1879	}	2300	}
1880	}	2301	}
1881		2302
		2303	#############################################################################
		2304
1882	package CFClient::UI::Entry;	2305	package CFPlus::UI::Entry;
1883		2306
1884	our @ISA = CFClient::UI::EntryBase::;	2307	our @ISA = CFPlus::UI::EntryBase::;
1885		2308
1886	use CFClient::OpenGL;	2309	use CFPlus::OpenGL;
1887		2310
1888	sub invoke_key_down {	2311	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2312	my ($self, $ev) = @_;
1890		2313
1891	my $sym = $ev->{sym};	2314	my $sym = $ev->{sym};
1892		2315
1893	if ($sym == 13) {	2316	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2317	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2318	my $txt = $self->get_text;
		2319
1896	$self->{history_pointer} = -1;	2320	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2321	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2322	$self->emit (activate => $txt);
1899	$self->update;	2323	$self->update;
1900		2324
1901	} elsif ($sym == CFClient::SDLK_UP) {	2325	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2326	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2327	$self->{history_saveback} = $self->get_text;
1904	}	2328	}
1905	if (@{$self->{history} || []} > 0) {	2329	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2330	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2332	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2333	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2334	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2335	}
1912		2336
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2337	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2338	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2339	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2340
1917	if ($self->{history_pointer} >= 0) {	2341	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2342	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2351	1
1928	}	2352	}
1929		2353
1930	#############################################################################	2354	#############################################################################
1931		2355
		2356	package CFPlus::UI::TextEdit;
		2357
		2358	our @ISA = CFPlus::UI::EntryBase::;
		2359
		2360	use CFPlus::OpenGL;
		2361
		2362	sub move_cursor_ver {
		2363	my ($self, $dy) = @_;
		2364
		2365	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2366
		2367	$y += $dy;
		2368
		2369	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2370	$self->{cursor} = $index;
		2371	delete $self->{cur_h};
		2372	$self->update;
		2373	return;
		2374	}
		2375	}
		2376
		2377	sub invoke_key_down {
		2378	my ($self, $ev) = @_;
		2379
		2380	my $sym = $ev->{sym};
		2381
		2382	if ($sym == CFPlus::SDLK_UP) {
		2383	$self->move_cursor_ver (-1);
		2384	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2385	$self->move_cursor_ver (+1);
		2386	} else {
		2387	return $self->SUPER::invoke_key_down ($ev)
		2388	}
		2389
		2390	1
		2391	}
		2392
		2393	#############################################################################
		2394
1932	package CFClient::UI::Button;	2395	package CFPlus::UI::Button;
1933		2396
1934	our @ISA = CFClient::UI::Label::;	2397	our @ISA = CFPlus::UI::Label::;
1935		2398
1936	use CFClient::OpenGL;	2399	use CFPlus::OpenGL;
1937		2400
1938	my @tex =	2401	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2402	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2403	qw(b1_button_inactive.png b1_button_active.png);
1941		2404
1942	sub new {	2405	sub new {
1943	my $class = shift;	2406	my $class = shift;
1944		2407
1945	$class->SUPER::new (	2408	$class->SUPER::new (
1946	padding_x => 4,	2409	padding_x => 4,
1947	padding_y => 4,	2410	padding_y => 4,
1948	fg => [1, 1, 1],	2411	fg => [1.0, 1.0, 1.0],
1949	active_fg => [0, 0, 1],	2412	active_fg => [0.8, 0.8, 0.8],
1950	can_hover => 1,	2413	can_hover => 1,
1951	align => 0,	2414	align => 0,
1952	valign => 0,	2415	valign => 0,
1953	can_events => 1,	2416	can_events => 1,
1954	@_	2417	@_
…		…
1972		2435
1973	glEnable GL_TEXTURE_2D;	2436	glEnable GL_TEXTURE_2D;
1974	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975	glColor 0, 0, 0, 1;	2438	glColor 0, 0, 0, 1;
1976		2439
		2440	my $tex = $tex[$GRAB == $self];
1977	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2441	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1978		2442
1979	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1980		2444
1981	$self->SUPER::_draw;	2445	$self->SUPER::_draw;
1982	}	2446	}
1983		2447
1984	#############################################################################	2448	#############################################################################
1985		2449
		2450	package CFPlus::UI::CheckBox;
		2451
		2452	our @ISA = CFPlus::UI::DrawBG::;
		2453
		2454	my @tex =
		2455	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2456	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2457
		2458	use CFPlus::OpenGL;
		2459
		2460	sub new {
		2461	my $class = shift;
		2462
		2463	$class->SUPER::new (
		2464	padding_x => 2,
		2465	padding_y => 2,
		2466	fg => [1, 1, 1],
		2467	active_fg => [1, 1, 0],
		2468	bg => [0, 0, 0, 0.2],
		2469	active_bg => [1, 1, 1, 0.5],
		2470	state => 0,
		2471	can_hover => 1,
		2472	@_
		2473	)
		2474	}
		2475
		2476	sub size_request {
		2477	my ($self) = @_;
		2478
		2479	(6) x 2
		2480	}
		2481
		2482	sub toggle {
		2483	my ($self) = @_;
		2484
		2485	$self->{state} = !$self->{state};
		2486	$self->emit (changed => $self->{state});
		2487	$self->update;
		2488	}
		2489
		2490	sub invoke_button_down {
		2491	my ($self, $ev, $x, $y) = @_;
		2492
		2493	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2494	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2495	$self->toggle;
		2496	} else {
		2497	return 0
		2498	}
		2499
		2500	1
		2501	}
		2502
		2503	sub _draw {
		2504	my ($self) = @_;
		2505
		2506	$self->SUPER::_draw;
		2507
		2508	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2509
		2510	my ($w, $h) = @$self{qw(w h)};
		2511
		2512	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2513
		2514	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2515
		2516	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2517
		2518	glEnable GL_TEXTURE_2D;
		2519	$tex->draw_quad_alpha (0, 0, $s, $s);
		2520	glDisable GL_TEXTURE_2D;
		2521	}
		2522
		2523	#############################################################################
		2524
		2525	package CFPlus::UI::Image;
		2526
		2527	our @ISA = CFPlus::UI::Base::;
		2528
		2529	use CFPlus::OpenGL;
		2530
		2531	our %texture_cache;
		2532
		2533	sub new {
		2534	my $class = shift;
		2535
		2536	my $self = $class->SUPER::new (
		2537	can_events => 0,
		2538	@_,
		2539	);
		2540
		2541	$self->{path} || $self->{tex}
		2542	or Carp::croak "'path' or 'tex' attributes required";
		2543
		2544	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2545	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2546
		2547	CFPlus::weaken $texture_cache{$self->{path}};
		2548
		2549	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2550
		2551	$self
		2552	}
		2553
		2554	sub STORABLE_freeze {
		2555	my ($self, $cloning) = @_;
		2556
		2557	$self->{path}
		2558	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2559
		2560	$self->{path}
		2561	}
		2562
		2563	sub STORABLE_attach {
		2564	my ($self, $cloning, $path) = @_;
		2565
		2566	$self->new (path => $path)
		2567	}
		2568
		2569	sub size_request {
		2570	my ($self) = @_;
		2571
		2572	($self->{tex}{w}, $self->{tex}{h})
		2573	}
		2574
		2575	sub _draw {
		2576	my ($self) = @_;
		2577
		2578	my $tex = $self->{tex};
		2579
		2580	my ($w, $h) = ($self->{w}, $self->{h});
		2581
		2582	if ($self->{rot90}) {
		2583	glRotate 90, 0, 0, 1;
		2584	glTranslate 0, -$self->{w}, 0;
		2585
		2586	($w, $h) = ($h, $w);
		2587	}
		2588
		2589	glEnable GL_TEXTURE_2D;
		2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2591
		2592	$tex->draw_quad (0, 0, $w, $h);
		2593
		2594	glDisable GL_TEXTURE_2D;
		2595	}
		2596
		2597	#############################################################################
		2598
1986	package CFClient::UI::ImageButton;	2599	package CFPlus::UI::ImageButton;
1987		2600
1988	our @ISA = CFClient::UI::Image::;	2601	our @ISA = CFPlus::UI::Image::;
1989		2602
1990	use CFClient::OpenGL;	2603	use CFPlus::OpenGL;
1991		2604
1992	my %textures;	2605	my %textures;
1993		2606
1994	sub new {	2607	sub new {
1995	my $class = shift;	2608	my $class = shift;
…		…
2017	1	2630	1
2018	}	2631	}
2019		2632
2020	#############################################################################	2633	#############################################################################
2021		2634
2022	package CFClient::UI::CheckBox;
2023
2024	our @ISA = CFClient::UI::DrawBG::;
2025
2026	my @tex =
2027	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030	use CFClient::OpenGL;
2031
2032	sub new {
2033	my $class = shift;
2034
2035	$class->SUPER::new (
2036	padding_x => 2,
2037	padding_y => 2,
2038	fg => [1, 1, 1],
2039	active_fg => [1, 1, 0],
2040	bg => [0, 0, 0, 0.2],
2041	active_bg => [1, 1, 1, 0.5],
2042	state => 0,
2043	can_hover => 1,
2044	@_
2045	)
2046	}
2047
2048	sub size_request {
2049	my ($self) = @_;
2050
2051	(6) x 2
2052	}
2053
2054	sub invoke_button_down {
2055	my ($self, $ev, $x, $y) = @_;
2056
2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059	$self->{state} = !$self->{state};
2060	$self->emit (changed => $self->{state});
2061	} else {
2062	return 0
2063	}
2064
2065	1
2066	}
2067
2068	sub _draw {
2069	my ($self) = @_;
2070
2071	$self->SUPER::_draw;
2072
2073	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075	my ($w, $h) = @$self{qw(w h)};
2076
2077	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081	my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083	glEnable GL_TEXTURE_2D;
2084	$tex->draw_quad_alpha (0, 0, $s, $s);
2085	glDisable GL_TEXTURE_2D;
2086	}
2087
2088	#############################################################################
2089
2090	package CFClient::UI::Image;	2635	package CFPlus::UI::VGauge;
2091		2636
2092	our @ISA = CFClient::UI::Base::;	2637	our @ISA = CFPlus::UI::Base::;
2093
2094	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096
2097	our %loaded_images;
2098
2099	sub new {
2100	my $class = shift;
2101
2102	my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106	$loaded_images{$self->{image}} ||=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111	Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114
2115	$self
2116	}
2117
2118	sub size_request {
2119	my ($self) = @_;
2120
2121	($self->{tex}->{w}, $self->{tex}->{h})
2122	}
2123
2124	sub _draw {
2125	my ($self) = @_;
2126
2127	my $tex = $self->{tex};
2128
2129	my ($w, $h) = ($self->{w}, $self->{h});
2130
2131	if ($self->{rot90}) {
2132	glRotate 90, 0, 0, 1;
2133	glTranslate 0, -$self->{w}, 0;
2134
2135	($w, $h) = ($h, $w);
2136	}
2137
2138	glEnable GL_TEXTURE_2D;
2139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141	$tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::VGauge;
2149
2150	our @ISA = CFClient::UI::Base::;
2151		2638
2152	use List::Util qw(min max);	2639	use List::Util qw(min max);
2153		2640
2154	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2155		2642
2156	my %tex = (	2643	my %tex = (
2157	food => [	2644	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2645	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2646	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2647	],
2161	grace => [	2648	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2649	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2650	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2651	],
2165	hp => [	2652	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2654	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2655	],
2169	mana => [	2656	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2658	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2659	],
2173	);	2660	);
2174		2661
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2662	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2722	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2723	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2724
2238	my $h1 = $self->{h} * (1 - $ycut1);	2725	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2726	my $h2 = $self->{h} * (1 - $ycut2);
		2727	my $h3 = $self->{h};
		2728
		2729	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2730
2241	glEnable GL_BLEND;	2731	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2732	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2733	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2734	glEnable GL_TEXTURE_2D;
…		…
2263		2753
2264	if ($t3) {	2754	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2755	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2756	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2758	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2761	glEnd;
2272	}	2762	}
2273		2763
2274	glDisable GL_BLEND;	2764	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2765	glDisable GL_TEXTURE_2D;
2276	}	2766	}
2277		2767
2278	#############################################################################	2768	#############################################################################
2279		2769
2280	package CFClient::UI::Gauge;	2770	package CFPlus::UI::Gauge;
2281		2771
2282	our @ISA = CFClient::UI::VBox::;	2772	our @ISA = CFPlus::UI::VBox::;
2283		2773
2284	sub new {	2774	sub new {
2285	my ($class, %arg) = @_;	2775	my ($class, %arg) = @_;
2286		2776
2287	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2779	can_hover => 1,
2290	can_events => 1,	2780	can_events => 1,
2291	%arg,	2781	%arg,
2292	);	2782	);
2293		2783
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2784	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2785	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2786	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2787
2298	$self	2788	$self
2299	}	2789	}
2300		2790
2301	sub set_fontsize {	2791	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2812	$self->{value}->set_text ($val);
2323	}	2813	}
2324		2814
2325	#############################################################################	2815	#############################################################################
2326		2816
2327	package CFClient::UI::Slider;	2817	package CFPlus::UI::Slider;
2328		2818
2329	use strict;	2819	use strict;
2330		2820
2331	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2332		2822
2333	our @ISA = CFClient::UI::DrawBG::;	2823	our @ISA = CFPlus::UI::DrawBG::;
2334		2824
2335	my @tex =	2825	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2826	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2827	qw(s1_slider.png s1_slider_bg.png);
2338		2828
2339	sub new {	2829	sub new {
2340	my $class = shift;	2830	my $class = shift;
2341		2831
…		…
2409		2899
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2900	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2901
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2903
2414	$self->mouse_motion ($ev, $x, $y)	2904	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2905	}
2416		2906
2417	sub invoke_mouse_motion {	2907	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2908	my ($self, $ev, $x, $y) = @_;
2419		2909
…		…
2428	} else {	2918	} else {
2429	return 0;	2919	return 0;
2430	}	2920	}
2431		2921
2432	1	2922	1
		2923	}
		2924
		2925	sub invoke_mouse_wheel {
		2926	my ($self, $ev) = @_;
		2927
		2928	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2929
		2930	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2931
		2932	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2933
		2934	! ! $delta
2433	}	2935	}
2434		2936
2435	sub update {	2937	sub update {
2436	my ($self) = @_;	2938	my ($self) = @_;
2437		2939
…		…
2486	glDisable GL_TEXTURE_2D;	2988	glDisable GL_TEXTURE_2D;
2487	}	2989	}
2488		2990
2489	#############################################################################	2991	#############################################################################
2490		2992
2491	package CFClient::UI::ValSlider;	2993	package CFPlus::UI::ValSlider;
2492		2994
2493	our @ISA = CFClient::UI::HBox::;	2995	our @ISA = CFPlus::UI::HBox::;
2494		2996
2495	sub new {	2997	sub new {
2496	my ($class, %arg) = @_;	2998	my ($class, %arg) = @_;
2497		2999
2498	my $range = delete $arg{range};	3000	my $range = delete $arg{range};
2499		3001
2500	my $self = $class->SUPER::new (	3002	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3003	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3004	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	3005	to_value => sub { shift },
2504	from_value => sub { shift },	3006	from_value => sub { shift },
2505	%arg,	3007	%arg,
2506	);	3008	);
2507		3009
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	3029	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	3030	sub set_value { shift->{slider}->set_value (@_) }
2529		3031
2530	#############################################################################	3032	#############################################################################
2531		3033
2532	package CFClient::UI::TextScroller;	3034	package CFPlus::UI::TextScroller;
2533		3035
2534	our @ISA = CFClient::UI::HBox::;	3036	our @ISA = CFPlus::UI::HBox::;
2535		3037
2536	use CFClient::OpenGL;	3038	use CFPlus::OpenGL;
2537		3039
2538	sub new {	3040	sub new {
2539	my $class = shift;	3041	my $class = shift;
2540		3042
2541	my $self = $class->SUPER::new (	3043	my $self = $class->SUPER::new (
2542	fontsize => 1,	3044	fontsize => 1,
2543	can_events => 0,	3045	can_events => 1,
2544	indent => 0,	3046	indent => 0,
2545	#font => default_font	3047	#font => default_font
2546	@_,	3048	@_,
2547		3049
2548	layout => (new CFClient::Layout 1),	3050	layout => (new CFPlus::Layout),
2549	par => [],	3051	par => [],
		3052	max_par => 0,
2550	height => 0,	3053	height => 0,
2551	children => [	3054	children => [
2552	(new CFClient::UI::Empty expand => 1),	3055	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	3056	(new CFPlus::UI::Slider vertical => 1),
2554	],	3057	],
2555	);	3058	);
2556		3059
2557	$self->{children}[1]->connect (changed => sub { $self->update });	3060	$self->{children}[1]->connect (changed => sub { $self->update });
2558		3061
…		…
2564		3067
2565	$self->{fontsize} = $fontsize;	3068	$self->{fontsize} = $fontsize;
2566	$self->reflow;	3069	$self->reflow;
2567	}	3070	}
2568		3071
		3072	sub size_request {
		3073	my ($self) = @_;
		3074
		3075	my ($empty, $slider) = @{ $self->{children} };
		3076
		3077	local $self->{children} = [$empty, $slider];
		3078	$self->SUPER::size_request
		3079	}
		3080
2569	sub invoke_size_allocate {	3081	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	3082	my ($self, $w, $h) = @_;
2571		3083
		3084	my ($empty, $slider, @other) = @{ $self->{children} };
		3085	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3086
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	3087	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3088	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	3089	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3090	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		3091
2577	$self->reflow;	3092	$self->reflow;
2578		3093
		3094	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	3095	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	3096	}
2581		3097
2582	sub text_size {	3098	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	3099	my ($self, $ev) = @_;
		3100
		3101	return 0 unless $ev->{dy}; # only vertical movements
		3102
		3103	$self->{children}[1]->emit (mouse_wheel => $ev);
		3104
		3105	1
		3106	}
		3107
		3108	sub get_layout {
		3109	my ($self, $para) = @_;
2584		3110
2585	my $layout = $self->{layout};	3111	my $layout = $self->{layout};
2586		3112
		3113	$layout->set_font ($self->{font}) if $self->{font};
		3114	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3115	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	3116	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3117	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	3118	$layout->set_markup ($para->{markup});
		3119
		3120	$layout->set_shapes (
		3121	map
		3122	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3123	@{$para->{widget}}
2591		3124	);
		3125
2592	$layout->size	3126	$layout
2593	}	3127	}
2594		3128
2595	sub reflow {	3129	sub reflow {
2596	my ($self) = @_;	3130	my ($self) = @_;
2597		3131
…		…
2604		3138
2605	# todo: base offset on lines or so, not on pixels	3139	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	3140	$self->{children}[1]->set_value ($offset);
2607	}	3141	}
2608		3142
		3143	sub current_paragraph {
		3144	my ($self) = @_;
		3145
		3146	$self->{top_paragraph} - 1
		3147	}
		3148
		3149	sub scroll_to {
		3150	my ($self, $para) = @_;
		3151
		3152	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3153
		3154	$self->{scroll_to} = $para;
		3155	$self->update;
		3156	}
		3157
2609	sub clear {	3158	sub clear {
2610	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	my (undef, undef, @other) = @{ $self->{children} };
		3162	$self->remove ($_) for @other;
2611		3163
2612	$self->{par} = [];	3164	$self->{par} = [];
2613	$self->{height} = 0;	3165	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3166	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	3167	}
2616		3168
2617	sub add_paragraph {	3169	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	3170	my $self = shift;
2619		3171
2620	for my $line (split /\n/, $text) {	3172	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	3173	$para = {
		3174	fg => [1, 1, 1, 1],
		3175	indent => 0,
		3176	markup => "",
		3177	widget => [],
		3178	ref $para ? %$para : (markup => $para),
		3179	w => 1e10,
		3180	wrapped => 1,
		3181	};
		3182
		3183	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3184	push @{$self->{par}}, $para;
		3185	}
		3186
		3187	if (my $max = $self->{max_par}) {
		3188	shift @{$self->{par}} while @{$self->{par}} > $max;
		3189	}
		3190
		3191	$self->{need_reflow}++;
		3192	$self->update;
		3193	}
		3194
		3195	sub scroll_to_bottom {
		3196	my ($self) = @_;
		3197
		3198	$self->{scroll_to} = $#{$self->{par}};
		3199	$self->update;
		3200	}
		3201
		3202	sub force_uptodate {
		3203	my ($self) = @_;
		3204
		3205	if (delete $self->{need_reflow}) {
		3206	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3207
		3208	my $height = 0;
		3209
		3210	for my $para (@{$self->{par}}) {
		3211	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3212	my $layout = $self->get_layout ($para);
		3213	my ($w, $h) = $layout->size;
		3214
		3215	$para->{w} = $w + $para->{indent};
		3216	$para->{h} = $h;
		3217	$para->{wrapped} = $layout->has_wrapped;
		3218	}
		3219
		3220	$para->{y} = $height;
		3221	$height += $para->{h};
		3222	}
		3223
2622	$self->{height} += $h;	3224	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3225	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3226
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3227	delete $self->{texture};
		3228	}
		3229
		3230	if (my $paridx = delete $self->{scroll_to}) {
		3231	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3232	}
2627	}	3233	}
2628		3234
2629	sub update {	3235	sub update {
2630	my ($self) = @_;	3236	my ($self) = @_;
2631		3237
…		…
2634	return unless $self->{h} > 0;	3240	return unless $self->{h} > 0;
2635		3241
2636	delete $self->{texture};	3242	delete $self->{texture};
2637		3243
2638	$ROOT->on_post_alloc ($self => sub {	3244	$ROOT->on_post_alloc ($self => sub {
		3245	$self->force_uptodate;
		3246
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3247	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3248
2641	if (delete $self->{need_reflow}) {
2642	my $height = 0;
2643
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {
2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650	$layout->set_width ($W - $_->[3]);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];
2655	$_->[1] = $h;
2656	}
2657
2658	$height += $_->[1];
2659	}
2660
2661	$self->{height} = $height;
2662
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665	delete $self->{texture};
2666	}
2667
2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3249	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3250	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3251	glClear GL_COLOR_BUFFER_BIT;
2671		3252
		3253	package CFPlus::UI::Base;
		3254	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3255	(0, 0, $self->{w}, $self->{h});
		3256
		3257	my $top = int $self->{children}[1]{range}[0];
		3258
		3259	my $paridx = 0;
		3260	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3261	my $top = int $self->{children}[1]{range}[0];
2673		3262
2674	my $y0 = $top;	3263	my $y0 = $top;
2675	my $y1 = $top + $H;	3264	my $y1 = $top + $H;
2676		3265
2677	my $y = 0;
2678
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687	for my $par (@{$self->{par}}) {	3266	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3267	my $h = $para->{h};
		3268	my $y = $para->{y};
2689		3269
2690	if ($y0 < $y + $h && $y < $y1) {	3270	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3271	my $layout = $self->get_layout ($para);
2692	$layout->set_width ($W - $par->[3]);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		3272
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3273	$layout->render ($para->{indent}, $y - $y0);
2697		3274
2698	glRasterPos $par->[3], $y - $y0;	3275	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3276	my @s = $layout->get_shapes;
		3277
		3278	for (@w) {
		3279	my ($dx, $dy) = splice @s, 0, 2, ();
		3280
		3281	$_->{x} = $dx + $para->{indent};
		3282	$_->{y} = $dy + $y - $y0;
		3283
		3284	$_->draw;
		3285	}
		3286	}
2700	}	3287	}
2701		3288
2702	$y += $h;	3289	$paridx++;
		3290	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3291	}
2704		3292
2705	glDisable GL_BLEND;	3293	$self->{top_paragraph} = $top_paragraph;
2706	};	3294	};
2707	});	3295	});
		3296	}
		3297
		3298	sub reconfigure {
		3299	my ($self) = @_;
		3300
		3301	$self->SUPER::reconfigure;
		3302
		3303	$_->{w} = 1e10 for @{ $self->{par} };
		3304	$self->reflow;
2708	}	3305	}
2709		3306
2710	sub _draw {	3307	sub _draw {
2711	my ($self) = @_;	3308	my ($self) = @_;
2712		3309
…		…
2715	glColor 0, 0, 0, 1;	3312	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3313	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3314	glDisable GL_TEXTURE_2D;
2718		3315
2719	$self->{children}[1]->draw;	3316	$self->{children}[1]->draw;
2720
2721	}	3317	}
2722		3318
2723	#############################################################################	3319	#############################################################################
2724		3320
2725	package CFClient::UI::Animator;	3321	package CFPlus::UI::Animator;
2726		3322
2727	use CFClient::OpenGL;	3323	use CFPlus::OpenGL;
2728		3324
2729	our @ISA = CFClient::UI::Bin::;	3325	our @ISA = CFPlus::UI::Bin::;
2730		3326
2731	sub moveto {	3327	sub moveto {
2732	my ($self, $x, $y) = @_;	3328	my ($self, $x, $y) = @_;
2733		3329
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3330	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3358	glPopMatrix;
2763	}	3359	}
2764		3360
2765	#############################################################################	3361	#############################################################################
2766		3362
2767	package CFClient::UI::Flopper;	3363	package CFPlus::UI::Flopper;
2768		3364
2769	our @ISA = CFClient::UI::Button::;	3365	our @ISA = CFPlus::UI::Button::;
2770		3366
2771	sub new {	3367	sub new {
2772	my $class = shift;	3368	my $class = shift;
2773		3369
2774	my $self = $class->SUPER::new (	3370	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3382	$self->{other}->toggle_visibility;
2787	}	3383	}
2788		3384
2789	#############################################################################	3385	#############################################################################
2790		3386
2791	package CFClient::UI::Tooltip;	3387	package CFPlus::UI::Tooltip;
2792		3388
2793	our @ISA = CFClient::UI::Bin::;	3389	our @ISA = CFPlus::UI::Bin::;
2794		3390
2795	use CFClient::OpenGL;	3391	use CFPlus::OpenGL;
2796		3392
2797	sub new {	3393	sub new {
2798	my $class = shift;	3394	my $class = shift;
2799		3395
2800	$class->SUPER::new (	3396	$class->SUPER::new (
…		…
2803	)	3399	)
2804	}	3400	}
2805		3401
2806	sub set_tooltip_from {	3402	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3403	my ($self, $widget) = @_;
		3404
		3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3406	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3407
2809	my $tooltip = $widget->{tooltip};	3408	my $tooltip = $widget->{tooltip};
2810		3409
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3410	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3411	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3415	}
2817		3416
2818	$tooltip =~ s/^\n+//;	3417	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3418	$tooltip =~ s/\n+$//;
2820		3419
2821	$self->add (new CFClient::UI::Label	3420	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3421	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3422	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3423	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3424	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3425	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3426	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3427	);
2829	}	3428	}
2830		3429
…		…
2849		3448
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3449	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3450	my $widget = $self->{owner}
2852	or return;	3451	or return;
2853		3452
		3453	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3454	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3455
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3456	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3457	if $x + $self->{w} > $self->{root}{w};
2858		3458
2859	$self->move_abs ($x, $y);	3459	$self->move_abs ($x, $y);
		3460	} else {
		3461	$self->hide;
		3462	}
2860	});	3463	});
2861	}	3464	}
2862		3465
2863	sub _draw {	3466	sub _draw {
2864	my ($self) = @_;	3467	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3491	$self->SUPER::_draw;
2889	}	3492	}
2890		3493
2891	#############################################################################	3494	#############################################################################
2892		3495
2893	package CFClient::UI::Face;	3496	package CFPlus::UI::Face;
2894		3497
2895	our @ISA = CFClient::UI::Base::;	3498	our @ISA = CFPlus::UI::DrawBG::;
2896		3499
2897	use CFClient::OpenGL;	3500	use CFPlus::OpenGL;
2898		3501
2899	sub new {	3502	sub new {
2900	my $class = shift;	3503	my $class = shift;
2901		3504
2902	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	size_w => 32,
		3507	size_h => 8,
2903	aspect => 1,	3508	aspect => 1,
2904	can_events => 0,	3509	can_events => 0,
2905	@_,	3510	@_,
2906	);	3511	);
2907		3512
2908	if ($self->{anim} && $self->{animspeed}) {	3513	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3514	CFPlus::weaken (my $widget = $self);
2910		3515
		3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2911	$self->{timer} = Event->timer (	3518	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3519	parked => 1,
2914	interval => $self->{animspeed},
2915	cb => sub {	3520	cb => sub {
		3521	return unless $::CONN && $widget;
		3522
2916	++$widget->{frame};	3523	++$widget->{frame};
		3524	$widget->update_face;
2917	$widget->update;	3525	$widget->update;
		3526
		3527	$widget->update_timer;
2918	},	3528	},
2919	);	3529	);
		3530
		3531	$self->update_face;
		3532	$self->update_timer;
2920	}	3533	}
2921		3534
2922	$self	3535	$self
2923	}	3536	}
2924		3537
		3538	sub update_timer {
		3539	my ($self) = @_;
		3540
		3541	return unless $self->{timer};
		3542
		3543	if ($self->{visible}) {
		3544	$self->{timer}->at (
		3545	$self->{anim_start}
		3546	+ $self->{animspeed}
		3547	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3548	);
		3549	$self->{timer}->start;
		3550	} else {
		3551	$self->{timer}->stop;
		3552	}
		3553	}
		3554
		3555	sub update_face {
		3556	my ($self) = @_;
		3557
		3558	return unless $::CONN;
		3559
		3560	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3561	if ($anim && @$anim) {
		3562	delete $self->{wait_face};
		3563	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3564	}
		3565	}
		3566	}
		3567
2925	sub size_request {	3568	sub size_request {
2926	(32, 8)	3569	my ($self) = @_;
		3570
		3571	if ($::CONN) {
		3572	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3573	if (my $tex = $::CONN->{texture}[$faceid]) {
		3574	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3575	} else {
		3576	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3577	$self->realloc;
		3578	});
		3579	}
		3580	}
		3581	}
		3582
		3583	($self->{size_w} || 8, $self->{size_h} || 8)
2927	}	3584	}
2928		3585
2929	sub update {	3586	sub update {
2930	my ($self) = @_;	3587	my ($self) = @_;
2931		3588
2932	return unless $self->{visible};	3589	return unless $self->{visible};
2933		3590
2934	$self->SUPER::update;	3591	$self->SUPER::update;
2935	}	3592	}
2936		3593
		3594	sub invoke_visibility_change {
		3595	my ($self) = @_;
		3596
		3597	$self->update_timer;
		3598
		3599	0
		3600	}
		3601
2937	sub _draw {	3602	sub _draw {
2938	my ($self) = @_;	3603	my ($self) = @_;
2939		3604
2940	return unless $::CONN;	3605	return unless $::CONN;
2941		3606
2942	my $face;	3607	$self->SUPER::_draw;
2943		3608
2944	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3609	my $faceid = $::CONN->{faceid}[$self->{face}]
2946		3610	or return;
2947	$face = $anim->[ $self->{frame} % @$anim ]
2948	if $anim && @$anim;
2949	}
2950		3611
2951	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3612	my $tex = $::CONN->{texture}[$faceid];
2952		3613
2953	if ($tex) {	3614	if ($tex) {
2954	glEnable GL_TEXTURE_2D;	3615	glEnable GL_TEXTURE_2D;
2955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2956	glColor 0, 0, 0, 1;	3617	glColor 0, 0, 0, 1;
…		…
2960	}	3621	}
2961		3622
2962	sub destroy {	3623	sub destroy {
2963	my ($self) = @_;	3624	my ($self) = @_;
2964		3625
2965	$self->{timer}->cancel	3626	(delete $self->{timer})->cancel
2966	if $self->{timer};	3627	if $self->{timer};
2967		3628
2968	$self->SUPER::destroy;	3629	$self->SUPER::destroy;
2969	}	3630	}
2970		3631
2971	#############################################################################	3632	#############################################################################
2972		3633
2973	package CFClient::UI::Buttonbar;	3634	package CFPlus::UI::Buttonbar;
2974		3635
2975	our @ISA = CFClient::UI::HBox::;	3636	our @ISA = CFPlus::UI::HBox::;
2976		3637
2977	# TODO: should actualyl wrap buttons and other goodies.	3638	# TODO: should actually wrap buttons and other goodies.
2978		3639
2979	#############################################################################	3640	#############################################################################
2980		3641
2981	package CFClient::UI::Menu;	3642	package CFPlus::UI::Menu;
2982		3643
2983	our @ISA = CFClient::UI::FancyFrame::;	3644	our @ISA = CFPlus::UI::Toplevel::;
2984		3645
2985	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2986		3647
2987	sub new {	3648	sub new {
2988	my $class = shift;	3649	my $class = shift;
2989		3650
2990	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
2991	items => [],	3652	items => [],
2992	z => 100,	3653	z => 100,
2993	@_,	3654	@_,
2994	);	3655	);
2995		3656
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3657	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3658
2998	for my $item (@{ $self->{items} }) {	3659	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3660	my ($widget, $cb, $tooltip) = @$item;
3000		3661
3001	# handle various types of items, only text for now	3662	# handle various types of items, only text for now
3002	if (!ref $widget) {	3663	if (!ref $widget) {
		3664	if ($widget =~ /\t/) {
		3665	my ($left, $right) = split /\t/, $widget, 2;
		3666
3003	$widget = new CFClient::UI::Label	3667	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3668	can_hover => 1,
3005	can_events => 1,	3669	can_events => 1,
		3670	tooltip => $tooltip,
		3671	children => [
		3672	(new CFPlus::UI::Label markup => $left, expand => 1),
		3673	(new CFPlus::UI::Label markup => $right, align => +1),
		3674	],
		3675	;
		3676
		3677	} else {
		3678	$widget = new CFPlus::UI::Label
		3679	can_hover => 1,
		3680	can_events => 1,
3006	markup => $widget,	3681	markup => $widget,
3007	tooltip => $tooltip	3682	tooltip => $tooltip;
		3683	}
3008	}	3684	}
3009		3685
3010	$self->{item}{$widget} = $item;	3686	$self->{item}{$widget} = $item;
3011		3687
3012	$self->{vbox}->add ($widget);	3688	$self->{vbox}->add ($widget);
…		…
3055	1	3731	1
3056	}	3732	}
3057		3733
3058	#############################################################################	3734	#############################################################################
3059		3735
3060	package CFClient::UI::Multiplexer;	3736	package CFPlus::UI::Multiplexer;
3061		3737
3062	our @ISA = CFClient::UI::Container::;	3738	our @ISA = CFPlus::UI::Container::;
3063		3739
3064	sub new {	3740	sub new {
3065	my $class = shift;	3741	my $class = shift;
3066		3742
3067	my $self = $class->SUPER::new (	3743	my $self = $class->SUPER::new (
…		…
3081		3757
3082	$self->{current} = $self->{children}[0]	3758	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3759	if @{ $self->{children} };
3084	}	3760	}
3085		3761
		3762	sub get_current_page {
		3763	my ($self) = @_;
		3764
		3765	$self->{current}
		3766	}
		3767
3086	sub set_current_page {	3768	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3769	my ($self, $page_or_widget) = @_;
3088		3770
3089	my $widget = ref $page_or_widget	3771	my $widget = ref $page_or_widget
3090	? $page_or_widget	3772	? $page_or_widget
…		…
3122	$self->{current}->draw;	3804	$self->{current}->draw;
3123	}	3805	}
3124		3806
3125	#############################################################################	3807	#############################################################################
3126		3808
3127	package CFClient::UI::Notebook;	3809	package CFPlus::UI::Notebook;
3128		3810
3129	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3130		3812
3131	sub new {	3813	sub new {
3132	my $class = shift;	3814	my $class = shift;
3133		3815
3134	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3817	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3818	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3819	# filter => # will be put between multiplexer and $self
3138	@_,	3820	@_,
3139	);	3821	);
3140		3822
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3823	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3145	}	3827	}
3146		3828
3147	sub add {	3829	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3830	my ($self, $title, $widget, $tooltip) = @_;
3149		3831
3150	Scalar::Util::weaken $self;	3832	CFPlus::weaken $self;
3151		3833
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3834	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3835	markup => $title,
3154	tooltip => $tooltip,	3836	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3837	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3838	);
3157		3839
3158	$self->{multiplexer}->add ($widget);	3840	$self->{multiplexer}->add ($widget);
3159	}	3841	}
3160		3842
		3843	sub get_current_page {
		3844	my ($self) = @_;
		3845
		3846	$self->{multiplexer}->get_current_page
		3847	}
		3848
3161	sub set_current_page {	3849	sub set_current_page {
3162	my ($self, $page) = @_;	3850	my ($self, $page) = @_;
3163		3851
3164	$self->{multiplexer}->set_current_page ($page);	3852	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3853	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3854	}
3167		3855
3168	#############################################################################	3856	#############################################################################
3169		3857
3170	package CFClient::UI::Combobox;	3858	package CFPlus::UI::Selector;
3171		3859
3172	use utf8;	3860	use utf8;
3173		3861
3174	our @ISA = CFClient::UI::Button::;	3862	our @ISA = CFPlus::UI::Button::;
3175		3863
3176	sub new {	3864	sub new {
3177	my $class = shift;	3865	my $class = shift;
3178		3866
3179	my $self = $class->SUPER::new (	3867	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3884	my ($value, $title, $tooltip) = @$_;
3197		3885
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3886	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3887	}
3200		3888
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3889	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3890	}
3203		3891
3204	sub _set_value {	3892	sub _set_value {
3205	my ($self, $value) = @_;	3893	my ($self, $value) = @_;
3206		3894
…		…
3221	$self->emit (changed => $value);	3909	$self->emit (changed => $value);
3222	}	3910	}
3223		3911
3224	#############################################################################	3912	#############################################################################
3225		3913
3226	package CFClient::UI::Statusbox;	3914	package CFPlus::UI::Statusbox;
3227		3915
3228	our @ISA = CFClient::UI::VBox::;	3916	our @ISA = CFPlus::UI::VBox::;
3229		3917
3230	sub new {	3918	sub new {
3231	my $class = shift;	3919	my $class = shift;
3232		3920
3233	my $self = $class->SUPER::new (	3921	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	3922	fontsize => 0.8,
3235	@_,	3923	@_,
3236	);	3924	);
3237		3925
3238	Scalar::Util::weaken (my $this = $self);	3926	CFPlus::weaken (my $this = $self);
3239		3927
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3928	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		3929
3242	$self	3930	$self
3243	}	3931	}
…		…
3245	sub reorder {	3933	sub reorder {
3246	my ($self) = @_;	3934	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3935	my $NOW = Time::HiRes::time;
3248		3936
3249	# freeze display when hovering over any label	3937	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3938	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3939	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3940	values %{ $self->{item} };
3253		3941
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3942	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3943	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3944	}
…		…
3277	for ($short) {	3965	for ($short) {
3278	s/^\s+//;	3966	s/^\s+//;
3279	s/\s+/ /g;	3967	s/\s+/ /g;
3280	}	3968	}
3281		3969
3282	new CFClient::UI::Label	3970	new CFPlus::UI::Label
3283	markup => $short,	3971	markup => $short,
3284	tooltip => $item->{tooltip},	3972	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3973	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3974	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3975	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	4029	count => 1,
3342	%arg,	4030	%arg,
3343	};	4031	};
3344	}	4032	}
3345		4033
		4034	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	4035	$self->reorder;
		4036	});
3347	}	4037	}
3348		4038
3349	sub reconfigure {	4039	sub reconfigure {
3350	my ($self) = @_;	4040	my ($self) = @_;
3351		4041
…		…
3364	$self->SUPER::destroy;	4054	$self->SUPER::destroy;
3365	}	4055	}
3366		4056
3367	#############################################################################	4057	#############################################################################
3368		4058
3369	package CFClient::UI::Inventory;
3370
3371	our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373	sub new {
3374	my $class = shift;
3375
3376	my $self = $class->SUPER::new (
3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378	@_,
3379	);
3380
3381	$self
3382	}
3383
3384	sub set_items {
3385	my ($self, $items) = @_;
3386
3387	$self->{child}->clear;
3388	return unless $items;
3389
3390	my @items = sort {
3391	($a->{type} <=> $b->{type})
3392	or ($a->{name} cmp $b->{name})
3393	} @$items;
3394
3395	$self->{real_items} = \@items;
3396
3397	my $row = 0;
3398	for my $item (@items) {
3399	CFClient::Item::update_widgets $item;
3400
3401	$self->{child}->add (0, $row, $item->{face_widget});
3402	$self->{child}->add (1, $row, $item->{desc_widget});
3403	$self->{child}->add (2, $row, $item->{weight_widget});
3404
3405	$row++;
3406	}
3407	}
3408
3409	#############################################################################
3410
3411	package CFClient::UI::BindEditor;
3412
3413	our @ISA = CFClient::UI::FancyFrame::;
3414
3415	sub new {
3416	my $class = shift;
3417
3418	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420	$self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424	text => "start recording",
3425	tooltip => "Start/Stops recording of actions."
3426	."All subsequent actions after the recording started will be captured."
3427	."The actions are displayed after the record was stopped."
3428	."To bind the action you have to click on the 'Bind' button",
3429	on_activate => sub {
3430	unless ($self->{recording}) {
3431	$self->start;
3432	} else {
3433	$self->stop;
3434	}
3435	});
3436
3437	$vb->add (new CFClient::UI::Label text => "Actions:");
3438	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3441	$vb->add (my $hb = new CFClient::UI::HBox);
3442	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443	$hb->add (new CFClient::UI::Button
3444	text => "bind",
3445	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446	on_activate => sub {
3447	$self->ask_for_bind;
3448	});
3449
3450	$vb->add (my $hb = new CFClient::UI::HBox);
3451	$hb->add (new CFClient::UI::Button
3452	text => "ok",
3453	expand => 1,
3454	tooltip => "This closes the binding editor and saves the binding",
3455	on_activate => sub {
3456	$self->hide;
3457	$self->commit;
3458	});
3459
3460	$hb->add (new CFClient::UI::Button
3461	text => "cancel",
3462	expand => 1,
3463	tooltip => "This closes the binding editor without saving",
3464	on_activate => sub {
3465	$self->hide;
3466	$self->{binding_cancel}->()
3467	if $self->{binding_cancel};
3468	});
3469
3470	$self->update_binding_widgets;
3471
3472	$self
3473	}
3474
3475	sub commit {
3476	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480	."'. Don't forget 'Save Config'!");
3481	$self->{binding_change}->($mod, $sym, $cmds)
3482	if $self->{binding_change};
3483	} else {
3484	$::STATUSBOX->add ("No action bound, no key or action specified!");
3485	$self->{binding_cancel}->()
3486	if $self->{binding_cancel};
3487	}
3488	}
3489
3490	sub start {
3491	my ($self) = @_;
3492
3493	$self->{rec_btn}->set_text ("stop recording");
3494	$self->{recording} = 1;
3495	$self->clear_command_list;
3496	$::CONN->start_record if $::CONN;
3497	}
3498
3499	sub stop {
3500	my ($self) = @_;
3501
3502	$self->{rec_btn}->set_text ("start recording");
3503	$self->{recording} = 0;
3504
3505	my $rec;
3506	$rec = $::CONN->stop_record if $::CONN;
3507	return unless ref $rec eq 'ARRAY';
3508	$self->set_command_list ($rec);
3509	}
3510
3511
3512	sub ask_for_bind_and_commit {
3513	my ($self) = @_;
3514	$self->ask_for_bind (1);
3515	}
3516
3517	sub ask_for_bind {
3518	my ($self, $commit, $end_cb) = @_;
3519
3520	CFClient::Binder::open_binding_dialog (sub {
3521	my ($mod, $sym) = @_;
3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523	$self->update_binding_widgets;
3524	$self->commit if $commit;
3525	$end_cb->() if $end_cb;
3526	});
3527	}
3528
3529	# $mod and $sym are the modifiers and key symbol
3530	# $cmds is a array ref of strings (the commands)
3531	# $cb is the callback that is executed on OK
3532	# $ccb is the callback that is executed on CANCEL and
3533	# when the binding was unsuccessful on OK
3534	sub set_binding {
3535	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537	$self->clear_command_list;
3538	$self->{recording} = 0;
3539	$self->{rec_btn}->set_text ("start recording");
3540
3541	$self->{binding} = [$mod, $sym];
3542	$self->{commands} = $cmds;
3543
3544	$self->{binding_change} = $cb;
3545	$self->{binding_cancel} = $ccb;
3546
3547	$self->update_binding_widgets;
3548	}
3549
3550	# this is a shortcut method that asks for a binding
3551	# and then just binds it.
3552	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);
3558	}
3559
3560	sub update_binding_widgets {
3561	my ($self) = @_;
3562	my ($mod, $sym, $cmds) = $self->get_binding;
3563	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564	$self->set_command_list ($cmds);
3565	}
3566
3567	sub get_binding {
3568	my ($self) = @_;
3569	return (
3570	$self->{binding}->[0],
3571	$self->{binding}->[1],
3572	[ grep { defined $_ } @{$self->{commands}} ]
3573	);
3574	}
3575
3576	sub clear_command_list {
3577	my ($self) = @_;
3578	$self->{cmdbox}->clear ();
3579	}
3580
3581	sub set_command_list {
3582	my ($self, $cmds) = @_;
3583
3584	$self->{cmdbox}->clear ();
3585	$self->{commands} = $cmds;
3586
3587	my $idx = 0;
3588
3589	for (@$cmds) {
3590	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592	my $i = $idx;
3593	$hb->add (new CFClient::UI::Label text => $_);
3594	$hb->add (new CFClient::UI::Button
3595	text => "delete",
3596	tooltip => "Deletes the action from the record",
3597	on_activate => sub {
3598	$self->{cmdbox}->remove ($hb);
3599	$cmds->[$i] = undef;
3600	});
3601
3602
3603	$idx++
3604	}
3605	}
3606
3607	#############################################################################
3608
3609	package CFClient::UI::SpellList;
3610
3611	our @ISA = CFClient::UI::Table::;
3612
3613	sub new {
3614	my $class = shift;
3615
3616	my $self = $class->SUPER::new (
3617	binding => [],
3618	commands => [],
3619	@_,
3620	)
3621	}
3622
3623	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636	sub rebuild_spell_list {
3637	my ($self) = @_;
3638
3639	$CFClient::UI::ROOT->on_refresh ($self => sub {
3640	$self->clear;
3641
3642	return unless $::CONN;
3643
3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650	my $row = 0;
3651
3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653	my $spell = $self->{spell}{$_};
3654
3655	$row++;
3656
3657	my $spell_cb = sub {
3658	my ($widget, $ev) = @_;
3659
3660	if ($ev->{button} == 1) {
3661	$::CONN->user_send ("cast $spell->{name}");
3662	} elsif ($ev->{button} == 2) {
3663	$::CONN->user_send ("invoke $spell->{name}");
3664	} elsif ($ev->{button} == 3) {
3665	(new CFClient::UI::Menu
3666	items => [
3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669	],
3670	)->popup ($ev);
3671	} else {
3672	return 0;
3673	}
3674
3675	1
3676	};
3677
3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680	#TODO: add path info to tooltip
3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683	$self->add (0, $row, new CFClient::UI::Face
3684	face => $spell->{face},
3685	can_hover => 1,
3686	can_events => 1,
3687	tooltip => $tooltip,
3688	on_button_down => $spell_cb,
3689	);
3690
3691	$self->add (1, $row, new CFClient::UI::Label
3692	expand => 1,
3693	text => $spell->{name},
3694	can_hover => 1,
3695	can_events => 1,
3696	tooltip => $tooltip,
3697	on_button_down => $spell_cb,
3698	);
3699
3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704	}
3705	});
3706	}
3707
3708	sub add_spell {
3709	my ($self, $spell) = @_;
3710
3711	$self->{spell}->{$spell->{name}} = $spell;
3712	$self->rebuild_spell_list;
3713	}
3714
3715	sub remove_spell {
3716	my ($self, $spell) = @_;
3717
3718	delete $self->{spell}->{$spell->{name}};
3719	$self->rebuild_spell_list;
3720	}
3721
3722	sub clear_spells {
3723	my ($self) = @_;
3724
3725	$self->{spell} = {};
3726	$self->rebuild_spell_list;
3727	}
3728
3729	#############################################################################
3730
3731	package CFClient::UI::Root;	4059	package CFPlus::UI::Root;
3732		4060
3733	our @ISA = CFClient::UI::Container::;	4061	our @ISA = CFPlus::UI::Container::;
3734		4062
3735	use List::Util qw(min max);	4063	use List::Util qw(min max);
3736		4064
3737	use CFClient::OpenGL;	4065	use CFPlus::OpenGL;
3738		4066
3739	sub new {	4067	sub new {
3740	my $class = shift;	4068	my $class = shift;
3741		4069
3742	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
3743	visible => 1,	4071	visible => 1,
3744	@_,	4072	@_,
3745	);	4073	);
3746		4074
3747	Scalar::Util::weaken ($self->{root} = $self);	4075	CFPlus::weaken ($self->{root} = $self);
3748		4076
3749	$self	4077	$self
3750	}	4078	}
3751		4079
3752	sub size_request {	4080	sub size_request {
…		…
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		4247
3920	$w = 0 if $w < 0;	4248	$w = 0 if $w < 0;
3921	$h = 0 if $h < 0;	4249	$h = 0 if $h < 0;
3922		4250
		4251	$w = max $widget->{min_w}, $w;
		4252	$h = max $widget->{min_h}, $h;
		4253
		4254	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4255	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4256
		4257	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4258	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4259
3923	$w = int $w + 0.5;	4260	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	4261	$h = int $h + 0.5;
3925		4262
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4263	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	4264	$widget->{old_w} = $widget->{w};
…		…
3937		4274
3938	while ($self->{post_alloc_hook}) {	4275	while ($self->{post_alloc_hook}) {
3939	$_->()	4276	$_->()
3940	for values %{delete $self->{post_alloc_hook}};	4277	for values %{delete $self->{post_alloc_hook}};
3941	}	4278	}
3942
3943		4279
3944	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4280	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3945	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4281	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3946	glClear GL_COLOR_BUFFER_BIT;	4282	glClear GL_COLOR_BUFFER_BIT;
3947		4283
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4286	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4287	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4288	glLoadIdentity;
3953		4289
3954	{	4290	{
3955	package CFClient::UI::Base;	4291	package CFPlus::UI::Base;
3956		4292
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4293	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4294	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4295
3961	$self->_draw;	4296	$self->_draw;
		4297	}
3962	}	4298	}
3963		4299
3964	#############################################################################	4300	#############################################################################
3965		4301
3966	package CFClient::UI;	4302	package CFPlus::UI;
3967		4303
3968	$ROOT = new CFClient::UI::Root;	4304	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4305	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4306
3971	1	4307	1
3972		4308

Diff Legend

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