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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
209 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
223 } 234 }
224 235
225 $self 236 $self
226} 237}
227 238
232 %$self = (); 243 %$self = ();
233} 244}
234 245
235sub show { 246sub show {
236 my ($self) = @_; 247 my ($self) = @_;
248
237 return if $self->{parent}; 249 return if $self->{parent};
238 250
239 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
240} 252}
241 253
242sub show_centered { 254sub set_visible {
243 my ($self) = @_; 255 my ($self) = @_;
256
244 return if $self->{parent}; 257 return if $self->{visible};
245 258
246 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
247 261
248 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 263
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
251 }, 265
252 ); 266 $_->set_visible for $self->children;
253} 267}
254 268
255sub set_invisible { 269sub set_invisible {
256 my ($self) = @_; 270 my ($self) = @_;
257 271
258 # broken show/hide model 272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
259 275
260 delete $self->{root}; 276 delete $self->{root};
261 delete $self->{visible}; 277 delete $self->{visible};
262 278
263 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
265 281
266 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
268 284
269 $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;
270} 305}
271 306
272sub hide { 307sub hide {
273 my ($self) = @_; 308 my ($self) = @_;
274 309
276 311
277 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
278 if $self->{parent}; 313 if $self->{parent};
279} 314}
280 315
281sub move { 316sub move_abs {
282 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
283 318
284 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
287 322
288 $self->update; 323 $self->update;
289} 324}
290 325
291sub set_size { 326sub set_size {
292 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
293 328
294 $self->{user_w} = $w; 329 $self->{force_w} = $w;
295 $self->{user_h} = $h; 330 $self->{force_h} = $h;
296 331
297 $self->check_size; 332 $self->realloc;
298} 333}
299 334
300sub size_request { 335sub size_request {
301 require Carp; 336 require Carp;
302 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
304 339
305sub configure { 340sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
307 342
308 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
311 348
312 # use alignment to adjust x, y 349 # use alignment to adjust x, y
313 350
314 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 353 }
319 354
320 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 356 $self->{x} = $x;
322 $self->{y} = $y; 357 $self->{y} = $y;
323 $self->update; 358 $self->update;
324 } 359 }
325 360
326 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 368 }
329} 369}
330 370
331sub size_allocate { 371sub size_allocate {
332 # nothing to be done 372 # nothing to be done
333} 373}
334 374
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
343} 381}
344 382
345sub set_max_size { 383sub set_max_size {
346 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
347 385
406 444
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS; 446 unless $FOCUS;
409} 447}
410 448
411sub mouse_motion { } 449sub mouse_motion { 0 }
412sub button_up { } 450sub button_up { 0 }
413sub key_down { } 451sub key_down { 0 }
414sub key_up { } 452sub key_up { 0 }
415 453
416sub button_down { 454sub button_down {
417 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
418 456
419 $self->focus_in; 457 $self->focus_in;
420}
421 458
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427 535
428sub draw { 536sub draw {
429 my ($self) = @_; 537 my ($self) = @_;
430 538
431 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432 550
433 glPushMatrix; 551 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw; 553 $self->_draw;
436 glPopMatrix; 554 glPopMatrix;
448 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
449 glEnd; 567 glEnd;
450 glDisable GL_BLEND; 568 glDisable GL_BLEND;
451 } 569 }
452 570
453 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 572 glPushMatrix;
455 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 576 glVertex 0 , 0;
469 my ($self) = @_; 587 my ($self) = @_;
470 588
471 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
472} 590}
473 591
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 592sub DESTROY {
535 my ($self) = @_; 593 my ($self) = @_;
536 594
537 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
538 #$self->deactivate; 596 #$self->deactivate;
594 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
596} 654}
597 655
598sub size_request { 656sub size_request {
599 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
600} 660}
601 661
602sub draw { } 662sub draw { }
603 663
604############################################################################# 664#############################################################################
608our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
609 669
610sub new { 670sub new {
611 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
612 672
613 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
614 674
615 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
616 children => [], 676 children => [],
617 can_events => 0, 677 can_events => 0,
618 %arg, 678 %arg,
619 ); 679 );
680
620 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
621 683
622 $self 684 $self
623} 685}
624 686
625sub add { 687sub add {
633 $self->{children} = [ 695 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
636 ]; 698 ];
637 699
638 $self->check_size (1); 700 $self->realloc;
639 $self->update;
640} 701}
641 702
642sub children { 703sub children {
643 @{ $_[0]{children} } 704 @{ $_[0]{children} }
644} 705}
649 delete $child->{parent}; 710 delete $child->{parent};
650 $child->hide; 711 $child->hide;
651 712
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 714
654 $self->check_size (1); 715 $self->realloc;
655 $self->update;
656} 716}
657 717
658sub clear { 718sub clear {
659 my ($self) = @_; 719 my ($self) = @_;
660 720
664 for (@$children) { 724 for (@$children) {
665 delete $_->{parent}; 725 delete $_->{parent};
666 $_->hide; 726 $_->hide;
667 } 727 }
668 728
669 $self->check_size; 729 $self->realloc;
670 $self->update;
671} 730}
672 731
673sub find_widget { 732sub find_widget {
674 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
675 734
676 $x -= $self->{x}; 735 $x -= $self->{x};
677 $y -= $self->{y}; 736 $y -= $self->{y};
678 737
679 my $res; 738 my $res;
680 739
681 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
683 and return $res; 742 and return $res;
684 } 743 }
685 744
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
762 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 822 $self->update;
764} 823}
765 824
766sub _render { 825sub _render {
826 my ($self) = @_;
827
767 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
768} 829}
769 830
770sub render_child { 831sub render_child {
771 my ($self) = @_; 832 my ($self) = @_;
772 833
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
776 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
777 $self->_render; 845 $self->_render;
778 }; 846 };
779} 847}
780 848
781sub _draw { 849sub _draw {
782 my ($self) = @_; 850 my ($self) = @_;
783 851
784 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
785 853
786 my $tex = $self->{texture} 854 my $tex = $self->{texture}
787 or return; 855 or return;
788 856
789 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
812} 880}
813 881
814sub size_request { 882sub size_request {
815 my ($self) = @_; 883 my ($self) = @_;
816 884
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 886
819 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
820} 891}
821 892
822sub size_allocate { 893sub size_allocate {
823 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
824 895
896 my $child = $self->child;
897
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 900
828 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
829 $self->update; 902 $self->update;
830} 903}
831 904
867} 940}
868 941
869sub _render { 942sub _render {
870 my ($self) = @_; 943 my ($self) = @_;
871 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 949
874 $self->SUPER::_render; 950 $self->SUPER::_render;
875} 951}
876 952
879package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
880 956
881our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
882 958
883sub new { 959sub new {
884 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
885 963
886 my $self; 964 my $self;
887 965
888 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
889 vertical => 1, 967 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 969 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 970 $self->{vp}->set_offset (0, $_[1]);
893 }, 971 },
894 ; 972 ;
895 973
896 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 975 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 976 slider => $slider,
899 @_, 977 %arg,
900 ); 978 );
901 979
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
905 982
906 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
907} 990}
908 991
909sub update { 992sub update {
910 my ($self) = @_; 993 my ($self) = @_;
911 994
974 1057
975our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
976 1059
977use CFClient::OpenGL; 1060use CFClient::OpenGL;
978 1061
979my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1069
983sub new { 1070sub new {
984 my $class = shift; 1071 my ($class, %arg) = @_;
985 1072
986 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
987 1074
988 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1078 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1079 can_events => 1,
994 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
995 ); 1083 );
996 1084
997 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
998 align => 0, 1086 align => 0,
999 valign => 1, 1087 valign => 1,
1000 text => $self->{title}, 1088 text => $title,
1001 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
1002 1091
1003 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004} 1100}
1005 1101
1006sub border { 1102sub border {
1007 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
1008} 1104}
1009 1105
1010sub size_request { 1106sub size_request {
1011 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
1012 1111
1013 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
1014 1113
1015 ( 1114 (
1016 $w + $self->border * 2, 1115 $w + $self->border * 2,
1019} 1118}
1020 1119
1021sub size_allocate { 1120sub size_allocate {
1022 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
1023 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
1024 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
1026 1133
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
1031} 1135}
1032 1136
1033sub button_down { 1137sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1035 1139
1051 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
1052 1156
1053 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
1055 1159
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059 $self->check_size;
1060 }; 1165 };
1061 1166
1062 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
1066 $self->{motion} = sub { 1171 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
1068 1173
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1175
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072 $self->update;
1073 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
1074 } 1182 1
1075} 1183}
1076 1184
1077sub button_up { 1185sub button_up {
1078 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
1079 1187
1080 delete $self->{motion}; 1188 !!delete $self->{motion}
1081} 1189}
1082 1190
1083sub mouse_motion { 1191sub mouse_motion {
1084 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1085 1193
1086 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
1087} 1197}
1088 1198
1089sub _draw { 1199sub _draw {
1090 my ($self) = @_; 1200 my ($self) = @_;
1091 1201
1202 my $child = $self->{children}[0];
1203
1092 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
1093 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
1094 1206
1095 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097 1209
1098 my $border = $self->border; 1210 my $border = $self->border;
1099 1211
1100 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105 1217
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
1108 1220
1109 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1110 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1111 my $rep_y = $ch / $bg->{h}; 1224 $bg->{t} = $ch / $bg->{h};
1112
1113 glColor @{ $self->{bg} };
1114
1115 $bg->{s} = $rep_x;
1116 $bg->{t} = $rep_y;
1117 $bg->{wrap_mode} = 1;
1118 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 } 1226 }
1120 1227
1121 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1122 1229
1123 $self->{title}->draw if $self->{title};
1124
1125 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1126} 1236}
1127 1237
1128############################################################################# 1238#############################################################################
1129 1239
1130package CFClient::UI::Table; 1240package CFClient::UI::Table;
1152 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1153 1263
1154 $child->set_parent ($self); 1264 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1156 1266
1157 $self->check_size (1); 1267 $self->realloc;
1158} 1268}
1159 1269
1160# TODO: move to container class maybe? send children a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1161sub clear { 1271sub clear {
1162 my ($self) = @_; 1272 my ($self) = @_;
1167 for (@children) { 1277 for (@children) {
1168 delete $_->{parent}; 1278 delete $_->{parent};
1169 $_->hide; 1279 $_->hide;
1170 } 1280 }
1171 1281
1172 $self->check_size (1); 1282 $self->realloc;
1173 $self->update;
1174} 1283}
1175 1284
1176sub get_wh { 1285sub get_wh {
1177 my ($self) = @_; 1286 my ($self) = @_;
1178 1287
1274 } 1383 }
1275} 1384}
1276 1385
1277############################################################################# 1386#############################################################################
1278 1387
1279package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1280
1281# TODO: wrap into common Box base class
1282 1389
1283our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1284 1391
1285sub size_request { 1392sub size_request {
1286 my ($self) = @_; 1393 my ($self) = @_;
1287 1394
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1289 1396 ? (
1290 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1291 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292 (List::Util::max map $_->[1], @alloc), 1399 )
1293 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1294} 1404}
1295 1405
1296sub size_allocate { 1406sub size_allocate {
1297 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1298 1408
1299 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1300
1301 my $children = $self->{children}; 1410 my $children = $self->{children};
1302 1411
1303 my @h = map $_->{req_w}, @$children; 1412 my @req;
1304 1413
1305 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1306 1415 @req = ($space / (@$children || 1)) x @$children;
1307 if ($req_h > $h) {
1308 # ah well, not enough space
1309 $_ *= $h / $req_h for @h;
1310 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1311 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312 $exp ||= 1;
1313 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1314 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1315 my $child = $children->[$_];
1316
1317 my $alloc_h = $h[$_];
1318 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319 $h[$_] = $alloc_h;
1320 } 1430 }
1321 } 1431 }
1322 1432
1323 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1324 1434
1325 my $y = 0; 1435 my $pos = 0;
1326 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1329 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330 1439
1331 $y += $h; 1440 $pos += $alloc;
1332 } 1441 }
1333 1442
1334 1 1443 1
1335} 1444}
1336 1445
1337############################################################################# 1446#############################################################################
1338 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1339package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1340 1464
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1344 1466
1345sub size_request { 1467sub new {
1346 my ($self) = @_; 1468 my $class = shift;
1347 1469
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1349 1471 vertical => 1,
1350 ( 1472 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1473 )
1354}
1355
1356sub size_allocate {
1357 my ($self, $w, $h) = @_;
1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361 my $children = $self->{children};
1362
1363 my @h = map $_->{req_h}, @$children;
1364
1365 my $req_h = List::Util::sum @h;
1366
1367 if ($req_h > $h) {
1368 # ah well, not enough space
1369 $_ *= $h / $req_h for @h;
1370 } else {
1371 my $exp = List::Util::sum map $_->{expand}, @$children;
1372 $exp ||= 1;
1373
1374 for (0 .. $#$children) {
1375 my $child = $children->[$_];
1376
1377 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378 }
1379 }
1380
1381 CFClient::UI::harmonize \@h;
1382
1383 my $y = 0;
1384 for (0 .. $#$children) {
1385 my $child = $children->[$_];
1386 my $h = $h[$_];
1387 $child->configure (0, $y, $w, $h);
1388
1389 $y += $h;
1390 }
1391
1392 1
1393} 1474}
1394 1475
1395############################################################################# 1476#############################################################################
1396 1477
1397package CFClient::UI::Label; 1478package CFClient::UI::Label;
1414 ellipsise => 3, # end 1495 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1416 fontsize => 1, 1497 fontsize => 1,
1417 align => -1, 1498 align => -1,
1418 valign => -1, 1499 valign => -1,
1419 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1420 can_events => 0, 1502 can_events => 0,
1421 %arg 1503 %arg
1422 ); 1504 );
1423 1505
1424 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
1460 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1461 1543
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1464 1546
1547 $self->realloc;
1465 $self->update; 1548 $self->update;
1466 $self->check_size;
1467} 1549}
1468 1550
1469sub set_markup { 1551sub set_markup {
1470 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1471 1553
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1558
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1479 1561
1562 $self->realloc;
1480 $self->update; 1563 $self->update;
1481 $self->check_size;
1482} 1564}
1483 1565
1484sub size_request { 1566sub size_request {
1485 my ($self) = @_; 1567 my ($self) = @_;
1486 1568
1500 1582
1501 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1503 } 1585 }
1504 1586
1505 ( 1587 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1588}
1510 1589
1511sub size_allocate { 1590sub size_allocate {
1512 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1513 1592
1593 delete $self->{ox};
1594
1514 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1597}
1516 1598
1517sub set_fontsize { 1599sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1519 1601
1520 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1603 delete $self->{texture};
1522 1604
1523 $self->update; 1605 $self->realloc;
1524 $self->check_size;
1525} 1606}
1526 1607
1527sub _draw { 1608sub _draw {
1528 my ($self) = @_; 1609 my ($self) = @_;
1529 1610
1535 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1620
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1541 1623
1624 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1545 1628
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1632 };
1552 1633
1553 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1636
1609sub set_text { 1690sub set_text {
1610 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1611 1692
1612 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1694 $self->_set_text ($text);
1614 $self->update; 1695
1615 $self->check_size; 1696 $self->realloc;
1616} 1697}
1617 1698
1618sub get_text { 1699sub get_text {
1619 $_[0]{text} 1700 $_[0]{text}
1620} 1701}
1650 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1653 } elsif ($uni) { 1734 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1655 } 1738 }
1656 1739
1657 $self->_set_text ($text); 1740 $self->_set_text ($text);
1658 $self->update; 1741
1659 $self->check_size; 1742 $self->realloc;
1743
1744 1
1660} 1745}
1661 1746
1662sub focus_in { 1747sub focus_in {
1663 my ($self) = @_; 1748 my ($self) = @_;
1664 1749
1679 utf8::encode $text; 1764 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1681 1766
1682 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1683 $self->update; 1768 $self->update;
1769
1770 1
1684} 1771}
1685 1772
1686sub mouse_motion { 1773sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1688# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1689} 1778}
1690 1779
1691sub _draw { 1780sub _draw {
1692 my ($self) = @_; 1781 my ($self) = @_;
1693 1782
1770 } else { 1859 } else {
1771 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1772 } 1861 }
1773 1862
1774 } else { 1863 } else {
1775 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1776 } 1867 1
1777
1778} 1868}
1779 1869
1780############################################################################# 1870#############################################################################
1781 1871
1782package CFClient::UI::Button; 1872package CFClient::UI::Button;
1791 1881
1792sub new { 1882sub new {
1793 my $class = shift; 1883 my $class = shift;
1794 1884
1795 $class->SUPER::new ( 1885 $class->SUPER::new (
1796 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1797 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1799 can_hover => 1, 1890 can_hover => 1,
1800 align => 0, 1891 align => 0,
1801 valign => 0, 1892 valign => 0,
1810 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1811 1902
1812 $self->emit ("activate") 1903 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1815} 1908}
1816 1909
1817sub _draw { 1910sub _draw {
1818 my ($self) = @_; 1911 my ($self) = @_;
1819 1912
1848 1941
1849sub new { 1942sub new {
1850 my $class = shift; 1943 my $class = shift;
1851 1944
1852 $class->SUPER::new ( 1945 $class->SUPER::new (
1853 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1854 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1952 state => 0,
1862} 1956}
1863 1957
1864sub size_request { 1958sub size_request {
1865 my ($self) = @_; 1959 my ($self) = @_;
1866 1960
1867 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1868} 1962}
1869 1963
1870sub button_down { 1964sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1872 1966
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1877 } 1975 1
1878} 1976}
1879 1977
1880sub _draw { 1978sub _draw {
1881 my ($self) = @_; 1979 my ($self) = @_;
1882 1980
1883 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1884 1982
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1984
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 1988
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1990
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1992
2157 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2261 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2164 vertical => 0, 2264 vertical => 0,
2165 can_hover => 1, 2265 can_hover => 1,
2166 inner_pad => 0.02, 2266 inner_pad => 0.02,
2167 @_ 2267 @_
2168 ); 2268 );
2171 $self->update; 2271 $self->update;
2172 2272
2173 $self 2273 $self
2174} 2274}
2175 2275
2276sub changed { }
2277
2176sub set_range { 2278sub set_range {
2177 my ($self, $range) = @_; 2279 my ($self, $range) = @_;
2178 2280
2179 ($range, $self->{range}) = ($self->{range}, $range); 2281 ($range, $self->{range}) = ($self->{range}, $range);
2180 2282
2206} 2308}
2207 2309
2208sub size_request { 2310sub size_request {
2209 my ($self) = @_; 2311 my ($self) = @_;
2210 2312
2211 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2314}
2216 2315
2217sub button_down { 2316sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2219 2318
2220 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2221 2320
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2322
2224 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2225} 2324}
2226 2325
2227sub mouse_motion { 2326sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2229 2328
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2333
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2335
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2238 } 2341 1
2239} 2342}
2240 2343
2241sub update { 2344sub update {
2242 my ($self) = @_; 2345 my ($self) = @_;
2243 2346
2570 2673
2571sub new { 2674sub new {
2572 my $class = shift; 2675 my $class = shift;
2573 2676
2574 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2575 state => 0, 2678 state => 0,
2576 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2577 @_ 2680 @_
2578 ); 2681 );
2579 2682
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2683 $self
2586} 2684}
2587 2685
2588sub toggle_flopper { 2686sub toggle_flopper {
2589 my ($self) = @_; 2687 my ($self) = @_;
2590 2688
2591 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2592 if ($self->{state} = !$self->{state}) {
2593 $CFClient::UI::ROOT->add ($self->{other});
2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2595 $self->_emit ("open");
2596 } else {
2597 $CFClient::UI::ROOT->remove ($self->{other});
2598 $self->_emit ("close");
2599 }
2600
2601 $self->_emit (changed => $self->{state});
2602} 2690}
2603 2691
2604############################################################################# 2692#############################################################################
2605 2693
2606package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
2619} 2707}
2620 2708
2621sub set_tooltip_from { 2709sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2623 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
2624 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2724 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2726 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 2738
2642sub size_allocate { 2739sub size_allocate {
2643 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2644 2741
2645 $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 });
2646} 2761}
2647 2762
2648sub _draw { 2763sub _draw {
2649 my ($self) = @_; 2764 my ($self) = @_;
2650 2765
2667 glVertex $w, $h; 2782 glVertex $w, $h;
2668 glVertex $w, 0; 2783 glVertex $w, 0;
2669 glEnd; 2784 glEnd;
2670 2785
2671 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2672 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2673} 2789}
2674 2790
2675############################################################################# 2791#############################################################################
2676 2792
2752 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2753} 2869}
2754 2870
2755############################################################################# 2871#############################################################################
2756 2872
2757package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2758 2874
2759our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2760 2876
2761sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2762 my $class = shift;
2763
2764 my $self = $class->SUPER::new (
2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766 @_,
2767 );
2768
2769 $self
2770}
2771
2772sub set_items {
2773 my ($self, $items) = @_;
2774
2775 $self->{scrolled}->clear;
2776 return unless $items;
2777
2778 my @items = sort {
2779 ($a->{type} <=> $b->{type})
2780 or ($a->{name} cmp $b->{name})
2781 } @$items;
2782
2783 $self->{real_items} = \@items;
2784
2785 my $row = 0;
2786 for my $item (@items) {
2787 CFClient::Item::update_widgets $item;
2788
2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793 $row++;
2794 }
2795}
2796
2797sub size_request {
2798 my ($self) = @_;
2799 ($self->{req_w}, $self->{req_h});
2800}
2801 2878
2802############################################################################# 2879#############################################################################
2803 2880
2804package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2805 2882
2846 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2847 $GRAB = $self; 2924 $GRAB = $self;
2848 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2849 2926
2850 $self->show; 2927 $self->show;
2851 $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);
2852} 2929}
2853 2930
2854sub mouse_motion { 2931sub mouse_motion {
2855 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2856 2933
2857 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2858 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2860} 2939}
2861 2940
2862sub button_up { 2941sub button_up {
2863 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2864 2943
2866 undef $GRAB; 2945 undef $GRAB;
2867 $self->hide; 2946 $self->hide;
2868 2947
2869 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2870 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
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 );
2871 } 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});
2872} 3063}
2873 3064
2874############################################################################# 3065#############################################################################
2875 3066
2876package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
2981 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
2982} 3173}
2983 3174
2984############################################################################# 3175#############################################################################
2985 3176
2986package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
2987 3178
2988our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990use CFClient::OpenGL;
2991 3180
2992sub new { 3181sub new {
2993 my $class = shift; 3182 my $class = shift;
2994 3183
2995 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
2996 visible => 1, 3482 visible => 1,
2997 @_, 3483 @_,
2998 ) 3484 );
2999}
3000 3485
3001sub configure { 3486 Scalar::Util::weaken ($self->{root} = $self);
3002 my ($self, $x, $y, $w, $h) = @_;
3003 3487
3004 $self->{w} = $w; 3488 $self
3005 $self->{h} = $h;
3006}
3007
3008sub check_size {
3009 my ($self) = @_;
3010
3011 $self->size_allocate ($self->{w}, $self->{h})
3012 if $self->{w};
3013} 3489}
3014 3490
3015sub size_request { 3491sub size_request {
3016 my ($self) = @_; 3492 my ($self) = @_;
3017 3493
3018 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3019} 3509}
3020 3510
3021sub size_allocate { 3511sub size_allocate {
3022 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
3023 3513
3024 for my $child ($self->children) { 3514 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3516
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3029 3519
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3521 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3522
3036 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
3037 } 3524 }
3038} 3525}
3039 3526
3050} 3537}
3051 3538
3052sub update { 3539sub update {
3053 my ($self) = @_; 3540 my ($self) = @_;
3054 3541
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
3057} 3543}
3058 3544
3059sub add { 3545sub add {
3060 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
3061 3547
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
3068 for my $child (@children) {
3069 $child->{is_toplevel} = 1; 3548 $_->{is_toplevel} = 1
3070 3549 for @children;
3071 # integerise window positions
3072 $child->{x} = int $child->{x};
3073 $child->{y} = int $child->{y};
3074 }
3075 3550
3076 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3077} 3552}
3078 3553
3079sub remove { 3554sub remove {
3080 my ($self, @children) = @_; 3555 my ($self, @children) = @_;
3081 3556
3082 $self->SUPER::remove (@children); 3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3083 3561
3084 while (@children) { 3562 while (@children) {
3085 my $w = pop @children; 3563 my $w = pop @children;
3086 push @children, $w->children; 3564 push @children, $w->children;
3087 $w->set_invisible; 3565 $w->set_invisible;
3106 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
3107 $_->() 3585 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
3109 } 3587 }
3110 3588
3111 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
3112 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
3113 3593
3114 for (;;) { 3594 outer:
3115 if ($self->{check_size}) { 3595 while () {
3116 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
3118 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3119 } 3604 }
3120 3605
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
3122 3608
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
3124 ? @$widget{qw(user_w user_h)} 3610 and last;
3125 : $widget->size_request;
3126
3127 if (delete $widget->{force_alloc}
3128 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3131 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
3133 3629
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
3135 3631
3136 $widget->{parent}->check_size
3137 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3138 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3139 } 3642 }
3140 } 3643 }
3141 3644
3142 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3144 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145 3653
3146 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
3148 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3149 $widget->{w} = $w; 3664 $widget->{w} = $w;
3150 $widget->{h} = $h; 3665 $widget->{h} = $h;
3666
3151 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
3152 } 3669 }
3153 } 3670 }
3154 3671
3155 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3156 $_->() 3673 $_->()
3157 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3158 } 3675 }
3676
3159 3677
3160 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3163 3681
3165 glLoadIdentity; 3683 glLoadIdentity;
3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3168 glLoadIdentity; 3686 glLoadIdentity;
3169 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3170 $self->_draw; 3695 $self->_draw;
3171} 3696}
3172 3697
3173############################################################################# 3698#############################################################################
3174 3699

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines