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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
… …
378 446
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 448 unless $FOCUS;
381} 449}
382 450
383sub mouse_motion { } 451sub mouse_motion { 0 }
384sub button_up { } 452sub button_up { 0 }
385sub key_down { } 453sub key_down { 0 }
386sub key_up { } 454sub key_up { 0 }
387 455
388sub button_down { 456sub button_down {
389 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
390 458
391 $self->focus_in; 459 $self->focus_in;
392}
393 460
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 537
400sub draw { 538sub draw {
401 my ($self) = @_; 539 my ($self) = @_;
402 540
403 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 552
405 glPushMatrix; 553 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 555
410 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 558 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 560 glBegin GL_QUADS;
417 glVertex $x , $y; 561 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
421 glEnd; 565 glEnd;
422 glDisable GL_BLEND; 566 glDisable GL_BLEND;
423 } 567 }
424 568
425 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 570 glPushMatrix;
427 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 574 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
434 glEnd; 578 glEnd;
435 glPopMatrix; 579 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
438} 585}
439 586
440sub _draw { 587sub _draw {
441 my ($self) = @_; 588 my ($self) = @_;
442 589
443 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504} 591}
505 592
506sub DESTROY { 593sub DESTROY {
507 my ($self) = @_; 594 my ($self) = @_;
508 595
… …
540 627
541 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
543 630
544 glEnable GL_BLEND; 631 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 633 glColor_premultiply @$color;
547 634
548 glBegin GL_QUADS; 635 glBegin GL_QUADS;
549 glVertex 0 , 0; 636 glVertex 0 , 0;
550 glVertex 0 , $h; 637 glVertex 0 , $h;
551 glVertex $w, $h; 638 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
568} 655}
569 656
570sub size_request { 657sub size_request {
571 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
572} 661}
573 662
574sub draw { } 663sub draw { }
575 664
576############################################################################# 665#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
581 670
582sub new { 671sub new {
583 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
584 673
585 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
586 675
587 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
588 children => [], 677 children => [],
589 can_events => 0, 678 can_events => 0,
590 %arg, 679 %arg,
591 ); 680 );
681
592 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
593 684
594 $self 685 $self
595} 686}
596 687
597sub add { 688sub add {
… …
605 $self->{children} = [ 696 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
608 ]; 699 ];
609 700
610 $self->check_size (1); 701 $self->realloc;
611 $self->update;
612} 702}
613 703
614sub children { 704sub children {
615 @{ $_[0]{children} } 705 @{ $_[0]{children} }
616} 706}
… …
621 delete $child->{parent}; 711 delete $child->{parent};
622 $child->hide; 712 $child->hide;
623 713
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 715
626 $self->check_size (1); 716 $self->realloc;
627 $self->update;
628} 717}
629 718
630sub clear { 719sub clear {
631 my ($self) = @_; 720 my ($self) = @_;
632 721
… …
636 for (@$children) { 725 for (@$children) {
637 delete $_->{parent}; 726 delete $_->{parent};
638 $_->hide; 727 $_->hide;
639 } 728 }
640 729
641 $self->check_size; 730 $self->realloc;
642 $self->update;
643} 731}
644 732
645sub find_widget { 733sub find_widget {
646 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
647 735
648 $x -= $self->{x}; 736 $x -= $self->{x};
649 $y -= $self->{y}; 737 $y -= $self->{y};
650 738
651 my $res; 739 my $res;
652 740
653 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
655 and return $res; 743 and return $res;
656 } 744 }
657 745
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
708} 796}
709 797
710############################################################################# 798#############################################################################
711 799
800# back-buffered drawing area
801
712package CFClient::UI::Window; 802package CFClient::UI::Window;
713 803
714our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
715 805
716use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 825 $self->update;
736} 826}
737 827
738sub _render { 828sub _render {
829 my ($self) = @_;
830
739 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
740} 832}
741 833
742sub render_child { 834sub render_child {
743 my ($self) = @_; 835 my ($self) = @_;
744 836
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
748 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
749 $self->_render; 848 $self->_render;
750 }; 849 };
751} 850}
752 851
753sub _draw { 852sub _draw {
754 my ($self) = @_; 853 my ($self) = @_;
755 854
756 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
757 856
758 my $tex = $self->{texture} 857 my $tex = $self->{texture}
759 or return; 858 or return;
760 859
761 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
764 863
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 865
767 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
768} 867}
… …
784} 883}
785 884
786sub size_request { 885sub size_request {
787 my ($self) = @_; 886 my ($self) = @_;
788 887
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 889
791 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
792} 894}
793 895
794sub size_allocate { 896sub size_allocate {
795 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
796 898
899 my $child = $self->child;
900
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 903
800 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
801 $self->update; 905 $self->update;
802} 906}
803 907
… …
839} 943}
840 944
841sub _render { 945sub _render {
842 my ($self) = @_; 946 my ($self) = @_;
843 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 952
846 $self->SUPER::_render; 953 $self->SUPER::_render;
847} 954}
848 955
… …
851package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
852 959
853our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
854 961
855sub new { 962sub new {
856 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
857 966
858 my $self; 967 my $self;
859 968
860 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
861 vertical => 1, 970 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 972 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
865 }, 974 },
866 ; 975 ;
867 976
868 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 979 slider => $slider,
871 @_, 980 %arg,
872 ); 981 );
873 982
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
877 985
878 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 1003}
880 1004
881sub size_allocate { 1005sub size_allocate {
882 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
883 1007
… …
912 1036
913 if ($self->{bg}) { 1037 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
915 1039
916 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
918 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
919 1043
920 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
921 glVertex 0 , 0; 1045 glVertex 0 , 0;
922 glVertex 0 , $h; 1046 glVertex 0 , $h;
923 glVertex $w, $h; 1047 glVertex $w, $h;
… …
936 1060
937our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
938 1062
939use CFClient::OpenGL; 1063use CFClient::OpenGL;
940 1064
941my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944 1072
945sub new { 1073sub new {
946 my $class = shift; 1074 my ($class, %arg) = @_;
947 1075
948 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
949 1077
950 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1081 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1082 can_events => 1,
956 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
957 ); 1086 );
958 1087
959 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
960 align => 0, 1089 align => 0,
961 valign => 1, 1090 valign => 1,
962 text => $self->{title}, 1091 text => $title,
963 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
964 1094
965 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
966} 1103}
967 1104
968sub border { 1105sub border {
969 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
970} 1107}
971 1108
972sub size_request { 1109sub size_request {
973 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
974 1114
975 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
976 1116
977 ( 1117 (
978 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
981} 1121}
982 1122
983sub size_allocate { 1123sub size_allocate {
984 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
985 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
986 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
988 1136
989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990 if $self->{title};
991
992 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
993} 1138}
994 1139
995sub button_down { 1140sub button_down {
996 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
997 1142
… …
1013 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1014 1159
1015 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1017 1162
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size; 1167 $self->realloc;
1022 }; 1168 };
1023 1169
1024 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1174 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1030 1176
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1178
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1035 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1036 } 1187 1
1037} 1188}
1038 1189
1039sub button_up { 1190sub button_up {
1040 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1041 1192
1042 delete $self->{motion}; 1193 !!delete $self->{motion}
1043} 1194}
1044 1195
1045sub mouse_motion { 1196sub mouse_motion {
1046 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1047 1198
1048 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1049} 1202}
1050 1203
1051sub _draw { 1204sub _draw {
1052 my ($self) = @_; 1205 my ($self) = @_;
1053 1206
1207 my $child = $self->{children}[0];
1208
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1211
1057 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1214
1060 my $border = $self->border; 1215 my $border = $self->border;
1061 1216
1062 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1222
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1070 1225
1071 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1231 }
1082 1232
1083 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1084 1234
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1088} 1241}
1089 1242
1090############################################################################# 1243#############################################################################
1091 1244
1092package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1114 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1115 1268
1116 $child->set_parent ($self); 1269 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1118 1271
1119 $self->check_size (1); 1272 $self->realloc;
1120} 1273}
1121 1274
1122# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1123sub clear { 1276sub clear {
1124 my ($self) = @_; 1277 my ($self) = @_;
… …
1129 for (@children) { 1282 for (@children) {
1130 delete $_->{parent}; 1283 delete $_->{parent};
1131 $_->hide; 1284 $_->hide;
1132 } 1285 }
1133 1286
1134 $self->check_size (1); 1287 $self->realloc;
1135 $self->update;
1136} 1288}
1137 1289
1138sub get_wh { 1290sub get_wh {
1139 my ($self) = @_; 1291 my ($self) = @_;
1140 1292
… …
1171sub size_allocate { 1323sub size_allocate {
1172 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1173 1325
1174 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1175 1327
1176 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1178 1330
1179 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1236 } 1388 }
1237} 1389}
1238 1390
1239############################################################################# 1391#############################################################################
1240 1392
1241package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1394
1245our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1246 1396
1247sub size_request { 1397sub size_request {
1248 my ($self) = @_; 1398 my ($self) = @_;
1249 1399
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1251 1401 ? (
1252 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1404 )
1255 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1256} 1409}
1257 1410
1258sub size_allocate { 1411sub size_allocate {
1259 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1260 1413
1261 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1415 my $children = $self->{children};
1264 1416
1265 my @h = map $_->{req_w}, @$children; 1417 my @req;
1266 1418
1267 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1268 1420 @req = ($space / (@$children || 1)) x @$children;
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 } 1435 }
1283 } 1436 }
1284 1437
1285 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1286 1439
1287 my $y = 0; 1440 my $pos = 0;
1288 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1444
1293 $y += $h; 1445 $pos += $alloc;
1294 } 1446 }
1295 1447
1296 1 1448 1
1297} 1449}
1298 1450
1299############################################################################# 1451#############################################################################
1300 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1301package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1302 1469
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1306 1471
1307sub size_request { 1472sub new {
1308 my ($self) = @_; 1473 my $class = shift;
1309 1474
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1311 1476 vertical => 1,
1312 ( 1477 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1478 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1479}
1356 1480
1357############################################################################# 1481#############################################################################
1358 1482
1359package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1376 ellipsise => 3, # end 1500 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1378 fontsize => 1, 1502 fontsize => 1,
1379 align => -1, 1503 align => -1,
1380 valign => -1, 1504 valign => -1,
1381 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1382 can_events => 0, 1507 can_events => 0,
1383 %arg 1508 %arg
1384 ); 1509 );
1385 1510
1386 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1422 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1423 1548
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1426 1551
1552 $self->realloc;
1427 $self->update; 1553 $self->update;
1428 $self->check_size;
1429} 1554}
1430 1555
1431sub set_markup { 1556sub set_markup {
1432 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1433 1558
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1563
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1441 1566
1567 $self->realloc;
1442 $self->update; 1568 $self->update;
1443 $self->check_size;
1444} 1569}
1445 1570
1446sub size_request { 1571sub size_request {
1447 my ($self) = @_; 1572 my ($self) = @_;
1448 1573
… …
1462 1587
1463 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1465 } 1590 }
1466 1591
1467 ( 1592 ($w, $h)
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1593}
1472 1594
1473sub size_allocate { 1595sub size_allocate {
1474 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1475 1597
1598 delete $self->{ox};
1599
1476 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477} 1602}
1478 1603
1479sub set_fontsize { 1604sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1481 1606
1482 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1608 delete $self->{texture};
1484 1609
1485 $self->update; 1610 $self->realloc;
1486 $self->check_size;
1487} 1611}
1488 1612
1489sub _draw { 1613sub _draw {
1490 my ($self) = @_; 1614 my ($self) = @_;
1491 1615
… …
1497 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1625
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1503 1628
1629 unless (exists $self->{ox}) {
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1507 1633
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 1637 };
1514 1638
1515 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517 1641
1642 glColor_premultiply @{$self->{fg}}
1518 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1519 glColor @{$self->{fg}}; 1644
1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1521 } else {
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1523 }
1524 1646
1525 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1526} 1648}
1527 1649
1528############################################################################# 1650#############################################################################
… …
1555 1677
1556 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1557 1679
1558 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1559 1681
1560 delete $self->{texture};
1561
1562 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1563 $self->{text} = $text; 1683 $self->{text} = $text;
1564 1684
1565 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1566 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1567 1687
1568 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1569} 1690}
1570 1691
1571sub set_text { 1692sub set_text {
1572 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1573 1694
1574 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1696 $self->_set_text ($text);
1576 $self->update; 1697
1577 $self->check_size; 1698 $self->realloc;
1578} 1699}
1579 1700
1580sub get_text { 1701sub get_text {
1581 $_[0]{text} 1702 $_[0]{text}
1582} 1703}
… …
1612 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1613 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1614 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1615 } elsif ($uni) { 1736 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1617 } 1740 }
1618 1741
1619 $self->_set_text ($text); 1742 $self->_set_text ($text);
1620 $self->update; 1743
1621 $self->check_size; 1744 $self->realloc;
1745
1746 1
1622} 1747}
1623 1748
1624sub focus_in { 1749sub focus_in {
1625 my ($self) = @_; 1750 my ($self) = @_;
1626 1751
… …
1641 utf8::encode $text; 1766 utf8::encode $text;
1642 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1643 1768
1644 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1645 $self->update; 1770 $self->update;
1771
1772 1
1646} 1773}
1647 1774
1648sub mouse_motion { 1775sub mouse_motion {
1649 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1650# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1651} 1780}
1652 1781
1653sub _draw { 1782sub _draw {
1654 my ($self) = @_; 1783 my ($self) = @_;
1655 1784
1656 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1657 1786
1658 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1659 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1660 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1661 } else { 1790 } else {
1662 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1663 } 1792 }
1664 1793
1665 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1666 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1667 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1668 glVertex 0 , 0; 1797 glVertex 0 , 0;
1669 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1670 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1671 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1732 } else { 1861 } else {
1733 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1734 } 1863 }
1735 1864
1736 } else { 1865 } else {
1737 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1738 } 1869 1
1739
1740} 1870}
1741 1871
1742############################################################################# 1872#############################################################################
1743 1873
1744package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1753 1883
1754sub new { 1884sub new {
1755 my $class = shift; 1885 my $class = shift;
1756 1886
1757 $class->SUPER::new ( 1887 $class->SUPER::new (
1758 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1759 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1761 can_hover => 1, 1892 can_hover => 1,
1762 align => 0, 1893 align => 0,
1763 valign => 0, 1894 valign => 0,
… …
1772 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1773 1904
1774 $self->emit ("activate") 1905 $self->emit ("activate")
1775 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1776 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1777} 1910}
1778 1911
1779sub _draw { 1912sub _draw {
1780 my ($self) = @_; 1913 my ($self) = @_;
1781 1914
1782 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1783
1784 if ($GRAB == $self) {
1785 $self->{fg} = $self->{active_fg};
1786 }
1787 1916
1788 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1790 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1791 1920
… …
1810 1939
1811sub new { 1940sub new {
1812 my $class = shift; 1941 my $class = shift;
1813 1942
1814 $class->SUPER::new ( 1943 $class->SUPER::new (
1815 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1816 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 1950 state => 0,
… …
1824} 1954}
1825 1955
1826sub size_request { 1956sub size_request {
1827 my ($self) = @_; 1957 my ($self) = @_;
1828 1958
1829 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1830} 1960}
1831 1961
1832sub button_down { 1962sub button_down {
1833 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1834 1964
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1838 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1839 } 1973 1
1840} 1974}
1841 1975
1842sub _draw { 1976sub _draw {
1843 my ($self) = @_; 1977 my ($self) = @_;
1844 1978
1845 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1846 1980
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 1982
1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850 1986
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 1988
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 1990
… …
2009 2145
2010 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2012 2148
2013 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2014 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2015 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2017 2154
2018 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2019 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2119 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2126 vertical => 0, 2263 vertical => 0,
2127 can_hover => 1, 2264 can_hover => 1,
2128 inner_pad => 0.02, 2265 inner_pad => 0.02,
2129 @_ 2266 @_
2130 ); 2267 );
… …
2133 $self->update; 2270 $self->update;
2134 2271
2135 $self 2272 $self
2136} 2273}
2137 2274
2275sub changed { }
2276
2138sub set_range { 2277sub set_range {
2139 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2140 2279
2141 $self->{range} = $range; 2280 ($range, $self->{range}) = ($self->{range}, $range);
2142 2281
2143 $self->update; 2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2144} 2284}
2145 2285
2146sub set_value { 2286sub set_value {
2147 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2148 2288
… …
2167} 2307}
2168 2308
2169sub size_request { 2309sub size_request {
2170 my ($self) = @_; 2310 my ($self) = @_;
2171 2311
2172 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2313}
2177 2314
2178sub button_down { 2315sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2180 2317
2181 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2182 2319
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184 2321
2185 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2186} 2323}
2187 2324
2188sub mouse_motion { 2325sub mouse_motion {
2189 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2190 2327
… …
2194 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195 2332
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197 2334
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2199 } 2340 1
2200} 2341}
2201 2342
2202sub update { 2343sub update {
2203 my ($self) = @_; 2344 my ($self) = @_;
2204 2345
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2206 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2207 2355
2208 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2210 2358
… …
2216 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2217 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2218 2366
2219 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2220 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2221 }); 2369 }
2222
2223 $self->SUPER::update;
2224}
2225
2226sub _draw {
2227 my ($self) = @_;
2228 2370
2229 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2230 2372
2231 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2232 2374
… …
2426 2568
2427 delete $self->{texture}; 2569 delete $self->{texture};
2428 } 2570 }
2429 2571
2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2431 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2432 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2433 2575
2434 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2435 2577
2436 my $y0 = $top; 2578 my $y0 = $top;
… …
2471sub _draw { 2613sub _draw {
2472 my ($self) = @_; 2614 my ($self) = @_;
2473 2615
2474 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2478 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2479 2621
2480 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2481 2623
2482} 2624}
… …
2531 2673
2532sub new { 2674sub new {
2533 my $class = shift; 2675 my $class = shift;
2534 2676
2535 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2536 state => 0, 2678 state => 0,
2537 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2538 @_ 2680 @_
2539 ); 2681 );
2540 2682
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2683 $self
2547} 2684}
2548 2685
2549sub toggle_flopper { 2686sub toggle_flopper {
2550 my ($self) = @_; 2687 my ($self) = @_;
2551 2688
2552 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2690}
2564 2691
2565############################################################################# 2692#############################################################################
2566 2693
2567package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2580} 2707}
2581 2708
2582sub set_tooltip_from { 2709sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2584 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2585 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2724 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2726 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2602 2738
2603sub size_allocate { 2739sub size_allocate {
2604 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2605 2741
2606 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2607} 2761}
2608 2762
2609sub _draw { 2763sub _draw {
2610 my ($self) = @_; 2764 my ($self) = @_;
2611 2765
… …
2628 glVertex $w, $h; 2782 glVertex $w, $h;
2629 glVertex $w, 0; 2783 glVertex $w, 0;
2630 glEnd; 2784 glEnd;
2631 2785
2632 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2633 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2634} 2789}
2635 2790
2636############################################################################# 2791#############################################################################
2637 2792
… …
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697 2852
2698 if ($tex) { 2853 if ($tex) {
2699 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2704 } 2859 }
2705} 2860}
2706 2861
… …
2713 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2714} 2869}
2715 2870
2716############################################################################# 2871#############################################################################
2717 2872
2718package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2719 2874
2720our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2721 2876
2722sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764 2878
2765############################################################################# 2879#############################################################################
2766 2880
2767package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2768 2882
… …
2809 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 2924 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2812 2926
2813 $self->show; 2927 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815} 2929}
2816 2930
2817sub mouse_motion { 2931sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2819 2933
2820 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2823} 2939}
2824 2940
2825sub button_up { 2941sub button_up {
2826 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2827 2943
… …
2829 undef $GRAB; 2945 undef $GRAB;
2830 $self->hide; 2946 $self->hide;
2831 2947
2832 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2834 } 2954 1
2835} 2955}
2836 2956
2837############################################################################# 2957#############################################################################
2838 2958
2839package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2840 2960
2841our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2842 2962
2843sub new { 2963sub new {
2844 my $class = shift; 2964 my $class = shift;
2845 2965
2846 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2847 fontsize => 0.8, 3075 fontsize => 0.8,
2848 @_, 3076 @_,
2849 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2850} 3087}
2851 3088
2852sub reorder { 3089sub reorder {
2853 my ($self) = @_; 3090 my ($self) = @_;
2854 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2855 3092
2856 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 } 3095 }
2859 3096
… …
2861 3098
2862 my @items = sort { 3099 my @items = sort {
2863 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2866 3105
2867 my $count = 10 + 1; 3106 my $count = 10 + 1;
2868 for my $item (@items) { 3107 for my $item (@items) {
2869 last unless --$count; 3108 last unless --$count;
2870 3109
… …
2885 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2890 can_events => 1, 3130 can_events => 1,
2891 can_hover => 1 3131 can_hover => 1
2892 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2893 } 3143 }
2894 3144
2895 $self->clear; 3145 $self->clear;
2896 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2897} 3147}
… …
2902 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2904 3154
2905 return unless $text; 3155 return unless $text;
2906 3156
2907 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2908 3158
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910 3160
2911 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2942 3192
2943 $self->reorder; 3193 $self->reorder;
2944 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2945} 3195}
2946 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2947############################################################################# 3205#############################################################################
2948 3206
2949package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2950 3208
2951our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953use CFClient::OpenGL;
2954 3210
2955sub new { 3211sub new {
2956 my $class = shift; 3212 my $class = shift;
2957 3213
2958 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
2959 @_, 3456 @_,
2960 ) 3457 )
2961} 3458}
2962 3459
2963sub configure { 3460# XXX: Do sorting? Argl...
2964 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
2965
2966 $self->{w} = $w;
2967 $self->{h} = $h;
2968}
2969
2970sub check_size {
2971 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
2972 3464
2973 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2974 if $self->{w}; 3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
2975} 3521}
2976 3522
2977sub size_request { 3523sub size_request {
2978 my ($self) = @_; 3524 my ($self) = @_;
2979 3525
2980 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
2981} 3541}
2982 3542
2983sub size_allocate { 3543sub size_allocate {
2984 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
2985 3545
2986 for my $child ($self->children) { 3546 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 3548
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
2991 3551
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3554
2998 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
2999 } 3556 }
3000} 3557}
3001 3558
… …
3012} 3569}
3013 3570
3014sub update { 3571sub update {
3015 my ($self) = @_; 3572 my ($self) = @_;
3016 3573
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3019} 3575}
3020 3576
3021sub add { 3577sub add {
3022 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3023 3579
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3032 3581 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3582
3038 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3039} 3584}
3040 3585
3041sub remove { 3586sub remove {
3042 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3043 3588
3044 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3045 3593
3046 while (@children) { 3594 while (@children) {
3047 my $w = pop @children; 3595 my $w = pop @children;
3048 push @children, $w->children; 3596 push @children, $w->children;
3049 $w->set_invisible; 3597 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3069 $_->() 3617 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3071 } 3619 }
3072 3620
3073 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3074 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3075 3625
3076 for (;;) { 3626 outer:
3077 if ($self->{check_size}) { 3627 while () {
3078 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3081 } 3636 }
3082 3637
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3084 3640
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 3642 and last;
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3093 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3095 3664
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3097 3666
3098 $widget->{parent}->check_size
3099 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3100 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3101 } 3677 }
3102 } 3678 }
3103 3679
3104 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 3688
3108 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3110 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3111 $widget->{w} = $w; 3699 $widget->{w} = $w;
3112 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3113 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3114 } 3704 }
3115 } 3705 }
3116 3706
3117 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3118 $_->() 3708 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3120 } 3710 }
3711
3121 3712
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3125 3716
… …
3127 glLoadIdentity; 3718 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 3721 glLoadIdentity;
3131 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3132 $self->_draw; 3730 $self->_draw;
3133} 3731}
3134 3732
3135############################################################################# 3733#############################################################################
3136 3734

Diff Legend

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