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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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