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.306 by root, Sun Jun 18 17:39:36 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;
1896		2319
1897	$self->{history_pointer} = -1;	2320	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2321	$self->{history_saveback} = '';
1899	$self->emit (activate => $txt);	2322	$self->emit (activate => $txt);
1900	$self->update;	2323	$self->update;
1901		2324
1902	} elsif ($sym == CFClient::SDLK_UP) {	2325	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2326	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2327	$self->{history_saveback} = $self->get_text;
1905	}	2328	}
1906	if (@{$self->{history} || []} > 0) {	2329	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2330	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2332	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2333	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2334	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2335	}
1913		2336
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2337	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2338	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2339	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2340
1918	if ($self->{history_pointer} >= 0) {	2341	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2342	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1928	1	2351	1
1929	}	2352	}
1930		2353
1931	#############################################################################	2354	#############################################################################
1932		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
1933	package CFClient::UI::Button;	2395	package CFPlus::UI::Button;
1934		2396
1935	our @ISA = CFClient::UI::Label::;	2397	our @ISA = CFPlus::UI::Label::;
1936		2398
1937	use CFClient::OpenGL;	2399	use CFPlus::OpenGL;
1938		2400
1939	my @tex =	2401	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2402	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2403	qw(b1_button_inactive.png b1_button_active.png);
1942		2404
1943	sub new {	2405	sub new {
1944	my $class = shift;	2406	my $class = shift;
1945		2407
1946	$class->SUPER::new (	2408	$class->SUPER::new (
1947	padding_x => 4,	2409	padding_x => 4,
1948	padding_y => 4,	2410	padding_y => 4,
1949	fg => [1, 1, 1],	2411	fg => [1.0, 1.0, 1.0],
1950	active_fg => [0, 0, 1],	2412	active_fg => [0.8, 0.8, 0.8],
1951	can_hover => 1,	2413	can_hover => 1,
1952	align => 0,	2414	align => 0,
1953	valign => 0,	2415	valign => 0,
1954	can_events => 1,	2416	can_events => 1,
1955	@_	2417	@_
…		…
1973		2435
1974	glEnable GL_TEXTURE_2D;	2436	glEnable GL_TEXTURE_2D;
1975	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1976	glColor 0, 0, 0, 1;	2438	glColor 0, 0, 0, 1;
1977		2439
		2440	my $tex = $tex[$GRAB == $self];
1978	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2441	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1979		2442
1980	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1981		2444
1982	$self->SUPER::_draw;	2445	$self->SUPER::_draw;
1983	}	2446	}
1984		2447
1985	#############################################################################	2448	#############################################################################
1986		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
1987	package CFClient::UI::ImageButton;	2599	package CFPlus::UI::ImageButton;
1988		2600
1989	our @ISA = CFClient::UI::Image::;	2601	our @ISA = CFPlus::UI::Image::;
1990		2602
1991	use CFClient::OpenGL;	2603	use CFPlus::OpenGL;
1992		2604
1993	my %textures;	2605	my %textures;
1994		2606
1995	sub new {	2607	sub new {
1996	my $class = shift;	2608	my $class = shift;
…		…
2018	1	2630	1
2019	}	2631	}
2020		2632
2021	#############################################################################	2633	#############################################################################
2022		2634
2023	package CFClient::UI::CheckBox;
2024
2025	our @ISA = CFClient::UI::DrawBG::;
2026
2027	my @tex =
2028	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2029	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2030
2031	use CFClient::OpenGL;
2032
2033	sub new {
2034	my $class = shift;
2035
2036	$class->SUPER::new (
2037	padding_x => 2,
2038	padding_y => 2,
2039	fg => [1, 1, 1],
2040	active_fg => [1, 1, 0],
2041	bg => [0, 0, 0, 0.2],
2042	active_bg => [1, 1, 1, 0.5],
2043	state => 0,
2044	can_hover => 1,
2045	@_
2046	)
2047	}
2048
2049	sub size_request {
2050	my ($self) = @_;
2051
2052	(6) x 2
2053	}
2054
2055	sub invoke_button_down {
2056	my ($self, $ev, $x, $y) = @_;
2057
2058	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060	$self->{state} = !$self->{state};
2061	$self->emit (changed => $self->{state});
2062	} else {
2063	return 0
2064	}
2065
2066	1
2067	}
2068
2069	sub _draw {
2070	my ($self) = @_;
2071
2072	$self->SUPER::_draw;
2073
2074	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2075
2076	my ($w, $h) = @$self{qw(w h)};
2077
2078	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2079
2080	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2081
2082	my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
2084	glEnable GL_TEXTURE_2D;
2085	$tex->draw_quad_alpha (0, 0, $s, $s);
2086	glDisable GL_TEXTURE_2D;
2087	}
2088
2089	#############################################################################
2090
2091	package CFClient::UI::Image;	2635	package CFPlus::UI::VGauge;
2092		2636
2093	our @ISA = CFClient::UI::Base::;	2637	our @ISA = CFPlus::UI::Base::;
2094
2095	use CFClient::OpenGL;
2096	use Carp qw/confess/;
2097
2098	our %loaded_images;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (can_events => 0, @_);
2104
2105	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2106
2107	$loaded_images{$self->{image}} ||=
2108	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2109
2110	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2111
2112	Scalar::Util::weaken $loaded_images{$self->{image}};
2113
2114	$self->{aspect} = $tex->{w} / $tex->{h};
2115
2116	$self
2117	}
2118
2119	sub size_request {
2120	my ($self) = @_;
2121
2122	($self->{tex}->{w}, $self->{tex}->{h})
2123	}
2124
2125	sub _draw {
2126	my ($self) = @_;
2127
2128	my $tex = $self->{tex};
2129
2130	my ($w, $h) = ($self->{w}, $self->{h});
2131
2132	if ($self->{rot90}) {
2133	glRotate 90, 0, 0, 1;
2134	glTranslate 0, -$self->{w}, 0;
2135
2136	($w, $h) = ($h, $w);
2137	}
2138
2139	glEnable GL_TEXTURE_2D;
2140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141
2142	$tex->draw_quad_alpha (0, 0, $w, $h);
2143
2144	glDisable GL_TEXTURE_2D;
2145	}
2146
2147	#############################################################################
2148
2149	package CFClient::UI::VGauge;
2150
2151	our @ISA = CFClient::UI::Base::;
2152		2638
2153	use List::Util qw(min max);	2639	use List::Util qw(min max);
2154		2640
2155	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2156		2642
2157	my %tex = (	2643	my %tex = (
2158	food => [	2644	food => [
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2645	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2646	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161	],	2647	],
2162	grace => [	2648	grace => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2649	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	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/
2165	],	2651	],
2166	hp => [	2652	hp => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2654	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169	],	2655	],
2170	mana => [	2656	mana => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	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/
2173	],	2659	],
2174	);	2660	);
2175		2661
2176	# eg. VGauge->new (gauge => 'food'), default gauge: food	2662	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2236	my $ycut1 = max 0, min 1, $ycut;	2722	my $ycut1 = max 0, min 1, $ycut;
2237	my $ycut2 = max 0, min 1, $ycut - 1;	2723	my $ycut2 = max 0, min 1, $ycut - 1;
2238		2724
2239	my $h1 = $self->{h} * (1 - $ycut1);	2725	my $h1 = $self->{h} * (1 - $ycut1);
2240	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);
2241		2730
2242	glEnable GL_BLEND;	2731	glEnable GL_BLEND;
2243	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2732	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2733	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245	glEnable GL_TEXTURE_2D;	2734	glEnable GL_TEXTURE_2D;
…		…
2264		2753
2265	if ($t3) {	2754	if ($t3) {
2266	glBindTexture GL_TEXTURE_2D, $t3->{name};	2755	glBindTexture GL_TEXTURE_2D, $t3->{name};
2267	glBegin GL_QUADS;	2756	glBegin GL_QUADS;
2268	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2758	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272	glEnd;	2761	glEnd;
2273	}	2762	}
2274		2763
2275	glDisable GL_BLEND;	2764	glDisable GL_BLEND;
2276	glDisable GL_TEXTURE_2D;	2765	glDisable GL_TEXTURE_2D;
2277	}	2766	}
2278		2767
2279	#############################################################################	2768	#############################################################################
2280		2769
2281	package CFClient::UI::Gauge;	2770	package CFPlus::UI::Gauge;
2282		2771
2283	our @ISA = CFClient::UI::VBox::;	2772	our @ISA = CFPlus::UI::VBox::;
2284		2773
2285	sub new {	2774	sub new {
2286	my ($class, %arg) = @_;	2775	my ($class, %arg) = @_;
2287		2776
2288	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
…		…
2290	can_hover => 1,	2779	can_hover => 1,
2291	can_events => 1,	2780	can_events => 1,
2292	%arg,	2781	%arg,
2293	);	2782	);
2294		2783
2295	$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");
2296	$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);
2297	$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");
2298		2787
2299	$self	2788	$self
2300	}	2789	}
2301		2790
2302	sub set_fontsize {	2791	sub set_fontsize {
…		…
2323	$self->{value}->set_text ($val);	2812	$self->{value}->set_text ($val);
2324	}	2813	}
2325		2814
2326	#############################################################################	2815	#############################################################################
2327		2816
2328	package CFClient::UI::Slider;	2817	package CFPlus::UI::Slider;
2329		2818
2330	use strict;	2819	use strict;
2331		2820
2332	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2333		2822
2334	our @ISA = CFClient::UI::DrawBG::;	2823	our @ISA = CFPlus::UI::DrawBG::;
2335		2824
2336	my @tex =	2825	my @tex =
2337	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2826	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338	qw(s1_slider.png s1_slider_bg.png);	2827	qw(s1_slider.png s1_slider_bg.png);
2339		2828
2340	sub new {	2829	sub new {
2341	my $class = shift;	2830	my $class = shift;
2342		2831
…		…
2410		2899
2411	$self->SUPER::invoke_button_down ($ev, $x, $y);	2900	$self->SUPER::invoke_button_down ($ev, $x, $y);
2412		2901
2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414		2903
2415	$self->mouse_motion ($ev, $x, $y)	2904	$self->invoke_mouse_motion ($ev, $x, $y)
2416	}	2905	}
2417		2906
2418	sub invoke_mouse_motion {	2907	sub invoke_mouse_motion {
2419	my ($self, $ev, $x, $y) = @_;	2908	my ($self, $ev, $x, $y) = @_;
2420		2909
…		…
2429	} else {	2918	} else {
2430	return 0;	2919	return 0;
2431	}	2920	}
2432		2921
2433	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
2434	}	2935	}
2435		2936
2436	sub update {	2937	sub update {
2437	my ($self) = @_;	2938	my ($self) = @_;
2438		2939
…		…
2487	glDisable GL_TEXTURE_2D;	2988	glDisable GL_TEXTURE_2D;
2488	}	2989	}
2489		2990
2490	#############################################################################	2991	#############################################################################
2491		2992
2492	package CFClient::UI::ValSlider;	2993	package CFPlus::UI::ValSlider;
2493		2994
2494	our @ISA = CFClient::UI::HBox::;	2995	our @ISA = CFPlus::UI::HBox::;
2495		2996
2496	sub new {	2997	sub new {
2497	my ($class, %arg) = @_;	2998	my ($class, %arg) = @_;
2498		2999
2499	my $range = delete $arg{range};	3000	my $range = delete $arg{range};
2500		3001
2501	my $self = $class->SUPER::new (	3002	my $self = $class->SUPER::new (
2502	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3003	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3004	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504	to_value => sub { shift },	3005	to_value => sub { shift },
2505	from_value => sub { shift },	3006	from_value => sub { shift },
2506	%arg,	3007	%arg,
2507	);	3008	);
2508		3009
…		…
2528	sub set_range { shift->{slider}->set_range (@_) }	3029	sub set_range { shift->{slider}->set_range (@_) }
2529	sub set_value { shift->{slider}->set_value (@_) }	3030	sub set_value { shift->{slider}->set_value (@_) }
2530		3031
2531	#############################################################################	3032	#############################################################################
2532		3033
2533	package CFClient::UI::TextScroller;	3034	package CFPlus::UI::TextScroller;
2534		3035
2535	our @ISA = CFClient::UI::HBox::;	3036	our @ISA = CFPlus::UI::HBox::;
2536		3037
2537	use CFClient::OpenGL;	3038	use CFPlus::OpenGL;
2538		3039
2539	sub new {	3040	sub new {
2540	my $class = shift;	3041	my $class = shift;
2541		3042
2542	my $self = $class->SUPER::new (	3043	my $self = $class->SUPER::new (
2543	fontsize => 1,	3044	fontsize => 1,
2544	can_events => 0,	3045	can_events => 1,
2545	indent => 0,	3046	indent => 0,
2546	#font => default_font	3047	#font => default_font
2547	@_,	3048	@_,
2548		3049
2549	layout => (new CFClient::Layout 1),	3050	layout => (new CFPlus::Layout),
2550	par => [],	3051	par => [],
		3052	max_par => 0,
2551	height => 0,	3053	height => 0,
2552	children => [	3054	children => [
2553	(new CFClient::UI::Empty expand => 1),	3055	(new CFPlus::UI::Empty expand => 1),
2554	(new CFClient::UI::Slider vertical => 1),	3056	(new CFPlus::UI::Slider vertical => 1),
2555	],	3057	],
2556	);	3058	);
2557		3059
2558	$self->{children}[1]->connect (changed => sub { $self->update });	3060	$self->{children}[1]->connect (changed => sub { $self->update });
2559		3061
…		…
2565		3067
2566	$self->{fontsize} = $fontsize;	3068	$self->{fontsize} = $fontsize;
2567	$self->reflow;	3069	$self->reflow;
2568	}	3070	}
2569		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
2570	sub invoke_size_allocate {	3081	sub invoke_size_allocate {
2571	my ($self, $w, $h) = @_;	3082	my ($self, $w, $h) = @_;
2572		3083
		3084	my ($empty, $slider, @other) = @{ $self->{children} };
		3085	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3086
2573	$self->{layout}->set_font ($self->{font}) if $self->{font};	3087	$self->{layout}->set_font ($self->{font}) if $self->{font};
2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3088	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575	$self->{layout}->set_width ($self->{children}[0]{w});	3089	$self->{layout}->set_width ($empty->{w});
2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3090	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577		3091
2578	$self->reflow;	3092	$self->reflow;
2579		3093
		3094	local $self->{children} = [$empty, $slider];
2580	$self->SUPER::invoke_size_allocate ($w, $h)	3095	$self->SUPER::invoke_size_allocate ($w, $h)
2581	}	3096	}
2582		3097
2583	sub text_size {	3098	sub invoke_mouse_wheel {
2584	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) = @_;
2585		3110
2586	my $layout = $self->{layout};	3111	my $layout = $self->{layout};
2587		3112
		3113	$layout->set_font ($self->{font}) if $self->{font};
		3114	$layout->set_foreground (@{$para->{fg}});
2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3115	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589	$layout->set_width ($self->{children}[0]{w} - $indent);	3116	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3117	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591	$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}}
2592		3124	);
		3125
2593	$layout->size	3126	$layout
2594	}	3127	}
2595		3128
2596	sub reflow {	3129	sub reflow {
2597	my ($self) = @_;	3130	my ($self) = @_;
2598		3131
…		…
2605		3138
2606	# todo: base offset on lines or so, not on pixels	3139	# todo: base offset on lines or so, not on pixels
2607	$self->{children}[1]->set_value ($offset);	3140	$self->{children}[1]->set_value ($offset);
2608	}	3141	}
2609		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
2610	sub clear {	3158	sub clear {
2611	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	my (undef, undef, @other) = @{ $self->{children} };
		3162	$self->remove ($_) for @other;
2612		3163
2613	$self->{par} = [];	3164	$self->{par} = [];
2614	$self->{height} = 0;	3165	$self->{height} = 0;
2615	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3166	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616	}	3167	}
2617		3168
2618	sub add_paragraph {	3169	sub add_paragraph {
2619	my ($self, $color, $text, $indent) = @_;	3170	my $self = shift;
2620		3171
2621	for my $line (split /\n/, $text) {	3172	for my $para (@_) {
2622	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
2623	$self->{height} += $h;	3224	$self->{height} = $height;
2624	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3225	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625	}
2626		3226
2627	$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	}
2628	}	3233	}
2629		3234
2630	sub update {	3235	sub update {
2631	my ($self) = @_;	3236	my ($self) = @_;
2632		3237
…		…
2635	return unless $self->{h} > 0;	3240	return unless $self->{h} > 0;
2636		3241
2637	delete $self->{texture};	3242	delete $self->{texture};
2638		3243
2639	$ROOT->on_post_alloc ($self => sub {	3244	$ROOT->on_post_alloc ($self => sub {
		3245	$self->force_uptodate;
		3246
2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3247	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641		3248
2642	if (delete $self->{need_reflow}) {
2643	my $height = 0;
2644
2645	my $layout = $self->{layout};
2646
2647	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649	for (@{$self->{par}}) {
2650	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651	$layout->set_width ($W - $_->[3]);
2652	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653	$layout->set_markup ($_->[4]);
2654	my ($w, $h) = $layout->size;
2655	$_->[0] = $w + $_->[3];
2656	$_->[1] = $h;
2657	}
2658
2659	$height += $_->[1];
2660	}
2661
2662	$self->{height} = $height;
2663
2664	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2665
2666	delete $self->{texture};
2667	}
2668
2669	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3249	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670	glClearColor 0, 0, 0, 0;	3250	glClearColor 0, 0, 0, 0;
2671	glClear GL_COLOR_BUFFER_BIT;	3251	glClear GL_COLOR_BUFFER_BIT;
2672		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;
2673	my $top = int $self->{children}[1]{range}[0];	3261	my $top = int $self->{children}[1]{range}[0];
2674		3262
2675	my $y0 = $top;	3263	my $y0 = $top;
2676	my $y1 = $top + $H;	3264	my $y1 = $top + $H;
2677		3265
2678	my $y = 0;
2679
2680	my $layout = $self->{layout};
2681
2682	$layout->set_font ($self->{font}) if $self->{font};
2683
2684	glEnable GL_BLEND;
2685	#TODO# not correct in windows where rgba is forced off
2686	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688	for my $par (@{$self->{par}}) {	3266	for my $para (@{$self->{par}}) {
2689	my $h = $par->[1];	3267	my $h = $para->{h};
		3268	my $y = $para->{y};
2690		3269
2691	if ($y0 < $y + $h && $y < $y1) {	3270	if ($y0 < $y + $h && $y < $y1) {
2692	$layout->set_foreground (@{ $par->[2] });	3271	my $layout = $self->get_layout ($para);
2693	$layout->set_width ($W - $par->[3]);
2694	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695	$layout->set_markup ($par->[4]);
2696		3272
2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3273	$layout->render ($para->{indent}, $y - $y0);
2698		3274
2699	glRasterPos $par->[3], $y - $y0;	3275	if (my @w = @{ $para->{widget} }) {
2700	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	}
2701	}	3287	}
2702		3288
2703	$y += $h;	3289	$paridx++;
		3290	$top_paragraph ||= $paridx if $y >= $top;
2704	}	3291	}
2705		3292
2706	glDisable GL_BLEND;	3293	$self->{top_paragraph} = $top_paragraph;
2707	};	3294	};
2708	});	3295	});
		3296	}
		3297
		3298	sub reconfigure {
		3299	my ($self) = @_;
		3300
		3301	$self->SUPER::reconfigure;
		3302
		3303	$_->{w} = 1e10 for @{ $self->{par} };
		3304	$self->reflow;
2709	}	3305	}
2710		3306
2711	sub _draw {	3307	sub _draw {
2712	my ($self) = @_;	3308	my ($self) = @_;
2713		3309
…		…
2716	glColor 0, 0, 0, 1;	3312	glColor 0, 0, 0, 1;
2717	$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});
2718	glDisable GL_TEXTURE_2D;	3314	glDisable GL_TEXTURE_2D;
2719		3315
2720	$self->{children}[1]->draw;	3316	$self->{children}[1]->draw;
2721
2722	}	3317	}
2723		3318
2724	#############################################################################	3319	#############################################################################
2725		3320
2726	package CFClient::UI::Animator;	3321	package CFPlus::UI::Animator;
2727		3322
2728	use CFClient::OpenGL;	3323	use CFPlus::OpenGL;
2729		3324
2730	our @ISA = CFClient::UI::Bin::;	3325	our @ISA = CFPlus::UI::Bin::;
2731		3326
2732	sub moveto {	3327	sub moveto {
2733	my ($self, $x, $y) = @_;	3328	my ($self, $x, $y) = @_;
2734		3329
2735	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3330	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2763	glPopMatrix;	3358	glPopMatrix;
2764	}	3359	}
2765		3360
2766	#############################################################################	3361	#############################################################################
2767		3362
2768	package CFClient::UI::Flopper;	3363	package CFPlus::UI::Flopper;
2769		3364
2770	our @ISA = CFClient::UI::Button::;	3365	our @ISA = CFPlus::UI::Button::;
2771		3366
2772	sub new {	3367	sub new {
2773	my $class = shift;	3368	my $class = shift;
2774		3369
2775	my $self = $class->SUPER::new (	3370	my $self = $class->SUPER::new (
…		…
2787	$self->{other}->toggle_visibility;	3382	$self->{other}->toggle_visibility;
2788	}	3383	}
2789		3384
2790	#############################################################################	3385	#############################################################################
2791		3386
2792	package CFClient::UI::Tooltip;	3387	package CFPlus::UI::Tooltip;
2793		3388
2794	our @ISA = CFClient::UI::Bin::;	3389	our @ISA = CFPlus::UI::Bin::;
2795		3390
2796	use CFClient::OpenGL;	3391	use CFPlus::OpenGL;
2797		3392
2798	sub new {	3393	sub new {
2799	my $class = shift;	3394	my $class = shift;
2800		3395
2801	$class->SUPER::new (	3396	$class->SUPER::new (
…		…
2804	)	3399	)
2805	}	3400	}
2806		3401
2807	sub set_tooltip_from {	3402	sub set_tooltip_from {
2808	my ($self, $widget) = @_;	3403	my ($self, $widget) = @_;
		3404
		3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3406	if $widget->{tooltip} =~ /^#(.*)$/;
2809		3407
2810	my $tooltip = $widget->{tooltip};	3408	my $tooltip = $widget->{tooltip};
2811		3409
2812	if ($ENV{CFPLUS_DEBUG} & 2) {	3410	if ($ENV{CFPLUS_DEBUG} & 2) {
2813	$tooltip .= "\n\n" . (ref $widget) . "\n"	3411	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2817	}	3415	}
2818		3416
2819	$tooltip =~ s/^\n+//;	3417	$tooltip =~ s/^\n+//;
2820	$tooltip =~ s/\n+$//;	3418	$tooltip =~ s/\n+$//;
2821		3419
2822	$self->add (new CFClient::UI::Label	3420	$self->add (new CFPlus::UI::Label
2823	markup => $tooltip,	3421	markup => $tooltip,
2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3422	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825	fontsize => 0.8,	3423	fontsize => 0.8,
2826	fg => [0, 0, 0, 1],	3424	style => 1, # FLAG_INVERSE
2827	ellipsise => 0,	3425	ellipsise => 0,
2828	font => ($widget->{tooltip_font} || $::FONT_PROP),	3426	font => ($widget->{tooltip_font} || $::FONT_PROP),
2829	);	3427	);
2830	}	3428	}
2831		3429
…		…
2850		3448
2851	$self->{root}->on_post_alloc ("move_$self" => sub {	3449	$self->{root}->on_post_alloc ("move_$self" => sub {
2852	my $widget = $self->{owner}	3450	my $widget = $self->{owner}
2853	or return;	3451	or return;
2854		3452
		3453	if ($widget->{visible}) {
2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3454	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856		3455
2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3456	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858	if $x + $self->{w} > $self->{root}{w};	3457	if $x + $self->{w} > $self->{root}{w};
2859		3458
2860	$self->move_abs ($x, $y);	3459	$self->move_abs ($x, $y);
		3460	} else {
		3461	$self->hide;
		3462	}
2861	});	3463	});
2862	}	3464	}
2863		3465
2864	sub _draw {	3466	sub _draw {
2865	my ($self) = @_;	3467	my ($self) = @_;
…		…
2889	$self->SUPER::_draw;	3491	$self->SUPER::_draw;
2890	}	3492	}
2891		3493
2892	#############################################################################	3494	#############################################################################
2893		3495
2894	package CFClient::UI::Face;	3496	package CFPlus::UI::Face;
2895		3497
2896	our @ISA = CFClient::UI::Base::;	3498	our @ISA = CFPlus::UI::DrawBG::;
2897		3499
2898	use CFClient::OpenGL;	3500	use CFPlus::OpenGL;
2899		3501
2900	sub new {	3502	sub new {
2901	my $class = shift;	3503	my $class = shift;
2902		3504
2903	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	size_w => 32,
		3507	size_h => 8,
2904	aspect => 1,	3508	aspect => 1,
2905	can_events => 0,	3509	can_events => 0,
2906	@_,	3510	@_,
2907	);	3511	);
2908		3512
2909	if ($self->{anim} && $self->{animspeed}) {	3513	if ($self->{anim} && $self->{animspeed}) {
2910	Scalar::Util::weaken (my $widget = $self);	3514	CFPlus::weaken (my $widget = $self);
2911		3515
		3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2912	$self->{timer} = Event->timer (	3518	$self->{timer} = Event->timer (
2913	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914	hard => 1,	3519	parked => 1,
2915	interval => $self->{animspeed},
2916	cb => sub {	3520	cb => sub {
		3521	return unless $::CONN && $widget;
		3522
2917	++$widget->{frame};	3523	++$widget->{frame};
		3524	$widget->update_face;
2918	$widget->update;	3525	$widget->update;
		3526
		3527	$widget->update_timer;
2919	},	3528	},
2920	);	3529	);
		3530
		3531	$self->update_face;
		3532	$self->update_timer;
2921	}	3533	}
2922		3534
2923	$self	3535	$self
2924	}	3536	}
2925		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
2926	sub size_request {	3568	sub size_request {
2927	(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)
2928	}	3584	}
2929		3585
2930	sub update {	3586	sub update {
2931	my ($self) = @_;	3587	my ($self) = @_;
2932		3588
2933	return unless $self->{visible};	3589	return unless $self->{visible};
2934		3590
2935	$self->SUPER::update;	3591	$self->SUPER::update;
2936	}	3592	}
2937		3593
		3594	sub invoke_visibility_change {
		3595	my ($self) = @_;
		3596
		3597	$self->update_timer;
		3598
		3599	0
		3600	}
		3601
