ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	36	$TOOLTIP->show;
39	}	37	}
40		38
41	return;	39	return;
42	}	40	}
43	}	41	}
44	}	42	}
45		43
46	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
48	});	47	});
49		48
50	sub get_layout {	49	sub get_layout {
51	my $layout;	50	my $layout;
…		…
79	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	79	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	80	if $FOCUS;
82	}	81	}
83		82
		83	sub check_hover {
		84	my ($widget) = @_;
		85
		86	if ($widget != $HOVER) {
		87	my $hover = $HOVER; $HOVER = $widget;
		88
		89	$hover->update if $hover && $hover->{can_hover};
		90	$HOVER->update if $HOVER && $HOVER->{can_hover};
		91
		92	$TOOLTIP_WATCHER->start;
		93	}
		94	}
		95
84	sub feed_sdl_button_down_event {	96	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	97	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
87		99
88	if (!$BUTTON_STATE) {	100	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		101
		102	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	103	my $widget = $ROOT->find_widget ($x, $y);
90		104
91	$GRAB = $widget;	105	$GRAB = $widget;
92	$GRAB->update if $GRAB;	106	$GRAB->update if $GRAB;
93		107
94	$TOOLTIP_WATCHER->cb->();	108	$TOOLTIP_WATCHER->cb->();
95	}	109	}
96		110
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	111	if ($GRAB) {
		112	if ($ev->{button} == 4 || $ev->{button} == 5) {
		113	# mousewheel
		114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		116
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	118	$ev->{dy} = $shift ? 0 : $delta;
		119
		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	{ "\fw" => $_[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
…		…
330	$self->{force_h} = $h;	360	$self->{force_h} = $h;
331		361
332	$self->realloc;	362	$self->realloc;
333	}	363	}
334		364
		365	# traverse the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return $self->{parent}->get_max_wh
		370	if $self->{parent};
		371
		372	($::WIDTH, $::HEIGHT)
		373	}
		374
335	sub size_request {	375	sub size_request {
336	require Carp;	376	require Carp;
337	Carp::confess "size_request is abstract";	377	Carp::confess "size_request is abstract";
338	}	378	}
339		379
		380	sub baseline_shift {
		381	0
		382	}
		383
340	sub configure {	384	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	385	my ($self, $x, $y, $w, $h) = @_;
342		386
343	if ($self->{aspect}) {	387	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	388	my ($ow, $oh) = ($w, $h);
345		389
346	$w = List::Util::min $w, int $h * $self->{aspect};	390	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	391	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		392
349	# use alignment to adjust x, y	393	# use alignment to adjust x, y
350		394
351	$x += int 0.5 * ($ow - $w);	395	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	396	$y += int 0.5 * ($oh - $h);
…		…
393		437
394	return if $self->{tooltip} eq $tooltip;	438	return if $self->{tooltip} eq $tooltip;
395		439
396	$self->{tooltip} = $tooltip;	440	$self->{tooltip} = $tooltip;
397		441
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	442	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	443	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	444	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	445	}
402	}	446	}
403		447
404	# translate global coordinates to local coordinate system	448	# translate global coordinates to local coordinate system
405	sub coord2local {	449	sub coord2local {
406	my ($self, $x, $y) = @_;	450	my ($self, $x, $y) = @_;
407		451
		452	Carp::confess unless $self->{parent};#d#
		453
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	454	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	455	}
410		456
411	# translate local coordinates to global coordinate system	457	# translate local coordinates to global coordinate system
412	sub coord2global {	458	sub coord2global {
413	my ($self, $x, $y) = @_;	459	my ($self, $x, $y) = @_;
414		460
		461	Carp::confess unless $self->{parent};#d#
		462
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	463	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	464	}
417		465
418	sub invoke_focus_in {	466	sub invoke_focus_in {
419	my ($self) = @_;	467	my ($self) = @_;
420		468
421	return if $FOCUS == $self;	469	return if $FOCUS == $self;
422	return unless $self->{can_focus};	470	return unless $self->{can_focus};
423		471
424	my $focus = $FOCUS; $FOCUS = $self;	472	$FOCUS = $self;
425		473
426	$focus->update if $focus;	474	$self->update;
427	$FOCUS->update;
428		475
429	0	476	0
430	}	477	}
431		478
432	sub invoke_focus_out {	479	sub invoke_focus_out {
433	my ($self) = @_;	480	my ($self) = @_;
434		481
435	return unless $FOCUS == $self;	482	return unless $FOCUS == $self;
436		483
437	my $focus = $FOCUS; undef $FOCUS;	484	undef $FOCUS;
438		485
439	$focus->update if $focus; #?	486	$self->update;
440		487
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	488	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	489	unless $FOCUS;
443		490
444	0	491	0
445	}	492	}
446		493
447	sub grab_focus {	494	sub grab_focus {
448	my ($self) = @_;	495	my ($self) = @_;
449		496
		497	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	498	$self->emit ("focus_in");
451	}	499	}
452		500
453	sub invoke_mouse_motion { 1 }	501	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	502	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	503	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	504	sub invoke_key_up { 0 }
		505	sub invoke_mouse_wheel { 0 }
457		506
458	sub invoke_button_down {	507	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	508	my ($self, $ev, $x, $y) = @_;
460		509
461	$self->grab_focus;	510	$self->grab_focus;
462		511
463	1	512	0
464	}	513	}
465		514
466	sub connect {	515	sub connect {
467	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
468		517
469	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
		519
		520	defined wantarray and CFPlus::guard {
		521	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		522	@{ $self->{signal_cb}{$signal} };
		523	}
470	}	524	}
		525
		526	sub disconnect_all {
		527	my ($self, $signal) = @_;
		528
		529	delete $self->{signal_cb}{$signal};
		530	}
		531
		532	my %has_coords = (
		533	button_down => 1,
		534	button_up => 1,
		535	mouse_motion => 1,
		536	mouse_wheel => 1,
		537	);
471		538
472	sub emit {	539	sub emit {
473	my ($self, $signal, @args) = @_;	540	my ($self, $signal, @args) = @_;
474		541
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	542	# I do not really like this solution, but I do not like duplication
		543	# and needlessly verbose code, either.
		544	my @append
		545	= $has_coords{$signal}
		546	? $args[0]->xy ($self)
		547	: ();
		548
		549	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		550
		551	for my $cb (
		552	@{$self->{signal_cb}{$signal} || []}, # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	553	($self->can ("invoke_$signal") || sub { 1 }), # closure
		554	) {
		555	return $cb->($self, @args, @append) || next;
		556	}
		557
		558	# parent
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	559	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	560	}
479		561
480	sub find_widget {	562	#sub find_widget {
481	my ($self, $x, $y) = @_;	563	# 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		564
492	sub set_parent {	565	sub set_parent {
493	my ($self, $parent) = @_;	566	my ($self, $parent) = @_;
494		567
495	Scalar::Util::weaken ($self->{parent} = $parent);	568	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	569	$self->set_visible if $parent->{visible};
497	}	570	}
498		571
499	sub realloc {	572	sub realloc {
500	my ($self) = @_;	573	my ($self) = @_;
…		…
526		599
527	# using global variables seems a bit hacky, but passing through all drawing	600	# using global variables seems a bit hacky, but passing through all drawing
528	# functions seems pointless.	601	# functions seems pointless.
529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	602	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530		603
531	sub draw {	604	#sub draw {
532	my ($self) = @_;	605	#CFPlus.xs
533
534	return unless $self->{h} && $self->{w};
535
536	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541
542	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545
546	glPushMatrix;
547	glTranslate $self->{x}, $self->{y}, 0;
548
549	if ($self == $HOVER && $self->{can_hover}) {
550	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551	glEnable GL_BLEND;
552	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553	glBegin GL_QUADS;
554	glVertex 0 , 0;
555	glVertex $self->{w}, 0;
556	glVertex $self->{w}, $self->{h};
557	glVertex 0 , $self->{h};
558	glEnd;
559	glDisable GL_BLEND;
560	}
561
562	if ($ENV{CFPLUS_DEBUG} & 1) {
563	glPushMatrix;
564	glColor 1, 1, 0, 1;
565	glTranslate 0.375, 0.375;
566	glBegin GL_LINE_LOOP;
567	glVertex 0 , 0;
568	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;
571	glEnd;
572	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}
575
576	$self->_draw;
577	glPopMatrix;
578	}
579		606
580	sub _draw {	607	sub _draw {
581	my ($self) = @_;	608	my ($self) = @_;
582		609
583	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
584	}	611	}
585		612
586	sub DESTROY {	613	sub DESTROY {
587	my ($self) = @_;	614	my ($self) = @_;
588		615
589	delete $WIDGET{$self+0};	616	return if CFPlus::in_destruct;
590		617
		618	local $@;
591	eval { $self->destroy };	619	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		621
		622	delete $WIDGET{$self+0};
593	}	623	}
594		624
595	#############################################################################	625	#############################################################################
596		626
597	package CFClient::UI::DrawBG;	627	package CFPlus::UI::DrawBG;
598		628
599	our @ISA = CFClient::UI::Base::;	629	our @ISA = CFPlus::UI::Base::;
600		630
601	use strict;	631	use strict;
602	use CFClient::OpenGL;	632	use CFPlus::OpenGL;
603		633
604	sub new {	634	sub new {
605	my $class = shift;	635	my $class = shift;
606
607	# range [value, low, high, page]
608		636
609	$class->SUPER::new (	637	$class->SUPER::new (
610	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
611	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
612	@_	640	@_
…		…
624	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
625		653
626	glEnable GL_BLEND;	654	glEnable GL_BLEND;
627	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
628	glColor_premultiply @$color;	656	glColor_premultiply @$color;
629
630	glBegin GL_QUADS;
631	glVertex 0 , 0;
632	glVertex 0 , $h;
633	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
634	glVertex $w, 0;
635	glEnd;
636
637	glDisable GL_BLEND;	658	glDisable GL_BLEND;
638	}	659	}
639	}	660	}
640		661
641	#############################################################################	662	#############################################################################
642		663
643	package CFClient::UI::Empty;	664	package CFPlus::UI::Empty;
644		665
645	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
646		667
647	sub new {	668	sub new {
648	my ($class, %arg) = @_;	669	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	670	$class->SUPER::new (can_events => 0, %arg);
650	}	671	}
…		…
657		678
658	sub draw { }	679	sub draw { }
659		680
660	#############################################################################	681	#############################################################################
661		682
662	package CFClient::UI::Container;	683	package CFPlus::UI::Container;
663		684
664	our @ISA = CFClient::UI::Base::;	685	our @ISA = CFPlus::UI::Base::;
665		686
666	sub new {	687	sub new {
667	my ($class, %arg) = @_;	688	my ($class, %arg) = @_;
668		689
669	my $children = delete $arg{children};	690	my $children = delete $arg{children};
…		…
673	can_events => 0,	694	can_events => 0,
674	%arg,	695	%arg,
675	);	696	);
676		697
677	$self->add (@$children)	698	$self->add (@$children)
678	if $children;	699	if $children && @$children;
679		700
680	$self	701	$self
		702	}
		703
		704	sub realloc {
		705	my ($self) = @_;
		706
		707	$self->{force_realloc} = 1;
		708	$self->{force_size_alloc} = 1;
		709	$self->SUPER::realloc;
681	}	710	}
682		711
683	sub add {	712	sub add {
684	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
685		714
686	$_->set_parent ($self)	715	$_->set_parent ($self)
687	for @widgets;	716	for @widgets;
688		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
689	use sort 'stable';	719	use sort 'stable';
690		720
691	$self->{children} = [	721	$self->{children} = [
692	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
693	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
694	];	724	];
695		725
696	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
697	}	731	}
698		732
699	sub children {	733	sub children {
700	@{ $_[0]{children} }	734	@{ $_[0]{children} }
701	}	735	}
702		736
703	sub remove {	737	sub remove {
704	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
705		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
706	delete $child->{parent};	743	delete $child->{parent};
707	$child->hide;	744	$child->hide;
708
709	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
710		747
711	$self->realloc;	748	$self->realloc;
712	}	749	}
713		750
714	sub clear {	751	sub clear {
715	my ($self) = @_;	752	my ($self) = @_;
716		753
717	my $children = delete $self->{children};	754	my $children = $self->{children};
718	$self->{children} = [];	755	$self->{children} = [];
719		756
720	for (@$children) {	757	for (@$children) {
721	delete $_->{parent};	758	delete $_->{parent};
722	$_->hide;	759	$_->hide;
…		…
742	}	779	}
743		780
744	sub _draw {	781	sub _draw {
745	my ($self) = @_;	782	my ($self) = @_;
746		783
747	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
748	}	785	}
749		786
750	#############################################################################	787	#############################################################################
751		788
752	package CFClient::UI::Bin;	789	package CFPlus::UI::Bin;
753		790
754	our @ISA = CFClient::UI::Container::;	791	our @ISA = CFPlus::UI::Container::;
755		792
756	sub new {	793	sub new {
757	my ($class, %arg) = @_;	794	my ($class, %arg) = @_;
758		795
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	796	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		797
761	$class->SUPER::new (children => [$child], %arg)	798	$class->SUPER::new (children => [$child], %arg)
762	}	799	}
763		800
764	sub add {	801	sub add {
765	my ($self, $child) = @_;	802	my ($self, $child) = @_;
766		803
767	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
768	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
769	}	806	}
770		807
771	sub remove {	808	sub remove {
772	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
773		810
774	$self->SUPER::remove ($widget);	811	$self->SUPER::remove ($widget);
775		812
776	$self->{children} = [new CFClient::UI::Empty]	813	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	814	unless @{$self->{children}};
778	}	815	}
779		816
780	sub child { $_[0]->{children}[0] }	817	sub child { $_[0]->{children}[0] }
781		818
…		…
790		827
791	1	828	1
792	}	829	}
793		830
794	#############################################################################	831	#############################################################################
795
796	# back-buffered drawing area	832	# back-buffered drawing area
797		833
798	package CFClient::UI::Window;	834	package CFPlus::UI::Window;
799		835
800	our @ISA = CFClient::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
801		837
802	use CFClient::OpenGL;	838	use CFPlus::OpenGL;
803		839
804	sub new {	840	sub new {
805	my ($class, %arg) = @_;	841	my ($class, %arg) = @_;
806		842
807	my $self = $class->SUPER::new (%arg);	843	my $self = $class->SUPER::new (%arg);
…		…
829	}	865	}
830		866
831	sub render_child {	867	sub render_child {
832	my ($self) = @_;	868	my ($self) = @_;
833		869
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	870	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	871	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	872	glClear GL_COLOR_BUFFER_BIT;
837		873
838	{	874	{
839	package CFClient::UI::Base;	875	package CFPlus::UI::Base;
840		876
841	($draw_x, $draw_y, $draw_w, $draw_h) =	877	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	878	(0, 0, $self->{w}, $self->{h});
		879
		880	$self->_render;
843	}	881	}
844
845	$self->_render;
846	};	882	};
847	}	883	}
848		884
849	sub _draw {	885	sub _draw {
850	my ($self) = @_;	886	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		887
854	my $tex = $self->{texture}	888	my $tex = $self->{texture}
855	or return;	889	or return;
856		890
857	glEnable GL_TEXTURE_2D;	891	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	893	glColor 0, 0, 0, 1;
860		894
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	895	$tex->draw_quad_alpha_premultiplied (0, 0);
862		896
863	glDisable GL_TEXTURE_2D;	897	glDisable GL_TEXTURE_2D;
864	}	898	}
865		899
866	#############################################################################	900	#############################################################################
867		901
868	package CFClient::UI::ViewPort;	902	package CFPlus::UI::ViewPort;
869		903
		904	use List::Util qw(min max);
		905
870	our @ISA = CFClient::UI::Window::;	906	our @ISA = CFPlus::UI::Window::;
871		907
872	sub new {	908	sub new {
873	my $class = shift;	909	my $class = shift;
874		910
875	$class->SUPER::new (	911	$class->SUPER::new (
…		…
882	sub size_request {	918	sub size_request {
883	my ($self) = @_;	919	my ($self) = @_;
884		920
885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886		922
887	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
888	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
889		925
890	($w, $h)	926	($w, $h)
891	}	927	}
892		928
893	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
905	}	941	}
906		942
907	sub set_offset {	943	sub set_offset {
908	my ($self, $x, $y) = @_;	944	my ($self, $x, $y) = @_;
909		945
		946	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		947	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		948
		949	if ($x != $self->{view_x} or $y != $self->{view_y}) {
910	$self->{view_x} = int $x;	950	$self->{view_x} = $x;
911	$self->{view_y} = int $y;	951	$self->{view_y} = $y;
912		952
		953	$self->emit (changed => $x, $y);
913	$self->update;	954	$self->update;
		955	}
		956	}
		957
		958	sub set_center {
		959	my ($self, $x, $y) = @_;
		960
		961	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		962	}
		963
		964	sub make_visible {
		965	my ($self, $x, $y, $border) = @_;
		966
		967	if ( $x < $self->{view_x} + $self->{w} * $border
		968	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		969	|| $y < $self->{view_y} + $self->{h} * $border
		970	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		971	) {
		972	$self->set_center ($x, $y);
		973	}
914	}	974	}
915		975
916	# hmm, this does not work for topleft of $self... but we should not ask for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
917	sub coord2local {	977	sub coord2local {
918	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
…		…
933	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
934		994
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	997	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	999	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1001	}
942	}	1002	}
943		1003
944	sub _render {	1004	sub _render {
945	my ($self) = @_;	1005	my ($self) = @_;
946		1006
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	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};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1009
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1011
952	$self->SUPER::_render;	1012	$self->SUPER::_render;
953	}	1013	}
954		1014
955	#############################################################################	1015	#############################################################################
956		1016
957	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
958		1018
959	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::Table::;
960		1020
961	sub new {	1021	sub new {
962	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
963		1023
964	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
965		1025
966	my $self;	1026	my $self;
967		1027
968	my $slider = new CFClient::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
		1031	vertical => 0,
		1032	range => [0, 0, 1, 0.01], # HACK fix
		1033	on_changed => sub {
		1034	$self->{hpos} = $_[1];
		1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1036	},
		1037	;
		1038
		1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
969	vertical => 1,	1042	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1044	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vpos} = $_[1];
		1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973	},	1047	},
