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

Diff Legend

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