2938	sub _draw {	3602	sub _draw {
2939	my ($self) = @_;	3603	my ($self) = @_;
2940		3604
2941	return unless $::CONN;	3605	return unless $::CONN;
2942		3606
2943	my $face;	3607	$self->SUPER::_draw;
2944		3608
2945	if ($self->{frame}) {
2946	my $anim = $::CONN->{anim}[$self->{anim}];	3609	my $faceid = $::CONN->{faceid}[$self->{face}]
2947		3610	or return;
2948	$face = $anim->[ $self->{frame} % @$anim ]
2949	if $anim && @$anim;
2950	}
2951		3611
2952	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3612	my $tex = $::CONN->{texture}[$faceid];
2953		3613
2954	if ($tex) {	3614	if ($tex) {
2955	glEnable GL_TEXTURE_2D;	3615	glEnable GL_TEXTURE_2D;
2956	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2957	glColor 0, 0, 0, 1;	3617	glColor 0, 0, 0, 1;
…		…
2961	}	3621	}
2962		3622
2963	sub destroy {	3623	sub destroy {
2964	my ($self) = @_;	3624	my ($self) = @_;
2965		3625
2966	$self->{timer}->cancel	3626	(delete $self->{timer})->cancel
2967	if $self->{timer};	3627	if $self->{timer};
2968		3628
2969	$self->SUPER::destroy;	3629	$self->SUPER::destroy;
2970	}	3630	}
2971		3631
2972	#############################################################################	3632	#############################################################################
2973		3633
2974	package CFClient::UI::Buttonbar;	3634	package CFPlus::UI::Buttonbar;
2975		3635
2976	our @ISA = CFClient::UI::HBox::;	3636	our @ISA = CFPlus::UI::HBox::;
2977		3637
2978	# TODO: should actualyl wrap buttons and other goodies.	3638	# TODO: should actually wrap buttons and other goodies.
2979		3639
2980	#############################################################################	3640	#############################################################################
2981		3641
2982	package CFClient::UI::Menu;	3642	package CFPlus::UI::Menu;
2983		3643
2984	our @ISA = CFClient::UI::FancyFrame::;	3644	our @ISA = CFPlus::UI::Toplevel::;
2985		3645
2986	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2987		3647
2988	sub new {	3648	sub new {
2989	my $class = shift;	3649	my $class = shift;
2990		3650
2991	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
2992	items => [],	3652	items => [],
2993	z => 100,	3653	z => 100,
2994	@_,	3654	@_,
2995	);	3655	);
2996		3656
2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3657	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998		3658
2999	for my $item (@{ $self->{items} }) {	3659	for my $item (@{ $self->{items} }) {
3000	my ($widget, $cb, $tooltip) = @$item;	3660	my ($widget, $cb, $tooltip) = @$item;
3001		3661
3002	# handle various types of items, only text for now	3662	# handle various types of items, only text for now
3003	if (!ref $widget) {	3663	if (!ref $widget) {
		3664	if ($widget =~ /\t/) {
		3665	my ($left, $right) = split /\t/, $widget, 2;
		3666
3004	$widget = new CFClient::UI::Label	3667	$widget = new CFPlus::UI::HBox
3005	can_hover => 1,	3668	can_hover => 1,
3006	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,
3007	markup => $widget,	3681	markup => $widget,
3008	tooltip => $tooltip	3682	tooltip => $tooltip;
		3683	}
3009	}	3684	}
3010		3685
3011	$self->{item}{$widget} = $item;	3686	$self->{item}{$widget} = $item;
3012		3687
3013	$self->{vbox}->add ($widget);	3688	$self->{vbox}->add ($widget);
…		…
3056	1	3731	1
3057	}	3732	}
3058		3733
3059	#############################################################################	3734	#############################################################################
3060		3735
3061	package CFClient::UI::Multiplexer;	3736	package CFPlus::UI::Multiplexer;
3062		3737
3063	our @ISA = CFClient::UI::Container::;	3738	our @ISA = CFPlus::UI::Container::;
3064		3739
3065	sub new {	3740	sub new {
3066	my $class = shift;	3741	my $class = shift;
3067		3742
3068	my $self = $class->SUPER::new (	3743	my $self = $class->SUPER::new (
…		…
3082		3757
3083	$self->{current} = $self->{children}[0]	3758	$self->{current} = $self->{children}[0]
3084	if @{ $self->{children} };	3759	if @{ $self->{children} };
3085	}	3760	}
3086		3761
		3762	sub get_current_page {
		3763	my ($self) = @_;
		3764
		3765	$self->{current}
		3766	}
		3767
3087	sub set_current_page {	3768	sub set_current_page {
3088	my ($self, $page_or_widget) = @_;	3769	my ($self, $page_or_widget) = @_;
3089		3770
3090	my $widget = ref $page_or_widget	3771	my $widget = ref $page_or_widget
3091	? $page_or_widget	3772	? $page_or_widget
…		…
3123	$self->{current}->draw;	3804	$self->{current}->draw;
3124	}	3805	}
3125		3806
3126	#############################################################################	3807	#############################################################################
3127		3808
3128	package CFClient::UI::Notebook;	3809	package CFPlus::UI::Notebook;
3129		3810
3130	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3131		3812
3132	sub new {	3813	sub new {
3133	my $class = shift;	3814	my $class = shift;
3134		3815
3135	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3136	buttonbar => (new CFClient::UI::Buttonbar),	3817	buttonbar => (new CFPlus::UI::Buttonbar),
3137	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3818	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138	# filter => # will be put between multiplexer and $self	3819	# filter => # will be put between multiplexer and $self
3139	@_,	3820	@_,
3140	);	3821	);
3141		3822
3142	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3823	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3146	}	3827	}
3147		3828
3148	sub add {	3829	sub add {
3149	my ($self, $title, $widget, $tooltip) = @_;	3830	my ($self, $title, $widget, $tooltip) = @_;
3150		3831
3151	Scalar::Util::weaken $self;	3832	CFPlus::weaken $self;
3152		3833
3153	$self->{buttonbar}->add (new CFClient::UI::Button	3834	$self->{buttonbar}->add (new CFPlus::UI::Button
3154	markup => $title,	3835	markup => $title,
3155	tooltip => $tooltip,	3836	tooltip => $tooltip,
3156	on_activate => sub { $self->set_current_page ($widget) },	3837	on_activate => sub { $self->set_current_page ($widget) },
3157	);	3838	);
3158		3839
3159	$self->{multiplexer}->add ($widget);	3840	$self->{multiplexer}->add ($widget);
3160	}	3841	}
3161		3842
		3843	sub get_current_page {
		3844	my ($self) = @_;
		3845
		3846	$self->{multiplexer}->get_current_page
		3847	}
		3848
3162	sub set_current_page {	3849	sub set_current_page {
3163	my ($self, $page) = @_;	3850	my ($self, $page) = @_;
3164		3851
3165	$self->{multiplexer}->set_current_page ($page);	3852	$self->{multiplexer}->set_current_page ($page);
3166	$self->emit (page_changed => $self->{multiplexer}{current});	3853	$self->emit (page_changed => $self->{multiplexer}{current});
3167	}	3854	}
3168		3855
3169	#############################################################################	3856	#############################################################################
3170		3857
3171	package CFClient::UI::Combobox;	3858	package CFPlus::UI::Selector;
3172		3859
3173	use utf8;	3860	use utf8;
3174		3861
3175	our @ISA = CFClient::UI::Button::;	3862	our @ISA = CFPlus::UI::Button::;
3176		3863
3177	sub new {	3864	sub new {
3178	my $class = shift;	3865	my $class = shift;
3179		3866
3180	my $self = $class->SUPER::new (	3867	my $self = $class->SUPER::new (
…		…
3197	my ($value, $title, $tooltip) = @$_;	3884	my ($value, $title, $tooltip) = @$_;
3198		3885
3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3886	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200	}	3887	}
3201		3888
3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3889	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203	}	3890	}
3204		3891
3205	sub _set_value {	3892	sub _set_value {
3206	my ($self, $value) = @_;	3893	my ($self, $value) = @_;
3207		3894
…		…
3222	$self->emit (changed => $value);	3909	$self->emit (changed => $value);
3223	}	3910	}
3224		3911
3225	#############################################################################	3912	#############################################################################
3226		3913
3227	package CFClient::UI::Statusbox;	3914	package CFPlus::UI::Statusbox;
3228		3915
3229	our @ISA = CFClient::UI::VBox::;	3916	our @ISA = CFPlus::UI::VBox::;
3230		3917
3231	sub new {	3918	sub new {
3232	my $class = shift;	3919	my $class = shift;
3233		3920
3234	my $self = $class->SUPER::new (	3921	my $self = $class->SUPER::new (
3235	fontsize => 0.8,	3922	fontsize => 0.8,
3236	@_,	3923	@_,
3237	);	3924	);
3238		3925
3239	Scalar::Util::weaken (my $this = $self);	3926	CFPlus::weaken (my $this = $self);
3240		3927
3241	$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 });
3242		3929
3243	$self	3930	$self
3244	}	3931	}
…		…
3246	sub reorder {	3933	sub reorder {
3247	my ($self) = @_;	3934	my ($self) = @_;
3248	my $NOW = Time::HiRes::time;	3935	my $NOW = Time::HiRes::time;
3249		3936
3250	# freeze display when hovering over any label	3937	# freeze display when hovering over any label
3251	return if $CFClient::UI::TOOLTIP->{owner}	3938	return if $CFPlus::UI::TOOLTIP->{owner}
3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3939	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253	values %{ $self->{item} };	3940	values %{ $self->{item} };
3254		3941
3255	while (my ($k, $v) = each %{ $self->{item} }) {	3942	while (my ($k, $v) = each %{ $self->{item} }) {
3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3943	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257	}	3944	}
…		…
3278	for ($short) {	3965	for ($short) {
3279	s/^\s+//;	3966	s/^\s+//;
3280	s/\s+/ /g;	3967	s/\s+/ /g;
3281	}	3968	}
3282		3969
3283	new CFClient::UI::Label	3970	new CFPlus::UI::Label
3284	markup => $short,	3971	markup => $short,
3285	tooltip => $item->{tooltip},	3972	tooltip => $item->{tooltip},
3286	tooltip_font => $::FONT_PROP,	3973	tooltip_font => $::FONT_PROP,
3287	tooltip_width => 0.67,	3974	tooltip_width => 0.67,
3288	fontsize => $item->{fontsize} || $self->{fontsize},	3975	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3342	count => 1,	4029	count => 1,
3343	%arg,	4030	%arg,
3344	};	4031	};
3345	}	4032	}
3346		4033
		4034	$ROOT->on_refresh (reorder => sub {
3347	$self->reorder;	4035	$self->reorder;
		4036	});