974	;	1048	;
975		1049
976	$self = $class->SUPER::new (	1050	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1051	scroll_x => 0,
		1052	scroll_y => 1,
		1053	can_events => 1,
978	slider => $slider,	1054	hslider => $hslider,
		1055	vslider => $vslider,
		1056	col_expand => [1, 0],
		1057	row_expand => [1, 0],
979	%arg,	1058	%arg,
980	);	1059	);
981		1060
		1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
		1064	expand => 1,
		1065	scroll_x => $self->{scroll_x},
		1066	scroll_y => $self->{scroll_y},
		1067	on_changed => sub {
		1068	my ($vp, $x, $y) = @_;
		1069
		1070	$vp->{parent}{hslider}->set_value ($x);
		1071	$vp->{parent}{vslider}->set_value ($y);
		1072
		1073	0
		1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
		1080	;
		1081
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add ($self->{vp});
		1083
983	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
984		1085
985	$self	1086	$self
986	}	1087	}
987		1088
…		…
989	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
990		1091
991	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
992	}	1093	}
993		1094
		1095	sub set_offset { shift->{vp}->set_offset (@_) }
		1096	sub set_center { shift->{vp}->set_center (@_) }
		1097	sub make_visible { shift->{vp}->make_visible (@_) }
		1098
994	sub update {	1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	if ($self->{scroll_x}) {
		1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107
		1108	my $visible = $w1 > $w2;
		1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
		1111	$visible ? $self->SUPER::add ($self->{hslider})
		1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
		1114	}
		1115
		1116	if ($self->{scroll_y}) {
		1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1118	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1119
		1120	my $visible = $h1 > $h2;
		1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
		1123	$visible ? $self->SUPER::add ($self->{vslider})
		1124	: $self->SUPER::remove ($self->{vslider});
		1125	}
		1126	}
		1127	}
		1128
		1129	sub start_dragging {
995	my ($self) = @_;	1130	my ($self, $ev) = @_;
996		1131
997	$self->SUPER::update;	1132	$self->grab_focus;
998		1133
999	# todo: overwrite size_allocate of child	1134	my $ox = $self->{vp}{view_x};
1000	my $child = $self->{vp}->child;	1135	my $oy = $self->{vp}{view_y};
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1136
		1137	$self->{motion} = sub {
		1138	my ($ev, $x, $y) = @_;
		1139
		1140	$ox -= $ev->{xrel};
		1141	$oy -= $ev->{yrel};
		1142
		1143	$self->{vp}->set_offset ($ox, $oy);
		1144	};
		1145	}
		1146
		1147	sub invoke_mouse_wheel {
		1148	my ($self, $ev) = @_;
		1149
		1150	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1151	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1152
		1153	1
		1154	}
		1155
		1156	sub invoke_button_down {
		1157	my ($self, $ev, $x, $y) = @_;
		1158
		1159	if ($ev->{button} == 2) {
		1160	$self->start_dragging ($ev);
		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 (
…		…
1037	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1038		1217
1039	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1040	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1042
1043	glBegin GL_QUADS;
1044	glVertex 0 , 0;
1045	glVertex 0 , $h;
1046	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1047	glVertex $w, 0;
1048	glEnd;
1049
1050	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1051	}	1223	}
1052		1224
1053	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1054	}	1226	}
1055		1227
1056	#############################################################################	1228	#############################################################################
1057		1229
1058	package CFClient::UI::FancyFrame;	1230	package CFPlus::UI::FancyFrame;
1059		1231
1060	our @ISA = CFClient::UI::Bin::;	1232	our @ISA = CFPlus::UI::Bin::;
1061		1233
1062	use CFClient::OpenGL;	1234	use CFPlus::OpenGL;
		1235
		1236	sub new {
		1237	my ($class, %arg) = @_;
		1238
		1239	if ((exists $arg{label}) && !ref $arg{label}) {
		1240	$arg{label} = new CFPlus::UI::Label
		1241	align => 1,
		1242	valign => 0,
		1243	text => $arg{label},
		1244	fontsize => ($arg{border} || 0.8) * 0.75;
		1245	}
		1246
		1247	my $self = $class->SUPER::new (
		1248	# label => "",
		1249	fg => [0.6, 0.3, 0.1],
		1250	border => 0.8,
		1251	style => 'single',
		1252	%arg,
		1253	);
		1254
		1255	$self
		1256	}
		1257
		1258	sub add {
		1259	my ($self, @widgets) = @_;
		1260
		1261	$self->SUPER::add (@widgets);
		1262	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1263	}
		1264
		1265	sub border {
		1266	int $_[0]{border} * $::FONTSIZE
		1267	}
		1268
		1269	sub size_request {
		1270	my ($self) = @_;
		1271
		1272	($self->{label_w}, undef) = $self->{label}->size_request
		1273	if $self->{label};
		1274
		1275	my ($w, $h) = $self->SUPER::size_request;
		1276
		1277	(
		1278	$w + $self->border * 2,
		1279	$h + $self->border * 2,
		1280	)
		1281	}
		1282
		1283	sub invoke_size_allocate {
		1284	my ($self, $w, $h) = @_;
		1285
		1286	my $border = $self->border;
		1287
		1288	$w -= List::Util::max 0, $border * 2;
		1289	$h -= List::Util::max 0, $border * 2;
		1290
		1291	if (my $label = $self->{label}) {
		1292	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1293	$label->{h} = List::Util::min $h, $border;
		1294	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1295	}
		1296
		1297	$self->child->configure ($border, $border, $w, $h);
		1298
		1299	1
		1300	}
		1301
		1302	sub _draw {
		1303	my ($self) = @_;
		1304
		1305	my $child = $self->{children}[0];
		1306
		1307	my $border = $self->border;
		1308	my ($w, $h) = ($self->{w}, $self->{h});
		1309
		1310	$child->draw;
		1311
		1312	glColor @{$self->{fg}};
		1313	glBegin GL_LINE_STRIP;
		1314	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1315	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1317	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1319	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1320	glEnd;
		1321
		1322	if ($self->{label}) {
		1323	glTranslate $border * 2, 0;
		1324	$self->{label}->_draw;
		1325	}
		1326	}
		1327
		1328	#############################################################################
		1329
		1330	package CFPlus::UI::Toplevel;
		1331
		1332	our @ISA = CFPlus::UI::Bin::;
		1333
		1334	use CFPlus::OpenGL;
1063		1335
1064	my $bg =	1336	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1337	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1338	mipmap => 1, wrap => 1;
1067		1339
1068	my @border =	1340	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1341	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);	1342	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1343
		1344	my @icon =
		1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1346	qw(x1_move.png x1_resize.png);
1071		1347
1072	sub new {	1348	sub new {
1073	my ($class, %arg) = @_;	1349	my ($class, %arg) = @_;
1074		1350
1075	my $self = $class->SUPER::new (	1351	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1352	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1353	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1354	border => 0.6,
1079	can_events => 1,	1355	can_events => 1,
1080	min_w => 16,	1356	min_w => 64,
1081	min_h => 16,	1357	min_h => 32,
1082	%arg,	1358	%arg,
1083	);	1359	);
1084		1360
1085	$self->{title_widget} = new CFClient::UI::Label	1361	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1362	align => 0,
1087	valign => 1,	1363	valign => 1,
1088	text => $self->{title},	1364	text => $self->{title},
1089	fontsize => $self->{border},	1365	fontsize => $self->{border},
1090	if exists $self->{title};	1366	if exists $self->{title};
1091		1367
1092	if ($self->{has_close_button}) {	1368	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1369	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1370	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1371	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1372	on_activate => sub { $self->emit ("delete") };
1097		1373
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1374	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1375	}
1100		1376
1101	$self	1377	$self
1102	}	1378	}
1103		1379
1104	sub add {	1380	sub add {
1105	my ($self, @widgets) = @_;	1381	my ($self, @widgets) = @_;
1106		1382
1107	$self->SUPER::add (@widgets);	1383	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1384	$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};	1385	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1386	}
1111		1387
1112	sub border {	1388	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
		1390	}
		1391
		1392	sub get_max_wh {
		1393	my ($self) = @_;
		1394
		1395	return ($self->{w}, $self->{h})
		1396	if $self->{visible} && $self->{w};
		1397
		1398	$self->SUPER::get_max_wh
1114	}	1399	}
1115		1400
1116	sub size_request {	1401	sub size_request {
1117	my ($self) = @_;	1402	my ($self) = @_;
1118		1403
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1432	$self->child->configure ($border, $border, $w, $h);
1148		1433
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1434	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1435	if $self->{close_button};
1151		1436
		1437	1
		1438	}
		1439
		1440	sub invoke_delete {
		1441	my ($self) = @_;
		1442
		1443	$self->hide;
		1444
1152	1	1445	1
1153	}	1446	}
1154		1447
1155	sub invoke_button_down {	1448	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1449	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1507	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1508
1216	! ! $self->{motion}	1509	! ! $self->{motion}
1217	}	1510	}
1218		1511
		1512	sub invoke_visibility_change {
		1513	my ($self, $visible) = @_;
		1514
		1515	delete $self->{motion} unless $visible;
		1516
		1517	0
		1518	}
		1519
