ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.360 by root, Fri Dec 8 22:25:32 2006 UTC

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

Diff Legend

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