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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
26 55
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 62 }
32 63
33 $layout 64 $layout
34} 65}
35 66
36sub set_layout { 67sub set_layout {
37 my ($layout) = @_; 68 my ($layout) = @_;
69
38 $LAYOUT = $layout; 70 $LAYOUT = $layout;
39}
40
41sub check_tooltip {
42 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
49 $TOOLTIP->{owner} = $widget;
50
51 my $tip = $widget->{tooltip};
52
53 $tip = $tip->($widget) if CODE:: eq ref $tip;
54
55 $TOOLTIP->set_tooltip_from ($widget);
56 $TOOLTIP->show;
57 }
58
59 return;
60 }
61 }
62 }
63
64 $TOOLTIP->hide;
65 delete $TOOLTIP->{owner};
66} 71}
67 72
68# class methods for events 73# class methods for events
69sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
70 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
84 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
85 90
86 $GRAB = $widget; 91 $GRAB = $widget;
87 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
88 93
89 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
90 } 95 }
91 96
92 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
93 98
94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
109 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
110 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
111 $grab->update if $grab; 116 $grab->update if $grab;
112 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
113 118
114 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
115 } 120 }
116} 121}
117 122
118sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
119 my ($ev) = @_; 124 my ($ev) = @_;
… …
125 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
126 131
127 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
128 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
129 134
130 check_tooltip; 135 $TOOLTIP_WATCHER->start;
131 } 136 }
132 137
133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER; 139 if $HOVER;
135} 140}
… …
167sub rescale_widgets { 172sub rescale_widgets {
168 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
169 174
170 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174 179
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181 186
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184 189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
… …
207 h => undef, 212 h => undef,
208 can_events => 1, 213 can_events => 1,
209 @_ 214 @_
210 }, $class; 215 }, $class;
211 216
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 218
224 for (keys %$self) { 219 for (keys %$self) {
225 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
227 } 222 }
228 } 223 }
229 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
230 $self 237 $self
231} 238}
232 239
233sub destroy { 240sub destroy {
234 my ($self) = @_; 241 my ($self) = @_;
… …
265 272
266 return unless $self->{visible}; 273 return unless $self->{visible};
267 274
268 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
269 276
277 delete $self->{visible};
270 delete $self->{root}; 278 delete $self->{root};
271 delete $self->{visible};
272 279
273 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
275 282
276 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
277 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
278 285
279 $self->focus_out; 286 $self->focus_out;
280 287
281 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
308} 315}
309 316
310sub move_abs { 317sub move_abs {
311 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
312 319
313 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
314 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
315 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
316 323
317 $self->update; 324 $self->update;
318} 325}
319 326
… …
350 $self->{x} = $x; 357 $self->{x} = $x;
351 $self->{y} = $y; 358 $self->{y} = $y;
352 $self->update; 359 $self->update;
353 } 360 }
354 361
355 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 363 return unless $self->{visible};
357 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
359 } 369 }
360} 370}
361 371
362sub size_allocate { 372sub size_allocate {
363 # nothing to be done 373 # nothing to be done
364} 374}
365 375
366sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
367} 382}
368 383
369sub set_max_size { 384sub set_max_size {
370 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
371 386
372 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
374} 391}
375 392
376sub set_tooltip { 393sub set_tooltip {
377 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
378 395
… …
383 400
384 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
385 402
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
389 } 406 }
390} 407}
391 408
392# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
393sub coord2local { 410sub coord2local {
… …
430 447
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 449 unless $FOCUS;
433} 450}
434 451
435sub mouse_motion { } 452sub mouse_motion { 0 }
436sub button_up { } 453sub button_up { 0 }
437sub key_down { } 454sub key_down { 0 }
438sub key_up { } 455sub key_up { 0 }
439 456
440sub button_down { 457sub button_down {
441 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
442 459
443 $self->focus_in; 460 $self->focus_in;
444}
445 461
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451 464
452sub find_widget { 465sub find_widget {
453 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
454 467
455 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
463 476
464sub set_parent { 477sub set_parent {
465 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
466 479
467 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
470} 482}
471 483
472sub connect { 484sub connect {
473 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
… …
494 506
495sub realloc { 507sub realloc {
496 my ($self) = @_; 508 my ($self) = @_;
497 509
498 if ($self->{visible}) { 510 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
500 512
501 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 514 $self->{root}->update;
503 } else { 515 } else {
504 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
505 } 518 }
506} 519}
507 520
508sub update { 521sub update {
509 my ($self) = @_; 522 my ($self) = @_;
… …
517 530
518 $self->realloc; 531 $self->realloc;
519 $self->update; 532 $self->update;
520} 533}
521 534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
522sub draw { 539sub draw {
523 my ($self) = @_; 540 my ($self) = @_;
524 541
525 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 553
527 glPushMatrix; 554 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 556
532 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 559 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 561 glBegin GL_QUADS;
539 glVertex $x , $y; 562 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
543 glEnd; 566 glEnd;
544 glDisable GL_BLEND; 567 glDisable GL_BLEND;
545 } 568 }
546 569
547 if ($ENV{CFPLUS_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 571 glPushMatrix;
549 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 575 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
556 glEnd; 579 glEnd;
557 glPopMatrix; 580 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
560} 586}
561 587
562sub _draw { 588sub _draw {
563 my ($self) = @_; 589 my ($self) = @_;
564 590
… …
567 593
568sub DESTROY { 594sub DESTROY {
569 my ($self) = @_; 595 my ($self) = @_;
570 596
571 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
572 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 601}
574 602
575############################################################################# 603#############################################################################
576 604
577package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
602 630
603 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
605 633
606 glEnable GL_BLEND; 634 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 636 glColor_premultiply @$color;
609 637
610 glBegin GL_QUADS; 638 glBegin GL_QUADS;
611 glVertex 0 , 0; 639 glVertex 0 , 0;
612 glVertex 0 , $h; 640 glVertex 0 , $h;
613 glVertex $w, $h; 641 glVertex $w, $h;
… …
644our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
645 673
646sub new { 674sub new {
647 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
648 676
649 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
650 678
651 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
652 children => [], 680 children => [],
653 can_events => 0, 681 can_events => 0,
654 %arg, 682 %arg,
655 ); 683 );
684
656 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
657 687
658 $self 688 $self
659} 689}
660 690
661sub add { 691sub add {
… …
709 $x -= $self->{x}; 739 $x -= $self->{x};
710 $y -= $self->{y}; 740 $y -= $self->{y};
711 741
712 my $res; 742 my $res;
713 743
714 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
716 and return $res; 746 and return $res;
717 } 747 }
718 748
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
740} 770}
741 771
742sub add { 772sub add {
743 my ($self, $child) = @_; 773 my ($self, $child) = @_;
744 774
745 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
748} 777}
749 778
750sub remove { 779sub remove {
751 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
761sub size_request { 790sub size_request {
762 $_[0]{children}[0]->size_request 791 $_[0]{children}[0]->size_request
763} 792}
764 793
765sub size_allocate { 794sub size_allocate {
766 my ($self, $w, $h, $changed) = @_; 795 my ($self, $w, $h) = @_;
767 796
768 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
769} 798}
770 799
771############################################################################# 800#############################################################################
801
802# back-buffered drawing area
772 803
773package CFClient::UI::Window; 804package CFClient::UI::Window;
774 805
775our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
776 807
… …
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 820 $self->SUPER::update;
790} 821}
791 822
792sub size_allocate { 823sub size_allocate {
793 my ($self, $w, $h, $changed) = @_; 824 my ($self, $w, $h) = @_;
794 825
795 $self->SUPER::size_allocate ($w, $h, $changed); 826 $self->SUPER::size_allocate ($w, $h);
796 $self->update 827 $self->update;
797 if $changed;
798} 828}
799 829
800sub _render { 830sub _render {
831 my ($self) = @_;
832
801 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
802} 834}
803 835
804sub render_child { 836sub render_child {
805 my ($self) = @_; 837 my ($self) = @_;
806 838
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
810 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
811 $self->_render; 850 $self->_render;
812 }; 851 };
813} 852}
814 853
815sub _draw { 854sub _draw {
816 my ($self) = @_; 855 my ($self) = @_;
817 856
818 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
819 858
820 my $tex = $self->{texture} 859 my $tex = $self->{texture}
821 or return; 860 or return;
822 861
823 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
826 865
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 867
829 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
830} 869}
… …
846} 885}
847 886
848sub size_request { 887sub size_request {
849 my ($self) = @_; 888 my ($self) = @_;
850 889
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 891
853 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
855 894
856 ($w, $h) 895 ($w, $h)
857} 896}
858 897
859sub size_allocate { 898sub size_allocate {
860 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
861 900
901 my $child = $self->child;
902
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 905
865 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
866 $self->update; 907 $self->update;
867} 908}
868 909
… …
904} 945}
905 946
906sub _render { 947sub _render {
907 my ($self) = @_; 948 my ($self) = @_;
908 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 954
911 $self->SUPER::_render; 955 $self->SUPER::_render;
912} 956}
913 957
… …
916package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
917 961
918our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
919 963
920sub new { 964sub new {
921 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
922 968
923 my $self; 969 my $self;
924 970
925 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
926 vertical => 1, 972 vertical => 1,
… …
931 ; 977 ;
932 978
933 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider, 981 slider => $slider,
936 @_, 982 %arg,
937 ); 983 );
938 984
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
942 987
943 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
944} 995}
945 996
946sub update { 997sub update {
947 my ($self) = @_; 998 my ($self) = @_;
948 999
… …
952 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1005}
955 1006
956sub size_allocate { 1007sub size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1008 my ($self, $w, $h) = @_;
958 1009
959 $self->SUPER::size_allocate ($w, $h, $changed); 1010 $self->SUPER::size_allocate ($w, $h);
960 1011
961 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1014}
964 1015
… …
987 1038
988 if ($self->{bg}) { 1039 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
990 1041
991 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
994 1045
995 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
996 glVertex 0 , 0; 1047 glVertex 0 , 0;
997 glVertex 0 , $h; 1048 glVertex 0 , $h;
998 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1020my @border = 1071my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1074
1024sub new { 1075sub new {
1025 my $class = shift; 1076 my ($class, %arg) = @_;
1026 1077
1027 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1081 border => 0.6,
1031 can_events => 1, 1082 can_events => 1,
1032 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1033 ); 1086 );
1034 1087
1035 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1036 align => 0, 1089 align => 0,
1037 valign => 1, 1090 valign => 1,
1038 text => $self->{title}, 1091 text => $self->{title},
1039 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1040 1094
1041 $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_widget}) if $self->{title_widget};
1042} 1103}
1043 1104
1044sub border { 1105sub border {
1045 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1046} 1107}
1047 1108
1048sub size_request { 1109sub size_request {
1049 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1050 1114
1051 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1052 1116
1053 ( 1117 (
1054 $w + $self->border * 2, 1118 $w + $self->border * 2,
1055 $h + $self->border * 2, 1119 $h + $self->border * 2,
1056 ) 1120 )
1057} 1121}
1058 1122
1059sub size_allocate { 1123sub size_allocate {
1060 my ($self, $w, $h, $changed) = @_; 1124 my ($self, $w, $h) = @_;
1061 1125
1062 return unless $changed; 1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1063 1131
1132 my $border = $self->border;
1133
1064 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1065 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1066 1136
1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068 if $self->{title};
1069
1070 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1071} 1138}
1072 1139
1073sub button_down { 1140sub button_down {
1074 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1075 1142
… …
1094 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1095 1162
1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099 $self->realloc; 1167 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101 }; 1168 };
1102 1169
1103 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1104 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1108 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1109 1176
1110 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1111 1178
1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1114 } 1187 1
1115} 1188}
1116 1189
1117sub button_up { 1190sub button_up {
1118 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1119 1192
1120 delete $self->{motion}; 1193 !!delete $self->{motion}
1121} 1194}
1122 1195
1123sub mouse_motion { 1196sub mouse_motion {
1124 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1125 1198
1126 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1127} 1202}
1128 1203
1129sub _draw { 1204sub _draw {
1130 my ($self) = @_; 1205 my ($self) = @_;
1131 1206
1207 my $child = $self->{children}[0];
1208
1132 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1134 1211
1135 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137 1214
1138 my $border = $self->border; 1215 my $border = $self->border;
… …
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1231 }
1155 1232
1156 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1157 1234
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1161} 1241}
1162 1242
1163############################################################################# 1243#############################################################################
1164 1244
1165package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1188 1268
1189 $child->set_parent ($self); 1269 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1191 1271
1192 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1193} 1279}
1194 1280
1195# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1282sub clear {
1197 my ($self) = @_; 1283 my ($self) = @_;
… …
1239 (sum @$hs), 1325 (sum @$hs),
1240 ) 1326 )
1241} 1327}
1242 1328
1243sub size_allocate { 1329sub size_allocate {
1244 my ($self, $w, $h, $changed) = @_; 1330 my ($self, $w, $h) = @_;
1245 1331
1246 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1247 1333
1248 my $req_w = (sum @$ws) || 1; 1334 my $req_w = (sum @$ws) || 1;
1249 my $req_h = (sum @$hs) || 1; 1335 my $req_h = (sum @$hs) || 1;
… …
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 ) 1414 )
1329} 1415}
1330 1416
1331sub size_allocate { 1417sub size_allocate {
1332 my ($self, $w, $h, $changed) = @_; 1418 my ($self, $w, $h) = @_;
1333 1419
1334 my $space = $self->{vertical} ? $h : $w; 1420 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children}; 1421 my $children = $self->{children};
1336 1422
1337 my @req; 1423 my @req;
… …
1420 ellipsise => 3, # end 1506 ellipsise => 3, # end
1421 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1422 fontsize => 1, 1508 fontsize => 1,
1423 align => -1, 1509 align => -1,
1424 valign => -1, 1510 valign => -1,
1425 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1426 can_events => 0, 1513 can_events => 0,
1427 %arg 1514 %arg
1428 ); 1515 );
1429 1516
1430 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1457 1544
1458 delete $self->{texture}; 1545 delete $self->{texture};
1459 $self->SUPER::update; 1546 $self->SUPER::update;
1460} 1547}
1461 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1462sub set_text { 1556sub set_text {
1463 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1464 1558
1465 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1466 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1467 1561
1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1470 1564
1565 delete $self->{size_req};
1471 $self->realloc; 1566 $self->realloc;
1472 $self->update; 1567 $self->update;
1473} 1568}
1474 1569
1475sub set_markup { 1570sub set_markup {
… …
1481 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482 1577
1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1485 1580
1581 delete $self->{size_req};
1486 $self->realloc; 1582 $self->realloc;
1487 $self->update; 1583 $self->update;
1488} 1584}
1489 1585
1490sub size_request { 1586sub size_request {
1491 my ($self) = @_; 1587 my ($self) = @_;
1492 1588
1589 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1595
1499 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1500 1597
1501 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1601
1505 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1506 1603
1507 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1509 } 1609 };
1510 1610
1511 ( 1611 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1612}
1516 1613
1517sub size_allocate { 1614sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1615 my ($self, $w, $h) = @_;
1616
1617 delete $self->{ox};
1519 1618
1520 delete $self->{texture} 1619 delete $self->{texture}
1521 if $changed; 1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1621}
1523 1622
1524sub set_fontsize { 1623sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1526 1625
1527 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1627 delete $self->{texture};
1529 1628
1530 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1531} 1638}
1532 1639
1533sub _draw { 1640sub _draw {
1534 my ($self) = @_; 1641 my ($self) = @_;
1535 1642
… …
1541 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1652
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1547 1655
1656 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1551 1660
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1664 };
1558 1665
1559 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1670
1562 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1678 }
1568 1679
1569 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1570} 1681}
1571 1682
… …
1588 can_hover => 1, 1699 can_hover => 1,
1589 can_focus => 1, 1700 can_focus => 1,
1590 valign => 0, 1701 valign => 0,
1591 can_events => 1, 1702 can_events => 1,
1592 #text => ... 1703 #text => ...
1704 #hidden => "*",
1593 @_ 1705 @_
1594 ) 1706 )
1595} 1707}
1596 1708
1597sub _set_text { 1709sub _set_text {
… …
1599 1711
1600 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1601 1713
1602 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1603 1715
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1717 $self->{text} = $text;
1608 1718
1609 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1611 1722
1612 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1613} 1727}
1614 1728
1615sub set_text { 1729sub set_text {
1616 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1617 1731
1618 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1733 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1734}
1623 1735
1624sub get_text { 1736sub get_text {
1625 $_[0]{text} 1737 $_[0]{text}
1626} 1738}
… …
1656 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1659 } elsif ($uni) { 1771 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1661 } 1775 }
1662 1776
1663 $self->_set_text ($text); 1777 $self->_set_text ($text);
1664 1778
1665 $self->realloc; 1779 $self->realloc;
1780
1781 1
1666} 1782}
1667 1783
1668sub focus_in { 1784sub focus_in {
1669 my ($self) = @_; 1785 my ($self) = @_;
1670 1786
… …
1685 utf8::encode $text; 1801 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1687 1803
1688 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1689 $self->update; 1805 $self->update;
1806
1807 1
1690} 1808}
1691 1809
1692sub mouse_motion { 1810sub mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1695} 1815}
1696 1816
1697sub _draw { 1817sub _draw {
1698 my ($self) = @_; 1818 my ($self) = @_;
1699 1819
1700 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1701 1821
1702 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1705 } else { 1825 } else {
1706 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1707 } 1827 }
1708 1828
1709 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1832 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1776 } else { 1896 } else {
1777 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1778 } 1898 }
1779 1899
1780 } else { 1900 } else {
1781 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1782 } 1904 1
1783
1784} 1905}
1785 1906
1786############################################################################# 1907#############################################################################
1787 1908
1788package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1797 1918
1798sub new { 1919sub new {
1799 my $class = shift; 1920 my $class = shift;
1800 1921
1801 $class->SUPER::new ( 1922 $class->SUPER::new (
1802 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1803 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1805 can_hover => 1, 1927 can_hover => 1,
1806 align => 0, 1928 align => 0,
1807 valign => 0, 1929 valign => 0,
… …
1816 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1817 1939
1818 $self->emit ("activate") 1940 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1821} 1945}
1822 1946
1823sub _draw { 1947sub _draw {
1824 my ($self) = @_; 1948 my ($self) = @_;
1825 1949
1826 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1951
1832 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1835 1955
… …
1854 1974
1855sub new { 1975sub new {
1856 my $class = shift; 1976 my $class = shift;
1857 1977
1858 $class->SUPER::new ( 1978 $class->SUPER::new (
1859 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1860 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1985 state => 0,
… …
1868} 1989}
1869 1990
1870sub size_request { 1991sub size_request {
1871 my ($self) = @_; 1992 my ($self) = @_;
1872 1993
1873 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1874} 1995}
1875 1996
1876sub button_down { 1997sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1878 1999
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1883 } 2008 1
1884} 2009}
1885 2010
1886sub _draw { 2011sub _draw {
1887 my ($self) = @_; 2012 my ($self) = @_;
1888 2013
1889 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1890 2015
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2017
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2021
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2023
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2025
… …
2053 2180
2054 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2056 2183
2057 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2189
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2184sub set_range { 2312sub set_range {
2185 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2186 2314
2187 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2188 2316
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2191} 2321}
2192 2322
2193sub set_value { 2323sub set_value {
2194 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2195 2325
… …
2224 2354
2225 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2226 2356
2227 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228 2358
2229 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2230} 2360}
2231 2361
2232sub mouse_motion { 2362sub mouse_motion {
2233 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2234 2364
… …
2238 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2239 2369
2240 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241 2371
2242 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2243 } 2377 1
2244} 2378}
2245 2379
2246sub update { 2380sub update {
2247 my ($self) = @_; 2381 my ($self) = @_;
2248 2382
2249 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2250 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2251 2392
2252 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2254 2395
… …
2260 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2261 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2262 2403
2263 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2264 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2265 }); 2406 }
2266
2267 $self->SUPER::update;
2268}
2269
2270sub _draw {
2271 my ($self) = @_;
2272 2407
2273 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2274 2409
2275 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2276 2411
… …
2337sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2338sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2339 2474
2340############################################################################# 2475#############################################################################
2341 2476
2342package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2343 2478
2344our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2345 2480
2346use CFClient::OpenGL; 2481use CFClient::OpenGL;
2347 2482
… …
2349 my $class = shift; 2484 my $class = shift;
2350 2485
2351 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2352 fontsize => 1, 2487 fontsize => 1,
2353 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2354 #font => default_font 2490 #font => default_font
2355 @_, 2491 @_,
2356 2492
2357 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2358 par => [], 2494 par => [],
… …
2374 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2375 $self->reflow; 2511 $self->reflow;
2376} 2512}
2377 2513
2378sub size_allocate { 2514sub size_allocate {
2379 my ($self, $w, $h, $changed) = @_; 2515 my ($self, $w, $h) = @_;
2380 2516
2381 $self->SUPER::size_allocate ($w, $h, $changed); 2517 $self->SUPER::size_allocate ($w, $h);
2382
2383 return unless $changed;
2384 2518
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2523
2389 $self->reflow; 2524 $self->reflow;
2390} 2525}
2391 2526
2392sub text_size { 2527sub text_size {
… …
2394 2529
2395 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2396 2531
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2400 2536
2401 $layout->size 2537 $layout->size
2402} 2538}
2403 2539
… …
2442 2578
2443 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2444 2580
2445 delete $self->{texture}; 2581 delete $self->{texture};
2446 2582
2447 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2585
2450 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2587 my $height = 0;
2452 2588
… …
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456 2592
2457 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2460 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h; 2600 $_->[1] = $h;
2464 } 2601 }
… …
2467 } 2604 }
2468 2605
2469 $self->{height} = $height; 2606 $self->{height} = $height;
2470 2607
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2472 2609
2473 delete $self->{texture}; 2610 delete $self->{texture};
2474 } 2611 }
2475 2612
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2479 2616
2480 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2481 2618
2482 my $y0 = $top; 2619 my $y0 = $top;
… …
2496 my $h = $par->[1]; 2633 my $h = $par->[1];
2497 2634
2498 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2502 2640
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2504 2642
2505 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2517sub _draw { 2655sub _draw {
2518 my ($self) = @_; 2656 my ($self) = @_;
2519 2657
2520 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2525 2663
2526 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2527 2665
2528} 2666}
… …
2611} 2749}
2612 2750
2613sub set_tooltip_from { 2751sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2615 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2616 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2769 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2771 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2630 2780
2631 ($w + 4, $h + 4) 2781 ($w + 4, $h + 4)
2632} 2782}
2633 2783
2634sub size_allocate { 2784sub size_allocate {
2635 my ($self, $w, $h, $changed) = @_; 2785 my ($self, $w, $h) = @_;
2636 2786
2637 return unless $changed;
2638
2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2640} 2788}
2641 2789
2642sub visibility_change { 2790sub visibility_change {
2643 my ($self, $visible) = @_; 2791 my ($self, $visible) = @_;
2644 2792
… …
2649 or return; 2797 or return;
2650 2798
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652 2800
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2655 2803
2656 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2657 }); 2805 });
2658} 2806}
2659 2807
… …
2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749 2897
2750 if ($tex) { 2898 if ($tex) {
2751 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2756 } 2904 }
2757} 2905}
2758 2906
2759sub DESTROY { 2907sub destroy {
2760 my ($self) = @_; 2908 my ($self) = @_;
2761 2909
2762 $self->{timer}->cancel 2910 $self->{timer}->cancel
2763 if $self->{timer}; 2911 if $self->{timer};
2764 2912
2765 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2766} 2914}
2767 2915
2768############################################################################# 2916#############################################################################
2769 2917
2770package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2771 2919
2772our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2773 2921
2774sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2775 my $class = shift;
2776
2777 my $self = $class->SUPER::new (
2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779 @_,
2780 );
2781
2782 $self
2783}
2784
2785sub set_items {
2786 my ($self, $items) = @_;
2787
2788 $self->{scrolled}->clear;
2789 return unless $items;
2790
2791 my @items = sort {
2792 ($a->{type} <=> $b->{type})
2793 or ($a->{name} cmp $b->{name})
2794 } @$items;
2795
2796 $self->{real_items} = \@items;
2797
2798 my $row = 0;
2799 for my $item (@items) {
2800 CFClient::Item::update_widgets $item;
2801
2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806 $row++;
2807 }
2808}
2809 2923
2810############################################################################# 2924#############################################################################
2811 2925
2812package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2813 2927
… …
2825 ); 2939 );
2826 2940
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2828 2942
2829 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2831 2945
2832 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2833 if (!ref $widget) { 2947 if (!ref $widget) {
2834 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2835 can_hover => 1, 2949 can_hover => 1,
2836 can_events => 1, 2950 can_events => 1,
2837 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2838 } 2953 }
2839 2954
2840 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2841 2956
2842 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2854 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2970 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2857 2972
2858 $self->show; 2973 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860} 2975}
2861 2976
2862sub mouse_motion { 2977sub mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2864 2979
2865 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2868} 2985}
2869 2986
2870sub button_up { 2987sub button_up {
2871 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2872 2989
… …
2874 undef $GRAB; 2991 undef $GRAB;
2875 $self->hide; 2992 $self->hide;
2876 2993
2877 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2879 } 3000 1
2880} 3001}
2881 3002
2882############################################################################# 3003#############################################################################
2883 3004
2884package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2885 3006
2886our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2887 3008
2888sub new { 3009sub new {
2889 my $class = shift; 3010 my $class = shift;
2890 3011
2891 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2892 fontsize => 0.8, 3177 fontsize => 0.8,
2893 @_, 3178 @_,
2894 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2895} 3186}
2896 3187
2897sub reorder { 3188sub reorder {
2898 my ($self) = @_; 3189 my ($self) = @_;
2899 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2900 3196
2901 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 } 3199 }
2904 3200
… …
2907 my @items = sort { 3203 my @items = sort {
2908 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2911 3207
3208 $self->{timer}->interval (1);
3209
2912 my $count = 10 + 1; 3210 my $count = 10 + 1;
2913 for my $item (@items) { 3211 for my $item (@items) {
2914 last unless --$count; 3212 last unless --$count;
2915 3213
2916 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text}; 3218 : $item->{text};
2921 3219
… …
2929 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2935 can_events => 1, 3233 can_events => 1,
2936 can_hover => 1 3234 can_hover => 1
2937 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2938 } 3248 }
2939 3249
2940 $self->clear; 3250 $self->clear;
2941 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2942} 3252}
… …
2947 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2949 3259
2950 return unless $text; 3260 return unless $text;
2951 3261
2952 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953 3263
2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955 3265
2956 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2957 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2958 $item->{count}++; 3268 $item->{count}++;
2959 } else { 3269 } else {
2960 $item->{count} = 1; 3270 $item->{count} = 1;
2961 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2962 } 3272 }
2963 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2964 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2965 delete $item->{label}; 3275 delete $item->{label};
2966 } else { 3276 } else {
2967 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2968 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2987 3297
2988 $self->reorder; 3298 $self->reorder;
2989 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2990} 3300}
2991 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2992############################################################################# 3310#############################################################################
2993 3311
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
2994package CFClient::UI::Root; 3673package CFClient::UI::Root;
2995 3674
2996our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
2997 3678
2998use CFClient::OpenGL; 3679use CFClient::OpenGL;
2999 3680
3000sub new { 3681sub new {
3001 my $class = shift; 3682 my $class = shift;
… …
3008 Scalar::Util::weaken ($self->{root} = $self); 3689 Scalar::Util::weaken ($self->{root} = $self);
3009 3690
3010 $self 3691 $self
3011} 3692}
3012 3693
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
3020sub reconfigure {
3021 my ($self) = @_;
3022
3023 $self->SUPER::reconfigure;
3024
3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3026 if $self->{w};
3027}
3028
3029sub size_request { 3694sub size_request {
3030 my ($self) = @_; 3695 my ($self) = @_;
3031 3696
3032 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3033} 3698}
… …
3045 3710
3046 int $coord + 0.5 3711 int $coord + 0.5
3047} 3712}
3048 3713
3049sub size_allocate { 3714sub size_allocate {
3050 my ($self, $w, $h, $changed) = @_; 3715 my ($self, $w, $h) = @_;
3051 3716
3052 for my $child ($self->children) { 3717 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3719
3055 $X = $child->{force_x} if exists $child->{force_x}; 3720 $X = $child->{force_x} if exists $child->{force_x};
… …
3123 $_->() 3788 $_->()
3124 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3125 } 3790 }
3126 3791
3127 if ($self->{realloc}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3128 my @queue; 3794 my @queue;
3795 my $widget;
3129 3796
3797 outer:
3130 while () { 3798 while () {
3131 if ($self->{realloc}) { 3799 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3133 3802
3134 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3135 @queue, values %{delete $self->{realloc}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3136 } 3807 }
3137 3808
3809 while () {
3810 @queue or last outer;
3811
3138 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3813 and last;
3814
3815 pop @queue;
3816 }
3139 3817
3140 $widget->{visible} or last; # do not resize invisible widgets 3818 delete $queue{$widget+0};
3141 3819
3142 my ($w, $h) = $widget->size_request; 3820 my ($w, $h) = $widget->size_request;
3143 3821
3144 my $min_size = $widget->{is_toplevel} ? 16 : 0; 3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145 3824
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w; 3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h; 3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 3827
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3828 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3829 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3152 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3153 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3154 3835
3155 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3156 3837
3157 push @queue, $widget->{parent} 3838 if (my $parent = $widget->{parent}) {
3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3159 } 3848 }
3160 } 3849 }
3161 3850
3162 while (my $size_alloc = delete $self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3164 values %$size_alloc; 3853 values %$size_alloc;
3165 3854
3166 while () { 3855 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last }; 3856 my $widget = pop @queue || last;
3168 3857
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171 3859
3172 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3173 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3174 3862
3175 $w = int $w + 0.5; 3863 $w = int $w + 0.5;
3176 $h = int $h + 0.5; 3864 $h = int $h + 0.5;
3177 3865
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3179 3869
3180 $widget->{w} = $w; 3870 $widget->{w} = $w;
3181 $widget->{h} = $h; 3871 $widget->{h} = $h;
3182 3872
3183 $widget->emit (size_allocate => $w, $h, $changed); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3184 } 3875 }
3185 } 3876 }
3186 3877
3187 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3188 $_->() 3879 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3190 } 3881 }
3882
3191 3883
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3195 3887
… …
3197 glLoadIdentity; 3889 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3892 glLoadIdentity;
3201 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3202 $self->_draw; 3901 $self->_draw;
3203} 3902}
3204 3903
3205############################################################################# 3904#############################################################################
3206 3905

Diff Legend

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