1219	sub _draw {	1520	sub _draw {
1220	my ($self) = @_;	1521	my ($self) = @_;
1221		1522
1222	my $child = $self->{children}[0];	1523	my $child = $self->{children}[0];
1223		1524
…		…
1228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229		1530
1230	my $border = $self->border;	1531	my $border = $self->border;
1231		1532
1232	glColor @{ $self->{border_bg} };	1533	glColor @{ $self->{border_bg} };
1233	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1534	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1535	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1536	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1537	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1538
		1539	# move
		1540	my $w2 = ($w - $border) * .5;
		1541	my $h2 = ($h - $border) * .5;
		1542	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1543	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1545
		1546	# resize
		1547	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1548	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1549	unless $self->{has_close_button};
		1550	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1551	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237		1552
1238	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1553	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239	glColor @{ $self->{bg} };	1554	glColor @{ $self->{bg} };
1240		1555
1241	# TODO: repeat texture not scale	1556	# TODO: repeat texture not scale
…		…
1260	if $self->{close_button};	1575	if $self->{close_button};
1261	}	1576	}
1262		1577
1263	#############################################################################	1578	#############################################################################
1264		1579
1265	package CFClient::UI::Table;	1580	package CFPlus::UI::Table;
1266		1581
1267	our @ISA = CFClient::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1268		1583
1269	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1270		1585
1271	use CFClient::OpenGL;	1586	use CFPlus::OpenGL;
1272		1587
1273	sub new {	1588	sub new {
1274	my $class = shift;	1589	my $class = shift;
1275		1590
1276	$class->SUPER::new (	1591	$class->SUPER::new (
1277	col_expand => [],	1592	col_expand => [],
		1593	row_expand => [],
1278	@_,	1594	@_,
1279	)	1595	)
1280	}	1596	}
1281		1597
1282	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}
1285
1286	sub add {	1598	sub add {
1287	my ($self, $x, $y, $child) = @_;	1599	my ($self, @widgets) = @_;
1288		1600
1289	$child->set_parent ($self);	1601	for my $child (@widgets) {
1290	$self->{children}[$y][$x] = $child;	1602	$child->{c_rowspan} ||= 1;
		1603	$child->{c_colspan} ||= 1;
		1604	}
1291		1605
1292	$self->realloc;	1606	$self->SUPER::add (@widgets);
1293	}	1607	}
1294		1608
1295	sub remove {	1609	sub add_at {
		1610	my $self = shift;
		1611
		1612	my @widgets;
		1613
		1614	while (@_) {
		1615	my ($col, $row, $child) = splice @_, 0, 3, ();
		1616
		1617	$child->{c_row} = $row;
		1618	$child->{c_col} = $col;
		1619
		1620	push @widgets, $child;
		1621	}
		1622
		1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1296	my ($self, $child) = @_;	1627	my ($self) = @_;
1297		1628
1298	# TODO: not yet implemented	1629	my (@w, @h);
1299	}
1300
1301	# TODO: move to container class maybe? send children a signal on removal?
1302	sub clear {
1303	my ($self) = @_;
1304		1630
1305	my @children = $self->children;	1631	my @children = $self->children;
1306	delete $self->{children};	1632
		1633	# first pass, columns
		1634	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1635	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1636
		1637	my $sw = sum @w[$c .. $c + $cs - 1];
		1638
		1639	if ($w > $sw) {
		1640	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1641	}
1307		1642	}
1308	for (@children) {
1309	delete $_->{parent};
1310	$_->hide;
1311	}
1312		1643
1313	$self->realloc;	1644	# second pass, rows
1314	}	1645	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1315
1316	sub get_wh {
1317	my ($self) = @_;
1318
1319	my (@w, @h);
1320
1321	for my $y (0 .. $#{$self->{children}}) {
1322	my $row = $self->{children}[$y]
1323	or next;
1324
1325	for my $x (0 .. $#$row) {
1326	my $widget = $row->[$x]
1327	or next;
1328	my ($w, $h) = @$widget{qw(req_w req_h)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1329		1647
1330	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1331	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1332	}	1652	}
1333	}	1653	}
1334		1654
1335	(\@w, \@h)	1655	(\@w, \@h)
1336	}	1656	}
…		…
1352	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1353		1673
1354	my $req_w = (sum @$ws) || 1;	1674	my $req_w = (sum @$ws) || 1;
1355	my $req_h = (sum @$hs) || 1;	1675	my $req_h = (sum @$hs) || 1;
1356		1676
1357	# TODO: nicer code && do row_expand	1677	# now linearly scale the rows/columns to the allocated size
1358	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1359	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1360	my $col_expand = (sum @col_expand) || 1;	1680	my $col_expand = (sum @col_expand) || 1;
1361		1681
1362	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1683
1366	CFClient::UI::harmonize $ws;	1684	CFPlus::UI::harmonize $ws;
		1685
		1686	my @row_expand = @{$self->{row_expand}};
		1687	@row_expand = (1) x @$ws unless @row_expand;
		1688	my $row_expand = (sum @row_expand) || 1;
		1689
		1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1691
1367	CFClient::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1368		1693
1369	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1370		1696
1371	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1372	my $row = $self->{children}[$r]	1698	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1373	or next;
1374		1699
1375	my $x = 0;	1700	$widget->configure (
1376	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1377		1703	);
1378	for my $c (0 .. $#$row) {	1704	}
1379	my $col_w = $ws->[$c];
1380		1705
1381	if (my $widget = $row->[$c]) {	1706	1
1382	$widget->configure ($x, $y, $col_w, $row_h);	1707	}
1383	}
1384		1708
1385	$x += $col_w;	1709	#############################################################################
		1710
		1711	package CFPlus::UI::Fixed;
		1712
		1713	use List::Util qw(min max);
		1714
		1715	our @ISA = CFPlus::UI::Container::;
		1716
		1717	sub _scale($$$) {
		1718	my ($rel, $val, $max) = @_;
		1719
		1720	$rel ? $val * $max : $val
		1721	}
		1722
		1723	sub size_request {
		1724	my ($self) = @_;
		1725
		1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1727
		1728	# determine overall size by querying abs widgets
		1729	for my $child ($self->visible_children) {
		1730	unless ($child->{c_rel}) {
		1731	my $x = $child->{c_x};
		1732	my $y = $child->{c_y};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1386	}	1736	}
		1737	}
1387		1738
1388	$y += $row_h;	1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	# now layout remaining widgets
		1743	for my $child ($self->visible_children) {
		1744	if ($child->{c_rel}) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1750	}
		1751	}
		1752
		1753	my $W = $x2 - $x1;
		1754	my $H = $y2 - $y1;
		1755
		1756	($W, $H)
		1757	}
		1758
		1759	sub invoke_size_allocate {
		1760	my ($self, $W, $H) = @_;
		1761
		1762	for my $child ($self->visible_children) {
		1763	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1764	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1765
		1766	$x += $child->{c_halign} * $child->{req_w};
		1767	$y += $child->{c_valign} * $child->{req_h};
		1768
		1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1389	}	1770	}
1390		1771
1391	1	1772	1
1392	}	1773	}
1393		1774
1394	sub find_widget {
1395	my ($self, $x, $y) = @_;
1396
1397	$x -= $self->{x};
1398	$y -= $self->{y};
1399
1400	my $res;
1401
1402	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1403	$res = $_->find_widget ($x, $y)
1404	and return $res;
1405	}
1406
1407	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1408	}
1409
1410	sub _draw {
1411	my ($self) = @_;
1412
1413	for (grep $_, @{$self->{children}}) {
1414	$_->draw for grep $_, @$_;
1415	}
1416	}
1417
1418	#############################################################################	1775	#############################################################################
1419		1776
1420	package CFClient::UI::Box;	1777	package CFPlus::UI::Box;
1421		1778
1422	our @ISA = CFClient::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1423		1780
1424	sub size_request {	1781	sub size_request {
1425	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1426		1785
1427	$self->{vertical}	1786	$self->{vertical}
1428	? (	1787	? (
1429	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1430	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1431	)	1790	)
1432	: (	1791	: (
1433	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1434	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1435	)	1794	)
1436	}	1795	}
1437		1796
1438	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
1440		1799
1441	my $space = $self->{vertical} ? $h : $w;	1800	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1801	my @children = $self->visible_children;
1443		1802
1444	my @req;	1803	my @req;
1445		1804
1446	if ($self->{homogeneous}) {	1805	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1806	@req = ($space / (@children || 1)) x @children;
1448	} else {	1807	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1808	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1809	my $req = List::Util::sum @req;
1451		1810
1452	if ($req > $space) {	1811	if ($req > $space) {
1453	# ah well, not enough space	1812	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1813	$_ *= $space / $req for @req;
1455	} else {	1814	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1815	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1816
1458	$space = ($space - $req) / $expand; # remaining space to give away	1817	$space = ($space - $req) / $expand; # remaining space to give away
1459		1818
1460	$req[$_] += $space * $children->[$_]{expand}	1819	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1820	for 0 .. $#children;
1462	}	1821	}
1463	}	1822	}
1464		1823
1465	CFClient::UI::harmonize \@req;	1824	CFPlus::UI::harmonize \@req;
1466		1825
1467	my $pos = 0;	1826	my $pos = 0;
1468	for (0 .. $#$children) {	1827	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1828	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1829	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1830
1472	$pos += $alloc;	1831	$pos += $alloc;
1473	}	1832	}
1474		1833
1475	1	1834	1
1476	}	1835	}
1477		1836
1478	#############################################################################	1837	#############################################################################
1479		1838
1480	package CFClient::UI::HBox;	1839	package CFPlus::UI::HBox;
1481		1840
1482	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1483		1842
1484	sub new {	1843	sub new {
1485	my $class = shift;	1844	my $class = shift;
1486		1845
1487	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1490	)	1849	)
1491	}	1850	}
1492		1851
1493	#############################################################################	1852	#############################################################################
1494		1853
1495	package CFClient::UI::VBox;	1854	package CFPlus::UI::VBox;
1496		1855
1497	our @ISA = CFClient::UI::Box::;	1856	our @ISA = CFPlus::UI::Box::;
1498		1857
1499	sub new {	1858	sub new {
1500	my $class = shift;	1859	my $class = shift;
1501		1860
1502	$class->SUPER::new (	1861	$class->SUPER::new (
…		…
1505	)	1864	)
1506	}	1865	}
1507		1866
1508	#############################################################################	1867	#############################################################################
1509		1868
1510	package CFClient::UI::Label;	1869	package CFPlus::UI::Label;
1511		1870
1512	our @ISA = CFClient::UI::DrawBG::;	1871	our @ISA = CFPlus::UI::DrawBG::;
1513		1872
1514	use CFClient::OpenGL;	1873	use CFPlus::OpenGL;
1515		1874
1516	sub new {	1875	sub new {
1517	my ($class, %arg) = @_;	1876	my ($class, %arg) = @_;
1518		1877
1519	my $self = $class->SUPER::new (	1878	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1881	#active_bg => none
1523	#font => default_font	1882	#font => default_font
1524	#text => initial text	1883	#text => initial text
1525	#markup => initial narkup	1884	#markup => initial narkup
1526	#max_w => maximum pixel width	1885	#max_w => maximum pixel width
		1886	#style => 0, # render flags
1527	ellipsise => 3, # end	1887	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1888	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1889	fontsize => 1,
1530	align => -1,	1890	align => -1,
1531	valign => -1,	1891	valign => -1,
1532	padding_x => 2,	1892	padding_x => 2,
1533	padding_y => 2,	1893	padding_y => 2,
1534	can_events => 0,	1894	can_events => 0,
1535	%arg	1895	%arg
1536	);	1896	);
1537		1897
1538	if (exists $self->{template}) {	1898	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1899	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1900	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1901	$self->{template} = $layout;
1542	}	1902	}
1543		1903
1544	if (exists $self->{markup}) {	1904	if (exists $self->{markup}) {
…		…
1548	}	1908	}
1549		1909
1550	$self	1910	$self
1551	}	1911	}
1552		1912
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 {	1913	sub update {
1564	my ($self) = @_;	1914	my ($self) = @_;
1565		1915
1566	delete $self->{texture};	1916	delete $self->{texture};
1567	$self->SUPER::update;	1917	$self->SUPER::update;
…		…
1572		1922
1573	delete $self->{ox};	1923	delete $self->{ox};
1574	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
1575	}	1925	}
1576		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
		1931	}
		1932
