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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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