3348	}	4037	}
3349		4038
3350	sub reconfigure {	4039	sub reconfigure {
3351	my ($self) = @_;	4040	my ($self) = @_;
3352		4041
…		…
3365	$self->SUPER::destroy;	4054	$self->SUPER::destroy;
3366	}	4055	}
3367		4056
3368	#############################################################################	4057	#############################################################################
3369		4058
3370	package CFClient::UI::Inventory;
3371
3372	our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374	sub new {
3375	my $class = shift;
3376
3377	my $self = $class->SUPER::new (
3378	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379	@_,
3380	);
3381
3382	$self
3383	}
3384
3385	sub set_items {
3386	my ($self, $items) = @_;
3387
3388	$self->{child}->clear;
3389	return unless $items;
3390
3391	my @items = sort {
3392	($a->{type} <=> $b->{type})
3393	or ($a->{name} cmp $b->{name})
3394	} @$items;
3395
3396	$self->{real_items} = \@items;
3397
3398	my $row = 0;
3399	for my $item (@items) {
3400	CFClient::Item::update_widgets $item;
3401
3402	$self->{child}->add (0, $row, $item->{face_widget});
3403	$self->{child}->add (1, $row, $item->{desc_widget});
3404	$self->{child}->add (2, $row, $item->{weight_widget});
3405
3406	$row++;
3407	}
3408	}
3409
3410	#############################################################################
3411
3412	package CFClient::UI::BindEditor;
3413
3414	our @ISA = CFClient::UI::FancyFrame::;
3415
3416	sub new {
3417	my $class = shift;
3418
3419	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421	$self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425	text => "start recording",
3426	tooltip => "Start/Stops recording of actions."
3427	."All subsequent actions after the recording started will be captured."
3428	."The actions are displayed after the record was stopped."
3429	."To bind the action you have to click on the 'Bind' button",
3430	on_activate => sub {
3431	unless ($self->{recording}) {
3432	$self->start;
3433	} else {
3434	$self->stop;
3435	}
3436	});
3437
3438	$vb->add (new CFClient::UI::Label text => "Actions:");
3439	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3442	$vb->add (my $hb = new CFClient::UI::HBox);
3443	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444	$hb->add (new CFClient::UI::Button
3445	text => "bind",
3446	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447	on_activate => sub {
3448	$self->ask_for_bind;
3449	});
3450
3451	$vb->add (my $hb = new CFClient::UI::HBox);
3452	$hb->add (new CFClient::UI::Button
3453	text => "ok",
3454	expand => 1,
3455	tooltip => "This closes the binding editor and saves the binding",
3456	on_activate => sub {
3457	$self->hide;
3458	$self->commit;
3459	});
3460
3461	$hb->add (new CFClient::UI::Button
3462	text => "cancel",
3463	expand => 1,
3464	tooltip => "This closes the binding editor without saving",
3465	on_activate => sub {
3466	$self->hide;
3467	$self->{binding_cancel}->()
3468	if $self->{binding_cancel};
3469	});
3470
3471	$self->update_binding_widgets;
3472
3473	$self
3474	}
3475
3476	sub commit {
3477	my ($self) = @_;
3478	my ($mod, $sym, $cmds) = $self->get_binding;
3479	if ($sym != 0 && @$cmds > 0) {
3480	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481	."'. Don't forget 'Save Config'!");
3482	$self->{binding_change}->($mod, $sym, $cmds)
3483	if $self->{binding_change};
3484	} else {
3485	$::STATUSBOX->add ("No action bound, no key or action specified!");
3486	$self->{binding_cancel}->()
3487	if $self->{binding_cancel};
3488	}
3489	}
3490
3491	sub start {
3492	my ($self) = @_;
3493
3494	$self->{rec_btn}->set_text ("stop recording");
3495	$self->{recording} = 1;
3496	$self->clear_command_list;
3497	$::CONN->start_record if $::CONN;
3498	}
3499
3500	sub stop {
3501	my ($self) = @_;
3502
3503	$self->{rec_btn}->set_text ("start recording");
3504	$self->{recording} = 0;
3505
3506	my $rec;
3507	$rec = $::CONN->stop_record if $::CONN;
3508	return unless ref $rec eq 'ARRAY';
3509	$self->set_command_list ($rec);
3510	}
3511
3512
3513	sub ask_for_bind_and_commit {
3514	my ($self) = @_;
3515	$self->ask_for_bind (1);
3516	}
3517
3518	sub ask_for_bind {
3519	my ($self, $commit, $end_cb) = @_;
3520
3521	CFClient::Binder::open_binding_dialog (sub {
3522	my ($mod, $sym) = @_;
3523	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524	$self->update_binding_widgets;
3525	$self->commit if $commit;
3526	$end_cb->() if $end_cb;
3527	});
3528	}
3529
3530	# $mod and $sym are the modifiers and key symbol
3531	# $cmds is a array ref of strings (the commands)
3532	# $cb is the callback that is executed on OK
3533	# $ccb is the callback that is executed on CANCEL and
3534	# when the binding was unsuccessful on OK
3535	sub set_binding {
3536	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538	$self->clear_command_list;
3539	$self->{recording} = 0;
3540	$self->{rec_btn}->set_text ("start recording");
3541
3542	$self->{binding} = [$mod, $sym];
3543	$self->{commands} = $cmds;
3544
3545	$self->{binding_change} = $cb;
3546	$self->{binding_cancel} = $ccb;
3547
3548	$self->update_binding_widgets;
3549	}
3550
3551	# this is a shortcut method that asks for a binding
3552	# and then just binds it.
3553	sub do_quick_binding {
3554	my ($self, $cmds, $end_cb) = @_;
3555	$self->set_binding (undef, undef, $cmds, sub {
3556	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557	});
3558	$self->ask_for_bind (1, $end_cb);
3559	}
3560
3561	sub update_binding_widgets {
3562	my ($self) = @_;
3563	my ($mod, $sym, $cmds) = $self->get_binding;
3564	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565	$self->set_command_list ($cmds);
3566	}
3567
3568	sub get_binding {
3569	my ($self) = @_;
3570	return (
3571	$self->{binding}->[0],
3572	$self->{binding}->[1],
3573	[ grep { defined $_ } @{$self->{commands}} ]
3574	);
3575	}
3576
3577	sub clear_command_list {
3578	my ($self) = @_;
3579	$self->{cmdbox}->clear ();
3580	}
3581
3582	sub set_command_list {
3583	my ($self, $cmds) = @_;
3584
3585	$self->{cmdbox}->clear ();
3586	$self->{commands} = $cmds;
3587
3588	my $idx = 0;
3589
3590	for (@$cmds) {
3591	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593	my $i = $idx;
3594	$hb->add (new CFClient::UI::Label text => $_);
3595	$hb->add (new CFClient::UI::Button
3596	text => "delete",
3597	tooltip => "Deletes the action from the record",
3598	on_activate => sub {
3599	$self->{cmdbox}->remove ($hb);
3600	$cmds->[$i] = undef;
3601	});
3602
3603
3604	$idx++
3605	}
3606	}
3607
3608	#############################################################################
3609
3610	package CFClient::UI::SpellList;
3611
3612	our @ISA = CFClient::UI::Table::;
3613
3614	sub new {
3615	my $class = shift;
3616
3617	my $self = $class->SUPER::new (
3618	binding => [],
3619	commands => [],
3620	@_,
3621	)
3622	}
3623
3624	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637	sub rebuild_spell_list {
3638	my ($self) = @_;
3639
3640	$CFClient::UI::ROOT->on_refresh ($self => sub {
3641	$self->clear;
3642
3643	return unless $::CONN;
3644
3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651	my $row = 0;
3652
3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654	my $spell = $self->{spell}{$_};
3655
3656	$row++;
3657
3658	my $spell_cb = sub {
3659	my ($widget, $ev) = @_;
3660
3661	if ($ev->{button} == 1) {
3662	$::CONN->user_send ("cast $spell->{name}");
3663	} elsif ($ev->{button} == 2) {
3664	$::CONN->user_send ("invoke $spell->{name}");
3665	} elsif ($ev->{button} == 3) {
3666	(new CFClient::UI::Menu
3667	items => [
3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670	],
3671	)->popup ($ev);
3672	} else {
3673	return 0;
3674	}
3675
3676	1
3677	};
3678
3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681	#TODO: add path info to tooltip
3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684	$self->add (0, $row, new CFClient::UI::Face
3685	face => $spell->{face},
3686	can_hover => 1,
3687	can_events => 1,
3688	tooltip => $tooltip,
3689	on_button_down => $spell_cb,
3690	);
3691
3692	$self->add (1, $row, new CFClient::UI::Label
3693	expand => 1,
3694	text => $spell->{name},
3695	can_hover => 1,
3696	can_events => 1,
3697	tooltip => $tooltip,
3698	on_button_down => $spell_cb,
3699	);
3700
3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705	}
3706	});
3707	}
3708
3709	sub add_spell {
3710	my ($self, $spell) = @_;
3711
3712	$self->{spell}->{$spell->{name}} = $spell;
3713	$self->rebuild_spell_list;
3714	}
3715
3716	sub remove_spell {
3717	my ($self, $spell) = @_;
3718
3719	delete $self->{spell}->{$spell->{name}};
3720	$self->rebuild_spell_list;
3721	}
3722
3723	sub clear_spells {
3724	my ($self) = @_;
3725
3726	$self->{spell} = {};
3727	$self->rebuild_spell_list;
3728	}
3729
3730	#############################################################################
3731
3732	package CFClient::UI::Root;	4059	package CFPlus::UI::Root;
3733		4060
3734	our @ISA = CFClient::UI::Container::;	4061	our @ISA = CFPlus::UI::Container::;
3735		4062
3736	use List::Util qw(min max);	4063	use List::Util qw(min max);
3737		4064
3738	use CFClient::OpenGL;	4065	use CFPlus::OpenGL;
3739		4066
3740	sub new {	4067	sub new {
3741	my $class = shift;	4068	my $class = shift;
3742		4069
3743	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
3744	visible => 1,	4071	visible => 1,
3745	@_,	4072	@_,
3746	);	4073	);
3747		4074
3748	Scalar::Util::weaken ($self->{root} = $self);	4075	CFPlus::weaken ($self->{root} = $self);
3749		4076
3750	$self	4077	$self
3751	}	4078	}
3752		4079
3753	sub size_request {	4080	sub size_request {
…		…
3919	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920		4247
3921	$w = 0 if $w < 0;	4248	$w = 0 if $w < 0;
3922	$h = 0 if $h < 0;	4249	$h = 0 if $h < 0;
3923		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
3924	$w = int $w + 0.5;	4260	$w = int $w + 0.5;
3925	$h = int $h + 0.5;	4261	$h = int $h + 0.5;
3926		4262
3927	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}) {
3928	$widget->{old_w} = $widget->{w};	4264	$widget->{old_w} = $widget->{w};
…		…
3938		4274
3939	while ($self->{post_alloc_hook}) {	4275	while ($self->{post_alloc_hook}) {
3940	$_->()	4276	$_->()
3941	for values %{delete $self->{post_alloc_hook}};	4277	for values %{delete $self->{post_alloc_hook}};
3942	}	4278	}
3943
3944		4279
3945	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4280	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3946	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4281	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3947	glClear GL_COLOR_BUFFER_BIT;	4282	glClear GL_COLOR_BUFFER_BIT;
3948		4283
…		…
3951	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4286	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952	glMatrixMode GL_MODELVIEW;	4287	glMatrixMode GL_MODELVIEW;
3953	glLoadIdentity;	4288	glLoadIdentity;
3954		4289
3955	{	4290	{
3956	package CFClient::UI::Base;	4291	package CFPlus::UI::Base;
3957		4292
3958	($draw_x, $draw_y, $draw_w, $draw_h) =	4293	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959	(0, 0, $self->{w}, $self->{h});	4294	(0, 0, $self->{w}, $self->{h});
3960	}
3961		4295
3962	$self->_draw;	4296	$self->_draw;
		4297	}
3963	}	4298	}
3964		4299
3965	#############################################################################	4300	#############################################################################
3966		4301
3967	package CFClient::UI;	4302	package CFPlus::UI;
3968		4303
3969	$ROOT = new CFClient::UI::Root;	4304	$ROOT = new CFPlus::UI::Root;
3970	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4305	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971		4306
3972	1	4307	1
3973		4308

Diff Legend

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