1577	sub set_text {	1933	sub set_text {
1578	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1579		1935
1580	return if $self->{text} eq "T$text";	1936	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1937	$self->{text} = "T$text";
1582		1938
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1939	$self->{layout}->set_text ($text);
1585		1940
1586	delete $self->{size_req};	1941	delete $self->{size_req};
1587	$self->realloc;	1942	$self->realloc;
1588	$self->update;	1943	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1949	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1950	$self->{text} = "M$markup";
1596		1951
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1952	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1953
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1954	$self->{layout}->set_markup ($markup);
1601		1955
1602	delete $self->{size_req};	1956	delete $self->{size_req};
1603	$self->realloc;	1957	$self->realloc;
1604	$self->update;	1958	$self->update;
…		…
1606		1960
1607	sub size_request {	1961	sub size_request {
1608	my ($self) = @_;	1962	my ($self) = @_;
1609		1963
1610	$self->{size_req} ||= do {	1964	$self->{size_req} ||= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
1611	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
1612	$self->{layout}->set_width ($self->{max_w} || -1);	1968	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1613	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
1614	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1615	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1616		1972
1617	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
1618		1974
1619	if (exists $self->{template}) {	1975	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1976	$self->{template}->set_font ($self->{font}) if $self->{font};
		1977	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1978	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1979
1623	my ($w2, $h2) = $self->{template}->size;	1980	my ($w2, $h2) = $self->{template}->size;
1624		1981
1625	$w = List::Util::max $w, $w2;	1982	$w = List::Util::max $w, $w2;
…		…
1630	};	1987	};
1631		1988
1632	@{ $self->{size_req} }	1989	@{ $self->{size_req} }
1633	}	1990	}
1634		1991
		1992	sub baseline_shift {
		1993	$_[0]{layout}->descent
		1994	}
		1995
1635	sub invoke_size_allocate {	1996	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1997	my ($self, $w, $h) = @_;
1637		1998
1638	delete $self->{ox};	1999	delete $self->{ox};
1639		2000
…		…
1645		2006
1646	sub set_fontsize {	2007	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	2008	my ($self, $fontsize) = @_;
1648		2009
1649	$self->{fontsize} = $fontsize;	2010	$self->{fontsize} = $fontsize;
		2011	delete $self->{size_req};
1650	delete $self->{texture};	2012	delete $self->{texture};
1651		2013
1652	$self->realloc;	2014	$self->realloc;
1653	}	2015	}
1654		2016
1655	sub reconfigure {	2017	sub reconfigure {
1656	my ($self) = @_;	2018	my ($self) = @_;
1657		2019
1658	delete $self->{size_req};	2020	delete $self->{size_req};
		2021	delete $self->{texture};
1659		2022
1660	$self->SUPER::reconfigure;	2023	$self->SUPER::reconfigure;
1661	}	2024	}
1662		2025
1663	sub _draw {	2026	sub _draw {
1664	my ($self) = @_;	2027	my ($self) = @_;
1665		2028
1666	$self->SUPER::_draw; # draw background, if applicable	2029	$self->SUPER::_draw; # draw background, if applicable
1667		2030
1668	my $tex = $self->{texture} ||= do {	2031	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	2032	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	2033	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	2034	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	2035	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2036	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2037	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		2038
1676	new_from_layout CFClient::Texture $self->{layout}	2039	[$self->{layout}->size]
1677	};	2040	};
1678		2041
1679	unless (exists $self->{ox}) {	2042	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2043	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2044	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
1683		2046
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1687	};	2052	};
1688		2053
1689	glEnable GL_TEXTURE_2D;	2054	# unless ($self->{list}) {
1690		2055	# $self->{list} = CFPlus::OpenGL::glGenList;
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2056	# CFPlus::OpenGL::glNewList $self->{list};
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2057	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1693		2058	# CFPlus::OpenGL::glEndList;
1694	if ($tex->{format} == GL_ALPHA) {
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	}	2059	# }
		2060	#
		2061	# CFPlus::OpenGL::glCallList $self->{list};
1702		2062
1703	glDisable GL_TEXTURE_2D;	2063	$self->{layout}->draw;
1704	}	2064	}
		2065
		2066	#sub destroy {
		2067	# my ($self) = @_;
		2068	#
		2069	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2070	#
		2071	# $self->SUPER::destroy;
		2072	#}
1705		2073
1706	#############################################################################	2074	#############################################################################
1707		2075
1708	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1709		2077
1710	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1711		2079
1712	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1713		2081
1714	sub new {	2082	sub new {
1715	my $class = shift;	2083	my $class = shift;
1716		2084
1717	$class->SUPER::new (	2085	$class->SUPER::new (
1718	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
1719	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
1720	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
1721	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
1722	can_hover => 1,	2092	can_hover => 1,
1723	can_focus => 1,	2093	can_focus => 1,
1724	valign => 0,	2094	valign => 0,
1725	can_events => 1,	2095	can_events => 1,
		2096	ellipsise => 0,
1726	#text => ...	2097	#text => ...
1727	#hidden => "*",	2098	#hidden => "*",
1728	@_	2099	@_
1729	)	2100	)
1730	}	2101	}
…		…
1775	my $sym = $ev->{sym};	2146	my $sym = $ev->{sym};
1776	my $uni = $ev->{unicode};	2147	my $uni = $ev->{unicode};
1777		2148
1778	my $text = $self->get_text;	2149	my $text = $self->get_text;
1779		2150
		2151	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2152
1780	if ($uni == 8) {	2153	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2154	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	2155	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	2156	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	2157	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	2158	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	2159	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	2160	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	2161	} elsif ($sym == CFPlus::SDLK_HOME) {
		2162	# what a hack
		2163	$self->{cursor} =
		2164	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2165	? length $1
		2166	: 0;
		2167	} elsif ($sym == CFPlus::SDLK_END) {
		2168	# uh, again
		2169	$self->{cursor} =
		2170	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2171	? $self->{cursor} + length $1
		2172	: length $self->{text};
		2173	} elsif ($uni == 21) { # ctrl-u
		2174	$text = "";
1789	$self->{cursor} = 0;	2175	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	2176	} elsif ($uni == 27) {
1793	$self->emit ('escape');	2177	$self->emit ('escape');
1794	} elsif ($uni) {	2178	} elsif ($uni == 0x0d) {
		2179	substr $text, $self->{cursor}++, 0, "\012";
		2180	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2181	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2182	} else {
1797	return 0;	2183	return 0;
1798	}	2184	}
1799		2185
1800	$self->_set_text ($text);	2186	$self->_set_text ($text);
1801		2187
1802	$self->realloc;	2188	$self->realloc;
		2189	$self->update;
1803		2190
1804	1	2191	1
1805	}	2192	}
1806		2193
1807	sub invoke_focus_in {	2194	sub invoke_focus_in {
…		…
1819		2206
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2207	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2208
1822	# byte-index to char-index	2209	# byte-index to char-index
1823	my $text = $self->{text};	2210	my $text = $self->{text};
1824	utf8::encode $text;	2211	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2212	$self->{cursor} = length $text;
1826		2213
1827	$self->_set_text ($self->{text});	2214	$self->_set_text ($self->{text});
1828	$self->update;	2215	$self->update;
1829		2216
1830	1	2217	1
…		…
1849	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
1850	}	2237	}
1851		2238
1852	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
1853	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1854	glBegin GL_QUADS;
1855	glVertex 0 , 0;
1856	glVertex 0 , $self->{h};
1857	glVertex $self->{w}, $self->{h};	2241	glRect 0, 0, $self->{w}, $self->{h};
1858	glVertex $self->{w}, 0;
1859	glEnd;
1860	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
1861		2243
1862	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
1863		2245
1864	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
1866		2248
1867	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
1868	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
1869	utf8::encode $text;	2251	utf8::encode $text;
1870		2252
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2253	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1872	}	2254	}
1873		2255
1874	glColor @{$self->{fg}};	2256	glColor_premultiply @{$self->{active_fg}};
1875	glBegin GL_LINES;	2257	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2260	glEnd;
1879	}
1880	}
1881		2261
		2262	glLineWidth 3;
		2263	glColor @{$self->{active_outline}};
		2264	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2265	glLineWidth 1;
		2266
		2267	} else {
		2268	glColor @{$self->{outline}};
		2269	glBegin GL_LINE_STRIP;
		2270	glVertex .5, $self->{h} * .5;
		2271	glVertex .5, $self->{h} - 2.5;
		2272	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} * .5;
		2274	glEnd;
		2275	}
		2276	}
		2277
		2278	#############################################################################
		2279
1882	package CFClient::UI::Entry;	2280	package CFPlus::UI::Entry;
1883		2281
1884	our @ISA = CFClient::UI::EntryBase::;	2282	our @ISA = CFPlus::UI::EntryBase::;
1885		2283
1886	use CFClient::OpenGL;	2284	use CFPlus::OpenGL;
1887		2285
1888	sub invoke_key_down {	2286	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2287	my ($self, $ev) = @_;
1890		2288
1891	my $sym = $ev->{sym};	2289	my $sym = $ev->{sym};
1892		2290
1893	if ($sym == 13) {	2291	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2292	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2293	my $txt = $self->get_text;
		2294
1896	$self->{history_pointer} = -1;	2295	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2296	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2297	$self->emit (activate => $txt);
1899	$self->update;	2298	$self->update;
1900		2299
1901	} elsif ($sym == CFClient::SDLK_UP) {	2300	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2301	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2302	$self->{history_saveback} = $self->get_text;
1904	}	2303	}
1905	if (@{$self->{history} || []} > 0) {	2304	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2305	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2307	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2308	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2309	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2310	}
1912		2311
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2312	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2313	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2314	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2315
1917	if ($self->{history_pointer} >= 0) {	2316	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2326	1
1928	}	2327	}
1929		2328
1930	#############################################################################	2329	#############################################################################
1931		2330
		2331	package CFPlus::UI::TextEdit;
		2332
		2333	our @ISA = CFPlus::UI::EntryBase::;
		2334
		2335	use CFPlus::OpenGL;
		2336
		2337	sub move_cursor_ver {
		2338	my ($self, $dy) = @_;
		2339
		2340	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2341
		2342	$y += $dy;
		2343
		2344	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2345	$self->{cursor} = $index;
		2346	delete $self->{cur_h};
		2347	$self->update;
		2348	return;
		2349	}
		2350	}
		2351
		2352	sub invoke_key_down {
		2353	my ($self, $ev) = @_;
		2354
		2355	my $sym = $ev->{sym};
		2356
		2357	if ($sym == CFPlus::SDLK_UP) {
		2358	$self->move_cursor_ver (-1);
		2359	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2360	$self->move_cursor_ver (+1);
		2361	} else {
		2362	return $self->SUPER::invoke_key_down ($ev)
		2363	}
		2364
		2365	1
		2366	}
		2367
		2368	#############################################################################
		2369
