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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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