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

Diff Legend

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