1932	package CFClient::UI::Button;	2370	package CFPlus::UI::ButtonBin;
1933		2371
1934	our @ISA = CFClient::UI::Label::;	2372	our @ISA = CFPlus::UI::Bin::;
1935		2373
1936	use CFClient::OpenGL;	2374	use CFPlus::OpenGL;
1937		2375
1938	my @tex =	2376	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2378	qw(b1_button_inactive.png b1_button_active.png);
1941		2379
1942	sub new {	2380	sub new {
1943	my $class = shift;	2381	my $class = shift;
1944		2382
1945	$class->SUPER::new (	2383	$class->SUPER::new (
1946	padding_x => 4,
1947	padding_y => 4,
1948	fg => [1, 1, 1],
1949	active_fg => [0, 0, 1],
1950	can_hover => 1,	2384	can_hover => 1,
1951	align => 0,	2385	align => 0,
1952	valign => 0,	2386	valign => 0,
1953	can_events => 1,	2387	can_events => 1,
1954	@_	2388	@_
…		…
1966	}	2400	}
1967		2401
1968	sub _draw {	2402	sub _draw {
1969	my ($self) = @_;	2403	my ($self) = @_;
1970		2404
1971	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1972
1973	glEnable GL_TEXTURE_2D;	2405	glEnable GL_TEXTURE_2D;
1974	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975	glColor 0, 0, 0, 1;	2407	glColor 0, 0, 0, 1;
1976		2408
		2409	my $tex = $tex[$GRAB == $self];
1977	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2410	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1978		2411
1979	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
1980		2413
1981	$self->SUPER::_draw;	2414	$self->SUPER::_draw;
1982	}	2415	}
1983		2416
1984	#############################################################################	2417	#############################################################################
1985		2418
		2419	package CFPlus::UI::Button;
		2420
		2421	our @ISA = CFPlus::UI::Label::;
		2422
		2423	use CFPlus::OpenGL;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(b1_button_inactive.png b1_button_active.png);
		2428
		2429	sub new {
		2430	my $class = shift;
		2431
		2432	$class->SUPER::new (
		2433	padding_x => 4,
		2434	padding_y => 4,
		2435	fg => [1.0, 1.0, 1.0],
		2436	active_fg => [0.8, 0.8, 0.8],
		2437	can_hover => 1,
		2438	align => 0,
		2439	valign => 0,
		2440	can_events => 1,
		2441	@_
		2442	)
		2443	}
		2444
		2445	sub invoke_button_up {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	$self->emit ("activate")
		2449	if $x >= 0 && $x < $self->{w}
		2450	&& $y >= 0 && $y < $self->{h};
		2451
		2452	1
		2453	}
		2454
		2455	sub _draw {
		2456	my ($self) = @_;
		2457
		2458	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2459
		2460	glEnable GL_TEXTURE_2D;
		2461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2462	glColor 0, 0, 0, 1;
		2463
		2464	my $tex = $tex[$GRAB == $self];
		2465	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2466
		2467	glDisable GL_TEXTURE_2D;
		2468
		2469	$self->SUPER::_draw;
		2470	}
		2471
		2472	#############################################################################
		2473
		2474	package CFPlus::UI::CheckBox;
		2475
		2476	our @ISA = CFPlus::UI::DrawBG::;
		2477
		2478	my @tex =
		2479	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2480	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2481
		2482	use CFPlus::OpenGL;
		2483
		2484	sub new {
		2485	my $class = shift;
		2486
		2487	$class->SUPER::new (
		2488	padding_x => 2,
		2489	padding_y => 2,
		2490	fg => [1, 1, 1],
		2491	active_fg => [1, 1, 0],
		2492	bg => [0, 0, 0, 0.2],
		2493	active_bg => [1, 1, 1, 0.5],
		2494	state => 0,
		2495	can_hover => 1,
		2496	@_
		2497	)
		2498	}
		2499
		2500	sub size_request {
		2501	my ($self) = @_;
		2502
		2503	(6) x 2
		2504	}
		2505
		2506	sub toggle {
		2507	my ($self) = @_;
		2508
		2509	$self->{state} = !$self->{state};
		2510	$self->emit (changed => $self->{state});
		2511	$self->update;
		2512	}
		2513
		2514	sub invoke_button_down {
		2515	my ($self, $ev, $x, $y) = @_;
		2516
		2517	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2518	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2519	$self->toggle;
		2520	} else {
		2521	return 0
		2522	}
		2523
		2524	1
		2525	}
		2526
		2527	sub _draw {
		2528	my ($self) = @_;
		2529
		2530	$self->SUPER::_draw;
		2531
		2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2533
		2534	my ($w, $h) = @$self{qw(w h)};
		2535
		2536	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2537
		2538	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2539
		2540	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2541
		2542	glEnable GL_TEXTURE_2D;
		2543	$tex->draw_quad_alpha (0, 0, $s, $s);
		2544	glDisable GL_TEXTURE_2D;
		2545	}
		2546
		2547	#############################################################################
		2548
		2549	package CFPlus::UI::Image;
		2550
		2551	our @ISA = CFPlus::UI::Base::;
		2552
		2553	use CFPlus::OpenGL;
		2554
		2555	our %texture_cache;
		2556
		2557	sub new {
		2558	my $class = shift;
		2559
		2560	my $self = $class->SUPER::new (
		2561	can_events => 0,
		2562	scale => 1,
		2563	@_,
		2564	);
		2565
		2566	$self->{path} || $self->{tex}
		2567	or Carp::croak "'path' or 'tex' attributes required";
		2568
		2569	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2570	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2571
		2572	CFPlus::weaken $texture_cache{$self->{path}};
		2573
		2574	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2575
		2576	$self
		2577	}
		2578
		2579	sub STORABLE_freeze {
		2580	my ($self, $cloning) = @_;
		2581
		2582	$self->{path}
		2583	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2584
		2585	$self->{path}
		2586	}
		2587
		2588	sub STORABLE_attach {
		2589	my ($self, $cloning, $path) = @_;
		2590
		2591	$self->new (path => $path)
		2592	}
		2593
		2594	sub size_request {
		2595	my ($self) = @_;
		2596
		2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2598	}
		2599
		2600	sub _draw {
		2601	my ($self) = @_;
		2602
		2603	my $tex = $self->{tex};
		2604
		2605	my ($w, $h) = ($self->{w}, $self->{h});
		2606
		2607	if ($self->{rot90}) {
		2608	glRotate 90, 0, 0, 1;
		2609	glTranslate 0, -$self->{w}, 0;
		2610
		2611	($w, $h) = ($h, $w);
		2612	}
		2613
		2614	glEnable GL_TEXTURE_2D;
		2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2616
		2617	$tex->draw_quad_alpha (0, 0, $w, $h);
		2618
		2619	glDisable GL_TEXTURE_2D;
		2620	}
		2621
		2622	#############################################################################
		2623
1986	package CFClient::UI::ImageButton;	2624	package CFPlus::UI::ImageButton;
1987		2625
1988	our @ISA = CFClient::UI::Image::;	2626	our @ISA = CFPlus::UI::Image::;
1989		2627
1990	use CFClient::OpenGL;	2628	use CFPlus::OpenGL;
1991		2629
1992	my %textures;	2630	my %textures;
1993		2631
1994	sub new {	2632	sub new {
1995	my $class = shift;	2633	my $class = shift;
…		…
2005	can_events => 1,	2643	can_events => 1,
2006	@_	2644	@_
2007	);	2645	);
2008	}	2646	}
2009		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
		2652	}
		2653
2010	sub invoke_button_up {	2654	sub invoke_button_up {
2011	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2012		2656
2013	$self->emit ("activate")	2657	$self->emit ("activate")
2014	if $x >= 0 && $x < $self->{w}	2658	if $x >= 0 && $x < $self->{w}
…		…
2017	1	2661	1
2018	}	2662	}
2019		2663
2020	#############################################################################	2664	#############################################################################
2021		2665
2022	package CFClient::UI::CheckBox;
2023
2024	our @ISA = CFClient::UI::DrawBG::;
2025
2026	my @tex =
2027	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030	use CFClient::OpenGL;
2031
2032	sub new {
2033	my $class = shift;
2034
2035	$class->SUPER::new (
2036	padding_x => 2,
2037	padding_y => 2,
2038	fg => [1, 1, 1],
2039	active_fg => [1, 1, 0],
2040	bg => [0, 0, 0, 0.2],
2041	active_bg => [1, 1, 1, 0.5],
2042	state => 0,
2043	can_hover => 1,
2044	@_
2045	)
2046	}
2047
2048	sub size_request {
2049	my ($self) = @_;
2050
2051	(6) x 2
2052	}
2053
2054	sub invoke_button_down {
2055	my ($self, $ev, $x, $y) = @_;
2056
2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059	$self->{state} = !$self->{state};
2060	$self->emit (changed => $self->{state});
2061	} else {
2062	return 0
2063	}
2064
2065	1
2066	}
2067
2068	sub _draw {
2069	my ($self) = @_;
2070
2071	$self->SUPER::_draw;
2072
2073	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075	my ($w, $h) = @$self{qw(w h)};
2076
2077	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081	my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083	glEnable GL_TEXTURE_2D;
2084	$tex->draw_quad_alpha (0, 0, $s, $s);
2085	glDisable GL_TEXTURE_2D;
2086	}
2087
2088	#############################################################################
2089
2090	package CFClient::UI::Image;	2666	package CFPlus::UI::VGauge;
2091		2667
2092	our @ISA = CFClient::UI::Base::;	2668	our @ISA = CFPlus::UI::Base::;
2093
2094	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096
2097	our %loaded_images;
2098
2099	sub new {
2100	my $class = shift;
2101
2102	my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106	$loaded_images{$self->{image}} ||=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111	Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114
2115	$self
2116	}
2117
2118	sub size_request {
2119	my ($self) = @_;
2120
2121	($self->{tex}->{w}, $self->{tex}->{h})
2122	}
2123
2124	sub _draw {
2125	my ($self) = @_;
2126
2127	my $tex = $self->{tex};
2128
2129	my ($w, $h) = ($self->{w}, $self->{h});
2130
2131	if ($self->{rot90}) {
2132	glRotate 90, 0, 0, 1;
2133	glTranslate 0, -$self->{w}, 0;
2134
2135	($w, $h) = ($h, $w);
2136	}
2137
2138	glEnable GL_TEXTURE_2D;
2139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141	$tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::VGauge;
2149
2150	our @ISA = CFClient::UI::Base::;
2151		2669
2152	use List::Util qw(min max);	2670	use List::Util qw(min max);
2153		2671
2154	use CFClient::OpenGL;	2672	use CFPlus::OpenGL;
2155		2673
2156	my %tex = (	2674	my %tex = (
2157	food => [	2675	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2677	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2678	],
2161	grace => [	2679	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2681	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2682	],
2165	hp => [	2683	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2685	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2686	],
2169	mana => [	2687	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2688	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2689	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2690	],
2173	);	2691	);
2174		2692
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2693	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2753	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2754	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2755
2238	my $h1 = $self->{h} * (1 - $ycut1);	2756	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2757	my $h2 = $self->{h} * (1 - $ycut2);
		2758	my $h3 = $self->{h};
		2759
		2760	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2761
2241	glEnable GL_BLEND;	2762	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2763	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2764	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2765	glEnable GL_TEXTURE_2D;
…		…
2263		2784
2264	if ($t3) {	2785	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2786	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2787	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2788	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2789	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2790	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2791	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2792	glEnd;
2272	}	2793	}
2273		2794
2274	glDisable GL_BLEND;	2795	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2276	}	2797	}
2277		2798
2278	#############################################################################	2799	#############################################################################
2279		2800
		2801	package CFPlus::UI::Progress;
		2802
		2803	our @ISA = CFPlus::UI::Label::;
		2804
		2805	use CFPlus::OpenGL;
		2806
		2807	sub new {
		2808	my ($class, %arg) = @_;
		2809
		2810	my $self = $class->SUPER::new (
		2811	fg => [1, 1, 1],
		2812	bg => [0, 0, 1, 0.2],
		2813	bar => [0.7, 0.5, 0.1, 0.8],
		2814	outline => [0.4, 0.3, 0],
		2815	fontsize => 0.9,
		2816	valign => 0,
		2817	align => 0,
		2818	can_events => 1,
		2819	ellipsise => 1,
		2820	label => "%d%%",
		2821	%arg,
		2822	);
		2823
		2824	$self->set_value ($arg{value} || -1);
		2825
		2826	$self
		2827	}
		2828
		2829	sub set_label {
		2830	my ($self, $label) = @_;
		2831
		2832	return if $self->{label} eq $label;
		2833	$self->{label} = $label;
		2834
		2835	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2836	}
		2837
		2838	sub set_value {
		2839	my ($self, $value) = @_;
		2840
		2841	if ($self->{value} ne $value) {
		2842	$self->{value} = $value;
		2843
		2844	if ($value < 0) {
		2845	$self->set_text ("-");
		2846	} else {
		2847	$self->set_text (sprintf $self->{label}, $value * 100);
		2848	}
		2849
		2850	$self->update;
		2851	}
		2852	}
		2853
		2854	sub _draw {
		2855	my ($self) = @_;
		2856
		2857	glEnable GL_BLEND;
		2858	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2859
		2860	if ($self->{value} >= 0) {
		2861	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2862
		2863	glColor_premultiply @{$self->{bar}};
		2864	glRect 2, 2, $s, $self->{h} - 2;
		2865	glColor_premultiply @{$self->{bg}};
		2866	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2867	}
		2868
		2869	glColor_premultiply @{$self->{outline}};
		2870	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2871
		2872	glDisable GL_BLEND;
		2873
		2874	{
		2875	local $self->{bg}; # do not draw background
		2876	$self->SUPER::_draw;
		2877	}
		2878	}
		2879
		2880	#############################################################################
		2881
		2882	package CFPlus::UI::ExperienceProgress;
		2883
		2884	our @ISA = CFPlus::UI::Progress::;
		2885
		2886	sub new {
		2887	my ($class, %arg) = @_;
		2888
		2889	my $self = $class->SUPER::new (
		2890	tooltip => sub {
		2891	my ($self) = @_;
		2892
		2893	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2894	$self->{lvl},
		2895	::formsep ($self->{exp}),
		2896	::formsep ($self->{nxt}),
		2897	::formsep ($self->{nxt} - $self->{exp}),
		2898	},
		2899	%arg
		2900	);
		2901
		2902	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2903	if $::CONN;
		2904
		2905	$self
		2906	}
		2907
		2908	sub DESTROY {
		2909	my ($self) = @_;
		2910
		2911	delete $::CONN->{on_exp_update}{$self+0}
		2912	if $::CONN;
		2913
		2914	$self->SUPER::DESTROY;
		2915	}
		2916
		2917	sub set_value {
		2918	my ($self, $lvl, $exp) = @_;
		2919
		2920	$self->{lvl} = $lvl;
		2921	$self->{exp} = $exp;
		2922
		2923	my $v = -1;
		2924
		2925	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2926	my $l0 = $table->[$lvl - 1];
		2927	my $l1 = $table->[$lvl];
		2928
		2929	$self->{nxt} = $l1;
		2930
		2931	$v = ($exp - $l0) / ($l1 - $l0);
		2932	}
		2933
		2934	$self->SUPER::set_value ($v);
		2935	}
		2936
		2937	#############################################################################
		2938
2280	package CFClient::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2281		2940
2282	our @ISA = CFClient::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2283		2942
2284	sub new {	2943	sub new {
2285	my ($class, %arg) = @_;	2944	my ($class, %arg) = @_;
2286		2945
2287	my $self = $class->SUPER::new (	2946	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2948	can_hover => 1,
2290	can_events => 1,	2949	can_events => 1,
2291	%arg,	2950	%arg,
2292	);	2951	);
2293		2952
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2953	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2954	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2955	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2956
2298	$self	2957	$self
2299	}	2958	}
2300		2959
2301	sub set_fontsize {	2960	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2981	$self->{value}->set_text ($val);
2323	}	2982	}
2324		2983
2325	#############################################################################	2984	#############################################################################
2326		2985
2327	package CFClient::UI::Slider;	2986	package CFPlus::UI::Slider;
2328		2987
2329	use strict;	2988	use strict;
2330		2989
2331	use CFClient::OpenGL;	2990	use CFPlus::OpenGL;
2332		2991
2333	our @ISA = CFClient::UI::DrawBG::;	2992	our @ISA = CFPlus::UI::DrawBG::;
2334		2993
2335	my @tex =	2994	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2995	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2996	qw(s1_slider.png s1_slider_bg.png);
2338		2997
2339	sub new {	2998	sub new {
2340	my $class = shift;	2999	my $class = shift;
2341		3000
…		…
2409		3068
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		3070
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		3072
2414	$self->mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2415	}	3076	}
2416		3077
2417	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2419		3080
…		…
2426		3087
2427	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3088	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2428	} else {	3089	} else {
2429	return 0;	3090	return 0;
2430	}	3091	}
		3092
		3093	1
		3094	}
		3095
		3096	sub invoke_mouse_wheel {
		3097	my ($self, $ev) = @_;
		3098
		3099	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3100
		3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3102
		3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2431		3104
2432	1	3105	1
2433	}	3106	}
2434		3107
2435	sub update {	3108	sub update {
…		…
2486	glDisable GL_TEXTURE_2D;	3159	glDisable GL_TEXTURE_2D;
2487	}	3160	}
2488		3161
2489	#############################################################################	3162	#############################################################################
2490		3163
2491	package CFClient::UI::ValSlider;	3164	package CFPlus::UI::ValSlider;
2492		3165
2493	our @ISA = CFClient::UI::HBox::;	3166	our @ISA = CFPlus::UI::HBox::;
2494		3167
2495	sub new {	3168	sub new {
2496	my ($class, %arg) = @_;	3169	my ($class, %arg) = @_;
2497		3170
2498	my $range = delete $arg{range};	3171	my $range = delete $arg{range};
2499		3172
2500	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3174	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3175	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	3176	to_value => sub { shift },
2504	from_value => sub { shift },	3177	from_value => sub { shift },
2505	%arg,	3178	%arg,
2506	);	3179	);
2507		3180
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	3200	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	3201	sub set_value { shift->{slider}->set_value (@_) }
2529		3202
2530	#############################################################################	3203	#############################################################################
2531		3204
2532	package CFClient::UI::TextScroller;	3205	package CFPlus::UI::TextScroller;
2533		3206
2534	our @ISA = CFClient::UI::HBox::;	3207	our @ISA = CFPlus::UI::HBox::;
2535		3208
2536	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2537		3210
2538	sub new {	3211	sub new {
2539	my $class = shift;	3212	my $class = shift;
2540		3213
2541	my $self = $class->SUPER::new (	3214	my $self = $class->SUPER::new (
2542	fontsize => 1,	3215	fontsize => 1,
2543	can_events => 0,	3216	can_events => 1,
2544	indent => 0,	3217	indent => 0,
2545	#font => default_font	3218	#font => default_font
2546	@_,	3219	@_,
2547		3220
2548	layout => (new CFClient::Layout 1),	3221	layout => (new CFPlus::Layout),
2549	par => [],	3222	par => [],
		3223	max_par => 0,
2550	height => 0,	3224	height => 0,
2551	children => [	3225	children => [
2552	(new CFClient::UI::Empty expand => 1),	3226	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	3227	(new CFPlus::UI::Slider vertical => 1),
2554	],	3228	],
2555	);	3229	);
2556		3230
2557	$self->{children}[1]->connect (changed => sub { $self->update });	3231	$self->{children}[1]->connect (changed => sub { $self->update });
2558		3232
…		…
2564		3238
2565	$self->{fontsize} = $fontsize;	3239	$self->{fontsize} = $fontsize;
2566	$self->reflow;	3240	$self->reflow;
2567	}	3241	}
2568		3242
		3243	sub size_request {
		3244	my ($self) = @_;
		3245
		3246	my ($empty, $slider) = $self->visible_children;
		3247
		3248	local $self->{children} = [$empty, $slider];
		3249	$self->SUPER::size_request
		3250	}
		3251
2569	sub invoke_size_allocate {	3252	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	3253	my ($self, $w, $h) = @_;
2571		3254
		3255	my ($empty, $slider, @other) = @{ $self->{children} };
		3256	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3257
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	3258	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3259	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	3260	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3261	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		3262
2577	$self->reflow;	3263	$self->reflow;
2578		3264
		3265	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	3266	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	3267	}
2581		3268
2582	sub text_size {	3269	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	3270	my ($self, $ev) = @_;
		3271
		3272	return 0 unless $ev->{dy}; # only vertical movements
		3273
		3274	$self->{children}[1]->emit (mouse_wheel => $ev);
		3275
		3276	1
		3277	}
		3278
		3279	sub get_layout {
		3280	my ($self, $para) = @_;
2584		3281
2585	my $layout = $self->{layout};	3282	my $layout = $self->{layout};
2586		3283
		3284	$layout->set_font ($self->{font}) if $self->{font};
		3285	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3286	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	3287	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3288	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	3289	$layout->set_markup ($para->{markup});
		3290
		3291	$layout->set_shapes (
		3292	map
		3293	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3294	@{$para->{widget}}
2591		3295	);
		3296
2592	$layout->size	3297	$layout
2593	}	3298	}
2594		3299
2595	sub reflow {	3300	sub reflow {
2596	my ($self) = @_;	3301	my ($self) = @_;
2597		3302
…		…
2604		3309
2605	# todo: base offset on lines or so, not on pixels	3310	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	3311	$self->{children}[1]->set_value ($offset);
2607	}	3312	}
2608		3313
		3314	sub current_paragraph {
		3315	my ($self) = @_;
		3316
		3317	$self->{top_paragraph} - 1
		3318	}
		3319
		3320	sub scroll_to {
		3321	my ($self, $para) = @_;
		3322
		3323	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3324
		3325	$self->{scroll_to} = $para;
		3326	$self->update;
		3327	}
		3328
2609	sub clear {	3329	sub clear {
2610	my ($self) = @_;	3330	my ($self) = @_;
		3331
		3332	my (undef, undef, @other) = @{ $self->{children} };
		3333	$self->remove ($_) for @other;
2611		3334
2612	$self->{par} = [];	3335	$self->{par} = [];
2613	$self->{height} = 0;	3336	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3337	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	3338	}
2616		3339
2617	sub add_paragraph {	3340	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	3341	my $self = shift;
2619		3342
2620	for my $line (split /\n/, $text) {	3343	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	3344	$para = {
		3345	fg => [1, 1, 1, 1],
		3346	indent => 0,
		3347	markup => "",
		3348	widget => [],
		3349	ref $para ? %$para : (markup => $para),
		3350	w => 1e10,
		3351	wrapped => 1,
		3352	};
		3353
		3354	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3355	push @{$self->{par}}, $para;
		3356	}
		3357
		3358	if (my $max = $self->{max_par}) {
		3359	shift @{$self->{par}} while @{$self->{par}} > $max;
		3360	}
		3361
		3362	$self->{need_reflow}++;
		3363	$self->update;
		3364	}
		3365
		3366	sub scroll_to_bottom {
		3367	my ($self) = @_;
		3368
		3369	$self->{scroll_to} = $#{$self->{par}};
		3370	$self->update;
		3371	}
		3372
		3373	sub force_uptodate {
		3374	my ($self) = @_;
		3375
		3376	if (delete $self->{need_reflow}) {
		3377	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3378
		3379	my $height = 0;
		3380
		3381	for my $para (@{$self->{par}}) {
		3382	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3383	my $layout = $self->get_layout ($para);
		3384	my ($w, $h) = $layout->size;
		3385
		3386	$para->{w} = $w + $para->{indent};
		3387	$para->{h} = $h;
		3388	$para->{wrapped} = $layout->has_wrapped;
		3389	}
		3390
		3391	$para->{y} = $height;
		3392	$height += $para->{h};
		3393	}
		3394
2622	$self->{height} += $h;	3395	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3396	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3397
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3398	delete $self->{texture};
		3399	}
		3400
		3401	if (my $paridx = delete $self->{scroll_to}) {
		3402	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3403	}
2627	}	3404	}
2628		3405
2629	sub update {	3406	sub update {
2630	my ($self) = @_;	3407	my ($self) = @_;
2631		3408
…		…
2634	return unless $self->{h} > 0;	3411	return unless $self->{h} > 0;
2635		3412
2636	delete $self->{texture};	3413	delete $self->{texture};
2637		3414
2638	$ROOT->on_post_alloc ($self => sub {	3415	$ROOT->on_post_alloc ($self => sub {
		3416	$self->force_uptodate;
		3417
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3418	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3419
2641	if (delete $self->{need_reflow}) {
2642	my $height = 0;
2643
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {
2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650	$layout->set_width ($W - $_->[3]);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];
2655	$_->[1] = $h;
2656	}
2657
2658	$height += $_->[1];
2659	}
2660
2661	$self->{height} = $height;
2662
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665	delete $self->{texture};
2666	}
2667
2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3420	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3421	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3422	glClear GL_COLOR_BUFFER_BIT;
2671		3423
		3424	package CFPlus::UI::Base;
		3425	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3426	(0, 0, $self->{w}, $self->{h});
		3427
		3428	my $top = int $self->{children}[1]{range}[0];
		3429
		3430	my $paridx = 0;
		3431	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3432	my $top = int $self->{children}[1]{range}[0];
2673		3433
2674	my $y0 = $top;	3434	my $y0 = $top;
2675	my $y1 = $top + $H;	3435	my $y1 = $top + $H;
2676		3436
2677	my $y = 0;
2678
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687	for my $par (@{$self->{par}}) {	3437	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3438	my $h = $para->{h};
		3439	my $y = $para->{y};
2689		3440
2690	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3442	my $layout = $self->get_layout ($para);
2692	$layout->set_width ($W - $par->[3]);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		3443
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3444	$layout->render ($para->{indent}, $y - $y0);
		3445	$layout->draw;
2697		3446
2698	glRasterPos $par->[3], $y - $y0;	3447	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3448	my @s = $layout->get_shapes;
		3449
		3450	for (@w) {
		3451	my ($dx, $dy) = splice @s, 0, 2, ();
		3452
		3453	$_->{x} = $dx + $para->{indent};
		3454	$_->{y} = $dy + $y - $y0;
		3455
		3456	$_->draw;
		3457	}
		3458	}
2700	}	3459	}
2701		3460
2702	$y += $h;	3461	$paridx++;
		3462	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3463	}
2704		3464
2705	glDisable GL_BLEND;	3465	$self->{top_paragraph} = $top_paragraph;
2706	};	3466	};
2707	});	3467	});
		3468	}
		3469
		3470	sub reconfigure {
		3471	my ($self) = @_;
		3472
		3473	$self->SUPER::reconfigure;
		3474
		3475	$_->{w} = 1e10 for @{ $self->{par} };
		3476	$self->reflow;
2708	}	3477	}
2709		3478
2710	sub _draw {	3479	sub _draw {
2711	my ($self) = @_;	3480	my ($self) = @_;
2712		3481
…		…
2715	glColor 0, 0, 0, 1;	3484	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3485	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3486	glDisable GL_TEXTURE_2D;
2718		3487
2719	$self->{children}[1]->draw;	3488	$self->{children}[1]->draw;
2720
2721	}	3489	}
2722		3490
2723	#############################################################################	3491	#############################################################################
2724		3492
2725	package CFClient::UI::Animator;	3493	package CFPlus::UI::Animator;
2726		3494
2727	use CFClient::OpenGL;	3495	use CFPlus::OpenGL;
2728		3496
2729	our @ISA = CFClient::UI::Bin::;	3497	our @ISA = CFPlus::UI::Bin::;
2730		3498
2731	sub moveto {	3499	sub moveto {
2732	my ($self, $x, $y) = @_;	3500	my ($self, $x, $y) = @_;
2733		3501
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3502	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3530	glPopMatrix;
2763	}	3531	}
2764		3532
2765	#############################################################################	3533	#############################################################################
2766		3534
2767	package CFClient::UI::Flopper;	3535	package CFPlus::UI::Flopper;
2768		3536
2769	our @ISA = CFClient::UI::Button::;	3537	our @ISA = CFPlus::UI::Button::;
2770		3538
2771	sub new {	3539	sub new {
2772	my $class = shift;	3540	my $class = shift;
2773		3541
2774	my $self = $class->SUPER::new (	3542	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3554	$self->{other}->toggle_visibility;
2787	}	3555	}
2788		3556
2789	#############################################################################	3557	#############################################################################
2790		3558
2791	package CFClient::UI::Tooltip;	3559	package CFPlus::UI::Tooltip;
2792		3560
2793	our @ISA = CFClient::UI::Bin::;	3561	our @ISA = CFPlus::UI::Bin::;
2794		3562
2795	use CFClient::OpenGL;	3563	use CFPlus::OpenGL;
2796		3564
2797	sub new {	3565	sub new {
2798	my $class = shift;	3566	my $class = shift;
2799		3567
2800	$class->SUPER::new (	3568	$class->SUPER::new (
…		…
2804	}	3572	}
2805		3573
2806	sub set_tooltip_from {	3574	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
2808		3576
2809	my $tooltip = $widget->{tooltip};	3577	my $tip = $widget->{tooltip};
		3578	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3579
		3580	$tip = CFPlus::Pod::section_label tooltip => $1
		3581	if $tip =~ /^#(.*)$/;
2810		3582
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
2813	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2814	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
2815	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
2816	}	3588	}
2817		3589
2818	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
2820		3592
2821	$self->add (new CFClient::UI::Label	3593	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3594	markup => $tip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3596	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3597	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3598	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3599	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3600	);
2829	}	3601	}
2830		3602
…		…
2849		3621
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3622	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3623	my $widget = $self->{owner}
2852	or return;	3624	or return;
2853		3625
		3626	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3627	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3628
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3629	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3630	if $x + $self->{w} > $self->{root}{w};
2858		3631
2859	$self->move_abs ($x, $y);	3632	$self->move_abs ($x, $y);
		3633	} else {
		3634	$self->hide;
		3635	}
2860	});	3636	});
2861	}	3637	}
2862		3638
2863	sub _draw {	3639	sub _draw {
2864	my ($self) = @_;	3640	my ($self) = @_;
2865		3641
2866	glTranslate 0.375, 0.375;
2867
2868	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
2869		3643
2870	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
2871	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
2872	glVertex 0 , 0;
2873	glVertex 0 , $h;
2874	glVertex $w, $h;
2875	glVertex $w, 0;
2876	glEnd;
2877		3646
2878	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
2879	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
2880	glVertex 0 , 0;
2881	glVertex 0 , $h;
2882	glVertex $w, $h;
2883	glVertex $w, 0;
2884	glEnd;
2885		3649
2886	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
2887		3651
2888	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
2889	}	3653	}
2890		3654
2891	#############################################################################	3655	#############################################################################
2892		3656
2893	package CFClient::UI::Face;	3657	package CFPlus::UI::Face;
2894		3658
2895	our @ISA = CFClient::UI::Base::;	3659	our @ISA = CFPlus::UI::DrawBG::;
2896		3660
2897	use CFClient::OpenGL;	3661	use CFPlus::OpenGL;
2898		3662
2899	sub new {	3663	sub new {
2900	my $class = shift;	3664	my $class = shift;
2901		3665
2902	my $self = $class->SUPER::new (	3666	my $self = $class->SUPER::new (
		3667	size_w => 32,
		3668	size_h => 8,
2903	aspect => 1,	3669	aspect => 1,
2904	can_events => 0,	3670	can_events => 0,
2905	@_,	3671	@_,
2906	);	3672	);
2907		3673
2908	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
2910		3676
		3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2911	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3680	parked => 1,
2914	interval => $self->{animspeed},
2915	cb => sub {	3681	cb => sub {
		3682	return unless $::CONN;
		3683
		3684	my $w = $widget
		3685	or return;
		3686
2916	++$widget->{frame};	3687	++$w->{frame};
		3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
2917	$widget->update;	3691	$w->update;
		3692	$w->update_timer;
2918	},	3693	},
2919	);	3694	);
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
2920	}	3698	}
2921		3699
2922	$self	3700	$self
2923	}	3701	}
2924		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->at (
		3710	$self->{anim_start}
		3711	+ $self->{animspeed}
		3712	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3713	);
		3714	$self->{timer}->start;
		3715	} else {
		3716	$self->{timer}->stop;
		3717	}
		3718	}
		3719
		3720	sub update_face {
		3721	my ($self) = @_;
		3722
		3723	if ($::CONN) {
		3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3725	if ($anim && @$anim) {
		3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3727	delete $self->{face_change_cb};
		3728
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3730	unless ($tex->{name} || $tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
		3733	}
		3734	}
		3735	}
		3736	}
		3737	}
		3738
2925	sub size_request {	3739	sub size_request {
2926	(32, 8)	3740	my ($self) = @_;
		3741
		3742	if ($::CONN) {
		3743	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3744	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3745	if ($tex->{name}) {
		3746	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3747	} elsif (!$tex->{loading}) {
		3748	$tex->upload (sub { $self->reconfigure });
		3749	}
		3750	}
		3751
		3752	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3753	}
		3754	}
		3755
		3756	($self->{size_w} || 8, $self->{size_h} || 8)
2927	}	3757	}
2928		3758
2929	sub update {	3759	sub update {
2930	my ($self) = @_;	3760	my ($self) = @_;
2931		3761
2932	return unless $self->{visible};	3762	return unless $self->{visible};
2933		3763
2934	$self->SUPER::update;	3764	$self->SUPER::update;
2935	}	3765	}
2936		3766
		3767	sub invoke_visibility_change {
		3768	my ($self) = @_;
		3769
		3770	$self->update_timer;
		3771
		3772	0
		3773	}
		3774
2937	sub _draw {	3775	sub _draw {
2938	my ($self) = @_;	3776	my ($self) = @_;
2939		3777
2940	return unless $::CONN;	3778	$self->SUPER::_draw;
2941		3779
2942	my $face;	3780	if (my $tex = $self->{tex}) {
2943
2944	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];
2946
2947	$face = $anim->[ $self->{frame} % @$anim ]
2948	if $anim && @$anim;
2949	}
2950
2951	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2952
2953	if ($tex) {
2954	glEnable GL_TEXTURE_2D;	3781	glEnable GL_TEXTURE_2D;
2955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2956	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
2957	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2958	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
2960	}	3787	}
2961		3788
2962	sub destroy {	3789	sub destroy {
2963	my ($self) = @_;	3790	my ($self) = @_;
2964		3791
2965	$self->{timer}->cancel	3792	(delete $self->{timer})->cancel
2966	if $self->{timer};	3793	if $self->{timer};
2967		3794
2968	$self->SUPER::destroy;	3795	$self->SUPER::destroy;
2969	}	3796	}
2970		3797
2971	#############################################################################	3798	#############################################################################
2972		3799
2973	package CFClient::UI::Buttonbar;	3800	package CFPlus::UI::Buttonbar;
2974		3801
2975	our @ISA = CFClient::UI::HBox::;	3802	our @ISA = CFPlus::UI::HBox::;
2976		3803
2977	# TODO: should actualyl wrap buttons and other goodies.	3804	# TODO: should actually wrap buttons and other goodies.
2978		3805
2979	#############################################################################	3806	#############################################################################
2980		3807
2981	package CFClient::UI::Menu;	3808	package CFPlus::UI::Menu;
2982		3809
2983	our @ISA = CFClient::UI::FancyFrame::;	3810	our @ISA = CFPlus::UI::Toplevel::;
2984		3811
2985	use CFClient::OpenGL;	3812	use CFPlus::OpenGL;
2986		3813
2987	sub new {	3814	sub new {
2988	my $class = shift;	3815	my $class = shift;
2989		3816
2990	my $self = $class->SUPER::new (	3817	my $self = $class->SUPER::new (
2991	items => [],	3818	items => [],
2992	z => 100,	3819	z => 100,
2993	@_,	3820	@_,
2994	);	3821	);
2995		3822
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3823	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3824
2998	for my $item (@{ $self->{items} }) {	3825	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3826	my ($widget, $cb, $tooltip) = @$item;
3000		3827
3001	# handle various types of items, only text for now	3828	# handle various types of items, only text for now
3002	if (!ref $widget) {	3829	if (!ref $widget) {
		3830	if ($widget =~ /\t/) {
		3831	my ($left, $right) = split /\t/, $widget, 2;
		3832
3003	$widget = new CFClient::UI::Label	3833	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3834	can_hover => 1,
3005	can_events => 1,	3835	can_events => 1,
		3836	tooltip => $tooltip,
		3837	children => [
		3838	(new CFPlus::UI::Label markup => $left, expand => 1),
		3839	(new CFPlus::UI::Label markup => $right, align => +1),
		3840	],
		3841	;
		3842
		3843	} else {
		3844	$widget = new CFPlus::UI::Label
		3845	can_hover => 1,
		3846	can_events => 1,
3006	markup => $widget,	3847	markup => $widget,
3007	tooltip => $tooltip	3848	tooltip => $tooltip;
		3849	}
3008	}	3850	}
3009		3851
3010	$self->{item}{$widget} = $item;	3852	$self->{item}{$widget} = $item;
3011		3853
3012	$self->{vbox}->add ($widget);	3854	$self->{vbox}->add ($widget);
…		…
3055	1	3897	1
3056	}	3898	}
3057		3899
3058	#############################################################################	3900	#############################################################################
3059		3901
3060	package CFClient::UI::Multiplexer;	3902	package CFPlus::UI::Multiplexer;
3061		3903
3062	our @ISA = CFClient::UI::Container::;	3904	our @ISA = CFPlus::UI::Container::;
3063		3905
3064	sub new {	3906	sub new {
3065	my $class = shift;	3907	my $class = shift;
3066		3908
3067	my $self = $class->SUPER::new (	3909	my $self = $class->SUPER::new (
…		…
3081		3923
3082	$self->{current} = $self->{children}[0]	3924	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3925	if @{ $self->{children} };
3084	}	3926	}
3085		3927
		3928	sub get_current_page {
		3929	my ($self) = @_;
		3930
		3931	$self->{current}
		3932	}
		3933
3086	sub set_current_page {	3934	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3935	my ($self, $page_or_widget) = @_;
3088		3936
3089	my $widget = ref $page_or_widget	3937	my $widget = ref $page_or_widget
3090	? $page_or_widget	3938	? $page_or_widget
…		…
3122	$self->{current}->draw;	3970	$self->{current}->draw;
3123	}	3971	}
3124		3972
3125	#############################################################################	3973	#############################################################################
3126		3974
3127	package CFClient::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3128		3976
		3977	use CFPlus::OpenGL;
		3978
3129	our @ISA = CFClient::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3130		3980
3131	sub new {	3981	sub new {
3132	my $class = shift;	3982	my $class = shift;
3133		3983
3134	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3137	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3138	@_,	3989	@_,
3139	);	3990	);
3140		3991
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3142	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3143		3994
		3995	{
		3996	Scalar::Util::weaken (my $wself = $self);
		3997
		3998	$self->{multiplexer}->connect (c_add => sub {
		3999	my ($mplex, $widgets) = @_;
		4000
		4001	for my $child (@$widgets) {
		4002	Scalar::Util::weaken $child;
		4003	$child->{c_tab_} ||= do {
		4004	my $tab =
		4005	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4006	? $child->{c_tab}
		4007	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4008
		4009	$tab->connect (activate => sub {
		4010	$wself->set_current_page ($child);
		4011	});
		4012
		4013	$tab
		4014	};
		4015
		4016	$self->{buttonbar}->add ($child->{c_tab_});
		4017	}
		4018	});
		4019
		4020	$self->{multiplexer}->connect (c_remove => sub {
		4021	my ($mplex, $widgets) = @_;
		4022
		4023	for my $child (@$widgets) {
		4024	$wself->{buttonbar}->remove ($child->{c_tab_});
		4025	}
		4026	});
		4027	}
		4028
3144	$self	4029	$self
3145	}	4030	}
3146		4031
3147	sub add {	4032	sub add {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->add (@widgets)
		4036	}
		4037
		4038	sub remove {
		4039	my ($self, @widgets) = @_;
		4040
		4041	$self->{multiplexer}->remove (@widgets)
		4042	}
		4043
		4044	sub pages {
		4045	my ($self) = @_;
		4046	$self->{multiplexer}->children
		4047	}
		4048
		4049	sub add_tab {
3148	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3149		4051
3150	Scalar::Util::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3151		4054
3152	$self->{buttonbar}->add (new CFClient::UI::Button
3153	markup => $title,
3154	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },
3156	);
3157
3158	$self->{multiplexer}->add ($widget);	4055	$self->add ($widget);
		4056	}
		4057
		4058	sub get_current_page {
		4059	my ($self) = @_;
		4060
		4061	$self->{multiplexer}->get_current_page
3159	}	4062	}
3160		4063
3161	sub set_current_page {	4064	sub set_current_page {
3162	my ($self, $page) = @_;	4065	my ($self, $page) = @_;
3163		4066
3164	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	4068	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	4069	}
3167		4070
		4071	sub _draw {
		4072	my ($self) = @_;
		4073
		4074	$self->SUPER::_draw ();
		4075
		4076	if (my $cur = $self->{multiplexer}{current}) {
		4077	if ($cur = $cur->{c_tab_}) {
		4078	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4079	$self->{buttonbar}{y} + $cur->{y};
		4080	glLineWidth 3;
		4081	#glEnable GL_BLEND;
		4082	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4083	glColor @{$self->{active_outline}};
		4084	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4085	glLineWidth 1;
		4086	#glDisable GL_BLEND;
		4087	}
		4088	}
		4089	}
		4090
3168	#############################################################################	4091	#############################################################################
3169		4092
3170	package CFClient::UI::Combobox;	4093	package CFPlus::UI::Selector;
3171		4094
3172	use utf8;	4095	use utf8;
3173		4096
3174	our @ISA = CFClient::UI::Button::;	4097	our @ISA = CFPlus::UI::Button::;
3175		4098
3176	sub new {	4099	sub new {
3177	my $class = shift;	4100	my $class = shift;
3178		4101
3179	my $self = $class->SUPER::new (	4102	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	4119	my ($value, $title, $tooltip) = @$_;
3197		4120
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4121	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	4122	}
3200		4123
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4124	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	4125	}
3203		4126
3204	sub _set_value {	4127	sub _set_value {
3205	my ($self, $value) = @_;	4128	my ($self, $value) = @_;
3206		4129
…		…
3221	$self->emit (changed => $value);	4144	$self->emit (changed => $value);
3222	}	4145	}
3223		4146
3224	#############################################################################	4147	#############################################################################
3225		4148
3226	package CFClient::UI::Statusbox;	4149	package CFPlus::UI::Statusbox;
3227		4150
3228	our @ISA = CFClient::UI::VBox::;	4151	our @ISA = CFPlus::UI::VBox::;
3229		4152
3230	sub new {	4153	sub new {
3231	my $class = shift;	4154	my $class = shift;
3232		4155
3233	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	4157	fontsize => 0.8,
3235	@_,	4158	@_,
3236	);	4159	);
3237		4160
3238	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3239		4162
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		4164
3242	$self	4165	$self
3243	}	4166	}
…		…
3245	sub reorder {	4168	sub reorder {
3246	my ($self) = @_;	4169	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	4170	my $NOW = Time::HiRes::time;
3248		4171
3249	# freeze display when hovering over any label	4172	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	4173	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4174	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	4175	values %{ $self->{item} };
3253		4176
3254	while (my ($k, $v) = each %{ $self->{item} }) {	4177	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4178	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	4179	}
…		…
3277	for ($short) {	4200	for ($short) {
3278	s/^\s+//;	4201	s/^\s+//;
3279	s/\s+/ /g;	4202	s/\s+/ /g;
3280	}	4203	}
3281		4204
3282	new CFClient::UI::Label	4205	new CFPlus::UI::Label
3283	markup => $short,	4206	markup => $short,
3284	tooltip => $item->{tooltip},	4207	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	4208	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	4209	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	4210	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	4264	count => 1,
3342	%arg,	4265	%arg,
3343	};	4266	};
3344	}	4267	}
3345		4268
		4269	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	4270	$self->reorder;
		4271	});
3347	}	4272	}
3348		4273
3349	sub reconfigure {	4274	sub reconfigure {
3350	my ($self) = @_;	4275	my ($self) = @_;
3351		4276
…		…
3364	$self->SUPER::destroy;	4289	$self->SUPER::destroy;
3365	}	4290	}
3366		4291
3367	#############################################################################	4292	#############################################################################
3368		4293
3369	package CFClient::UI::Inventory;
3370
3371	our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373	sub new {
3374	my $class = shift;
3375
3376	my $self = $class->SUPER::new (
3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378	@_,
3379	);
3380
3381	$self
3382	}
3383
3384	sub set_items {
3385	my ($self, $items) = @_;
3386
3387	$self->{child}->clear;
3388	return unless $items;
3389
3390	my @items = sort {
3391	($a->{type} <=> $b->{type})
3392	or ($a->{name} cmp $b->{name})
3393	} @$items;
3394
3395	$self->{real_items} = \@items;
3396
3397	my $row = 0;
3398	for my $item (@items) {
3399	CFClient::Item::update_widgets $item;
3400
3401	$self->{child}->add (0, $row, $item->{face_widget});
3402	$self->{child}->add (1, $row, $item->{desc_widget});
3403	$self->{child}->add (2, $row, $item->{weight_widget});
3404
3405	$row++;
3406	}
3407	}
3408
3409	#############################################################################
3410
3411	package CFClient::UI::BindEditor;
3412
3413	our @ISA = CFClient::UI::FancyFrame::;
3414
3415	sub new {
3416	my $class = shift;
3417
3418	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420	$self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424	text => "start recording",
3425	tooltip => "Start/Stops recording of actions."
3426	."All subsequent actions after the recording started will be captured."
3427	."The actions are displayed after the record was stopped."
3428	."To bind the action you have to click on the 'Bind' button",
3429	on_activate => sub {
3430	unless ($self->{recording}) {
3431	$self->start;
3432	} else {
3433	$self->stop;
3434	}
3435	});
3436
3437	$vb->add (new CFClient::UI::Label text => "Actions:");
3438	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3441	$vb->add (my $hb = new CFClient::UI::HBox);
3442	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443	$hb->add (new CFClient::UI::Button
3444	text => "bind",
3445	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446	on_activate => sub {
3447	$self->ask_for_bind;
3448	});
3449
3450	$vb->add (my $hb = new CFClient::UI::HBox);
3451	$hb->add (new CFClient::UI::Button
3452	text => "ok",
3453	expand => 1,
3454	tooltip => "This closes the binding editor and saves the binding",
3455	on_activate => sub {
3456	$self->hide;
3457	$self->commit;
3458	});
3459
3460	$hb->add (new CFClient::UI::Button
3461	text => "cancel",
3462	expand => 1,
3463	tooltip => "This closes the binding editor without saving",
3464	on_activate => sub {
3465	$self->hide;
3466	$self->{binding_cancel}->()
3467	if $self->{binding_cancel};
3468	});
3469
3470	$self->update_binding_widgets;
3471
3472	$self
3473	}
3474
3475	sub commit {
3476	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480	."'. Don't forget 'Save Config'!");
3481	$self->{binding_change}->($mod, $sym, $cmds)
3482	if $self->{binding_change};
3483	} else {
3484	$::STATUSBOX->add ("No action bound, no key or action specified!");
3485	$self->{binding_cancel}->()
3486	if $self->{binding_cancel};
3487	}
3488	}
3489
3490	sub start {
3491	my ($self) = @_;
3492
3493	$self->{rec_btn}->set_text ("stop recording");
3494	$self->{recording} = 1;
3495	$self->clear_command_list;
3496	$::CONN->start_record if $::CONN;
3497	}
3498
3499	sub stop {
3500	my ($self) = @_;
3501
3502	$self->{rec_btn}->set_text ("start recording");
3503	$self->{recording} = 0;
3504
3505	my $rec;
3506	$rec = $::CONN->stop_record if $::CONN;
3507	return unless ref $rec eq 'ARRAY';
3508	$self->set_command_list ($rec);
3509	}
3510
3511
3512	sub ask_for_bind_and_commit {
3513	my ($self) = @_;
3514	$self->ask_for_bind (1);
3515	}
3516
3517	sub ask_for_bind {
3518	my ($self, $commit, $end_cb) = @_;
3519
3520	CFClient::Binder::open_binding_dialog (sub {
3521	my ($mod, $sym) = @_;
3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523	$self->update_binding_widgets;
3524	$self->commit if $commit;
3525	$end_cb->() if $end_cb;
3526	});
3527	}
3528
3529	# $mod and $sym are the modifiers and key symbol
3530	# $cmds is a array ref of strings (the commands)
3531	# $cb is the callback that is executed on OK
3532	# $ccb is the callback that is executed on CANCEL and
3533	# when the binding was unsuccessful on OK
3534	sub set_binding {
3535	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537	$self->clear_command_list;
3538	$self->{recording} = 0;
3539	$self->{rec_btn}->set_text ("start recording");
3540
3541	$self->{binding} = [$mod, $sym];
3542	$self->{commands} = $cmds;
3543
3544	$self->{binding_change} = $cb;
3545	$self->{binding_cancel} = $ccb;
3546
3547	$self->update_binding_widgets;
3548	}
3549
3550	# this is a shortcut method that asks for a binding
3551	# and then just binds it.
3552	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);
3558	}
3559
3560	sub update_binding_widgets {
3561	my ($self) = @_;
3562	my ($mod, $sym, $cmds) = $self->get_binding;
3563	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564	$self->set_command_list ($cmds);
3565	}
3566
3567	sub get_binding {
3568	my ($self) = @_;
3569	return (
3570	$self->{binding}->[0],
3571	$self->{binding}->[1],
3572	[ grep { defined $_ } @{$self->{commands}} ]
3573	);
3574	}
3575
3576	sub clear_command_list {
3577	my ($self) = @_;
3578	$self->{cmdbox}->clear ();
3579	}
3580
3581	sub set_command_list {
3582	my ($self, $cmds) = @_;
3583
3584	$self->{cmdbox}->clear ();
3585	$self->{commands} = $cmds;
3586
3587	my $idx = 0;
3588
3589	for (@$cmds) {
3590	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592	my $i = $idx;
3593	$hb->add (new CFClient::UI::Label text => $_);
3594	$hb->add (new CFClient::UI::Button
3595	text => "delete",
3596	tooltip => "Deletes the action from the record",
3597	on_activate => sub {
3598	$self->{cmdbox}->remove ($hb);
3599	$cmds->[$i] = undef;
3600	});
3601
3602
3603	$idx++
3604	}
3605	}
3606
3607	#############################################################################
3608
3609	package CFClient::UI::SpellList;
3610
3611	our @ISA = CFClient::UI::Table::;
3612
3613	sub new {
3614	my $class = shift;
3615
3616	my $self = $class->SUPER::new (
3617	binding => [],
3618	commands => [],
3619	@_,
3620	)
3621	}
3622
3623	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636	sub rebuild_spell_list {
3637	my ($self) = @_;
3638
3639	$CFClient::UI::ROOT->on_refresh ($self => sub {
3640	$self->clear;
3641
3642	return unless $::CONN;
3643
3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650	my $row = 0;
3651
3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653	my $spell = $self->{spell}{$_};
3654
3655	$row++;
3656
3657	my $spell_cb = sub {
3658	my ($widget, $ev) = @_;
3659
3660	if ($ev->{button} == 1) {
3661	$::CONN->user_send ("cast $spell->{name}");
3662	} elsif ($ev->{button} == 2) {
3663	$::CONN->user_send ("invoke $spell->{name}");
3664	} elsif ($ev->{button} == 3) {
3665	(new CFClient::UI::Menu
3666	items => [
3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669	],
3670	)->popup ($ev);
3671	} else {
3672	return 0;
3673	}
3674
3675	1
3676	};
3677
3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680	#TODO: add path info to tooltip
3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683	$self->add (0, $row, new CFClient::UI::Face
3684	face => $spell->{face},
3685	can_hover => 1,
3686	can_events => 1,
3687	tooltip => $tooltip,
3688	on_button_down => $spell_cb,
3689	);
3690
3691	$self->add (1, $row, new CFClient::UI::Label
3692	expand => 1,
3693	text => $spell->{name},
3694	can_hover => 1,
3695	can_events => 1,
3696	tooltip => $tooltip,
3697	on_button_down => $spell_cb,
3698	);
3699
3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704	}
3705	});
3706	}
3707
3708	sub add_spell {
3709	my ($self, $spell) = @_;
3710
3711	$self->{spell}->{$spell->{name}} = $spell;
3712	$self->rebuild_spell_list;
3713	}
3714
3715	sub remove_spell {
3716	my ($self, $spell) = @_;
3717
3718	delete $self->{spell}->{$spell->{name}};
3719	$self->rebuild_spell_list;
3720	}
3721
3722	sub clear_spells {
3723	my ($self) = @_;
3724
3725	$self->{spell} = {};
3726	$self->rebuild_spell_list;
3727	}
3728
3729	#############################################################################
3730
3731	package CFClient::UI::Root;	4294	package CFPlus::UI::Root;
3732		4295
3733	our @ISA = CFClient::UI::Container::;	4296	our @ISA = CFPlus::UI::Container::;
3734		4297
3735	use List::Util qw(min max);	4298	use List::Util qw(min max);
3736		4299
3737	use CFClient::OpenGL;	4300	use CFPlus::OpenGL;
3738		4301
3739	sub new {	4302	sub new {
3740	my $class = shift;	4303	my $class = shift;
3741		4304
3742	my $self = $class->SUPER::new (	4305	my $self = $class->SUPER::new (
3743	visible => 1,	4306	visible => 1,
3744	@_,	4307	@_,
3745	);	4308	);
3746		4309
3747	Scalar::Util::weaken ($self->{root} = $self);	4310	CFPlus::weaken ($self->{root} = $self);
3748		4311
3749	$self	4312	$self
3750	}	4313	}
3751		4314
3752	sub size_request {	4315	sub size_request {
…		…
3800	}	4363	}
3801		4364
3802	sub update {	4365	sub update {
3803	my ($self) = @_;	4366	my ($self) = @_;
3804		4367
3805	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
3806	}	4369	}
3807		4370
3808	sub add {	4371	sub add {
3809	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
3810		4373
…		…
3847	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
3848	$_->()	4411	$_->()
3849	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
3850	}	4413	}
3851		4414
3852	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
3853	my %queue;	4416	my %queue;
3854	my @queue;	4417	my @queue;
3855	my $widget;	4418	my $widget;
3856		4419
3857	outer:	4420	outer:
…		…
3904	}	4467	}
3905	}	4468	}
3906		4469
3907	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
3908	}	4471	}
3909	}
3910		4472
3911	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
3912	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
3913	values %$size_alloc;	4475	values %$size_alloc;
3914		4476
3915	while () {	4477	while () {
3916	my $widget = pop @queue || last;	4478	my $widget = pop @queue || last;
3917		4479
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		4481
3920	$w = 0 if $w < 0;	4482	$w = max $widget->{min_w}, $w;
3921	$h = 0 if $h < 0;	4483	$h = max $widget->{min_h}, $h;
3922		4484
		4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4487
		4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4490
3923	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
3925		4493
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4494	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
3928	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
3929		4497
3930	$widget->{w} = $w;	4498	$widget->{w} = $w;
3931	$widget->{h} = $h;	4499	$widget->{h} = $h;
3932		4500
3933	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
3934	}	4503	}
3935	}	4504	}
3936	}	4505	}
3937		4506
3938	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {
3939	$_->()	4508	$_->()
3940	for values %{delete $self->{post_alloc_hook}};	4509	for values %{delete $self->{post_alloc_hook}};
3941	}	4510	}
3942
3943		4511
3944	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4512	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3945	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4513	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3946	glClear GL_COLOR_BUFFER_BIT;	4514	glClear GL_COLOR_BUFFER_BIT;
3947		4515
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4518	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4519	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4520	glLoadIdentity;
3953		4521
3954	{	4522	{
3955	package CFClient::UI::Base;	4523	package CFPlus::UI::Base;
3956		4524
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4525	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4526	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4527
3961	$self->_draw;	4528	$self->_draw;
		4529	}
3962	}	4530	}
3963		4531
3964	#############################################################################	4532	#############################################################################
3965		4533
3966	package CFClient::UI;	4534	package CFPlus::UI;
3967		4535
3968	$ROOT = new CFClient::UI::Root;	4536	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4537	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4538
3971	1	4539	1
3972		4540

Diff Legend

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