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.260 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
77sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
78 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS; 81 if $FOCUS;
80} 82}
81 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
82sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
83 my ($ev) = @_; 98 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
85 100
86 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
87 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
88 103
89 $GRAB = $widget; 104 $GRAB = $widget;
90 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
91 106
92 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
93 } 108 }
94 109
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 111
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
98 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
99} 122}
100 123
101sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
102 my ($ev) = @_; 125 my ($ev) = @_;
103 my ($x, $y) = ($ev->{x}, $ev->{y});
104 126
105 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106 128
107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108 130
109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
110 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111 133
112 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 136 $grab->update if $grab;
115 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
116 138
117 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
118 } 141 }
119} 142}
120 143
121sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
122 my ($ev) = @_; 145 my ($ev) = @_;
123 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
124 147
125 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126 149
127 if ($widget != $HOVER) { 150 check_hover $widget;
128 my $hover = $HOVER; $HOVER = $widget;
129 151
130 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
131 $HOVER->update if $HOVER && $HOVER->{can_hover};
132
133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 153 if $HOVER;
138} 154}
139 155
140# convert position array to integers 156# convert position array to integers
141sub harmonize { 157sub harmonize {
… …
170sub rescale_widgets { 186sub rescale_widgets {
171 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
172 188
173 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 190 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 193
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 196 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 197 $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}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 200
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 203
188 } 204 }
189 } 205 }
190 206
191 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
192} 216}
193 217
194############################################################################# 218#############################################################################
195 219
196package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
270 294
271 return unless $self->{visible}; 295 return unless $self->{visible};
272 296
273 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
274 298
299 delete $self->{visible};
275 delete $self->{root}; 300 delete $self->{root};
276 delete $self->{visible};
277 301
278 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
280 304
281 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
283 307
284 $self->focus_out; 308 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
287} 310}
288 311
289sub set_visibility { 312sub set_visibility {
290 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
313} 336}
314 337
315sub move_abs { 338sub move_abs {
316 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
317 340
318 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
321 344
322 $self->update; 345 $self->update;
323} 346}
324 347
… …
332} 355}
333 356
334sub size_request { 357sub size_request {
335 require Carp; 358 require Carp;
336 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
337} 364}
338 365
339sub configure { 366sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
341 368
… …
365 392
366 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
367 } 394 }
368} 395}
369 396
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
375} 403}
376 404
377sub set_max_size { 405sub set_max_size {
378 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
379 407
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
382} 412}
383 413
384sub set_tooltip { 414sub set_tooltip {
385 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
386 416
… …
391 421
392 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
393 423
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 427 }
398} 428}
399 429
400# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
401sub coord2local { 431sub coord2local {
… …
409 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
410 440
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 442}
413 443
414sub focus_in { 444sub invoke_focus_in {
415 my ($self) = @_; 445 my ($self) = @_;
416 446
417 return if $FOCUS == $self; 447 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
419 449
420 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
421 451
422 $self->_emit (focus_in => $focus); 452 $self->update;
423 453
424 $focus->update if $focus; 454 0
425 $FOCUS->update;
426} 455}
427 456
428sub focus_out { 457sub invoke_focus_out {
429 my ($self) = @_; 458 my ($self) = @_;
430 459
431 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
432 461
433 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
434 463
435 $self->_emit (focus_out => $focus); 464 $self->update;
436 465
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 467 unless $FOCUS;
441}
442 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
443sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
444sub button_up { } 480sub invoke_button_up { 0 }
445sub key_down { } 481sub invoke_key_down { 0 }
446sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
447 484
448sub button_down { 485sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
450 487
451 $self->focus_in; 488 $self->grab_focus;
452}
453 489
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 490 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 491}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 492
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 493sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
513}
459 514
460sub find_widget { 515sub find_widget {
461 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
462 517
463 return () unless $self->{can_events}; 518 return () unless $self->{can_events};
… …
472sub set_parent { 527sub set_parent {
473 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
474 529
475 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 532}
501 533
502sub realloc { 534sub realloc {
503 my ($self) = @_; 535 my ($self) = @_;
504 536
… …
525 557
526 $self->realloc; 558 $self->realloc;
527 $self->update; 559 $self->update;
528} 560}
529 561
562# using global variables seems a bit hacky, but passing through all drawing
563# functions seems pointless.
564our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
565
530sub draw { 566sub draw {
531 my ($self) = @_; 567 my ($self) = @_;
532 568
533 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
570
571 # update screen rectangle
572 local $draw_x = $draw_x + $self->{x};
573 local $draw_y = $draw_y + $self->{y};
574
575 # skip widgets that are entirely outside the drawing area
576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 578
535 glPushMatrix; 579 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 581
540 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 584 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 586 glBegin GL_QUADS;
547 glVertex $x , $y; 587 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 588 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 589 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 590 glVertex 0 , $self->{h};
551 glEnd; 591 glEnd;
552 glDisable GL_BLEND; 592 glDisable GL_BLEND;
553 } 593 }
554 594
555 if ($ENV{CFPLUS_DEBUG} & 1) { 595 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 596 glPushMatrix;
557 glColor 1, 1, 0, 1; 597 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 598 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 599 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 600 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 601 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 602 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 603 glVertex 0 , $self->{h} - 1;
564 glEnd; 604 glEnd;
565 glPopMatrix; 605 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
568} 611}
569 612
570sub _draw { 613sub _draw {
571 my ($self) = @_; 614 my ($self) = @_;
572 615
… …
574} 617}
575 618
576sub DESTROY { 619sub DESTROY {
577 my ($self) = @_; 620 my ($self) = @_;
578 621
622 return if CFClient::in_destruct;
623
579 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
580 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 628}
582 629
583############################################################################# 630#############################################################################
584 631
585package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
610 657
611 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
613 660
614 glEnable GL_BLEND; 661 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 663 glColor_premultiply @$color;
617 664
618 glBegin GL_QUADS; 665 glBegin GL_QUADS;
619 glVertex 0 , 0; 666 glVertex 0 , 0;
620 glVertex 0 , $h; 667 glVertex 0 , $h;
621 glVertex $w, $h; 668 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
653 700
654sub new { 701sub new {
655 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
656 703
657 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
658 705
659 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
660 children => [], 707 children => [],
661 can_events => 0, 708 can_events => 0,
662 %arg, 709 %arg,
663 ); 710 );
711
664 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
665 714
666 $self 715 $self
667} 716}
668 717
669sub add { 718sub add {
… …
717 $x -= $self->{x}; 766 $x -= $self->{x};
718 $y -= $self->{y}; 767 $y -= $self->{y};
719 768
720 my $res; 769 my $res;
721 770
722 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
724 and return $res; 773 and return $res;
725 } 774 }
726 775
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 797}
749 798
750sub add { 799sub add {
751 my ($self, $child) = @_; 800 my ($self, $child) = @_;
752 801
753 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
756} 804}
757 805
758sub remove { 806sub remove {
759 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
768 816
769sub size_request { 817sub size_request {
770 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
771} 819}
772 820
773sub size_allocate { 821sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
775 823
776 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
777} 827}
778 828
779############################################################################# 829#############################################################################
830
831# back-buffered drawing area
780 832
781package CFClient::UI::Window; 833package CFClient::UI::Window;
782 834
783our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
784 836
… …
795 847
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 849 $self->SUPER::update;
798} 850}
799 851
800sub size_allocate { 852sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
802 854
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
805} 858}
806 859
807sub _render { 860sub _render {
861 my ($self) = @_;
862
808 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
809} 864}
810 865
811sub render_child { 866sub render_child {
812 my ($self) = @_; 867 my ($self) = @_;
813 868
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
817 872
873 {
874 package CFClient::UI::Base;
875
876 ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h});
878 }
879
818 $self->_render; 880 $self->_render;
819 }; 881 };
820} 882}
821 883
822sub _draw { 884sub _draw {
823 my ($self) = @_; 885 my ($self) = @_;
824 886
825 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
826 888
827 my $tex = $self->{texture} 889 my $tex = $self->{texture}
828 or return; 890 or return;
829 891
830 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
833 895
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 897
836 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
837} 899}
… …
861 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
862 924
863 ($w, $h) 925 ($w, $h)
864} 926}
865 927
866sub size_allocate { 928sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
868 930
869 my $child = $self->child; 931 my $child = $self->child;
870 932
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 935
874 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
875 $self->update; 937 $self->update;
938
939 1
876} 940}
877 941
878sub set_offset { 942sub set_offset {
879 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
880 944
… …
913} 977}
914 978
915sub _render { 979sub _render {
916 my ($self) = @_; 980 my ($self) = @_;
917 981
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
984
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 986
920 $self->SUPER::_render; 987 $self->SUPER::_render;
921} 988}
922 989
… …
925package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
926 993
927our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
928 995
929sub new { 996sub new {
930 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
931 1000
932 my $self; 1001 my $self;
933 1002
934 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
935 vertical => 1, 1004 vertical => 1,
… …
938 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
939 }, 1008 },
940 ; 1009 ;
941 1010
942 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
944 slider => $slider, 1014 slider => $slider,
945 @_, 1015 %arg,
946 ); 1016 );
947 1017
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
951 1020
952 $self 1021 $self
953} 1022}
954 1023
1024#TODO# update range on size_allocate depending on child
1025
1026sub add {
1027 my ($self, $widget) = @_;
1028
1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
955sub update { 1048sub update {
956 my ($self) = @_; 1049 my ($self) = @_;
957 1050
958 $self->SUPER::update; 1051 $self->SUPER::update;
959 1052
960 # todo: overwrite size_allocate of child 1053 $self->update_slider;
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1054}
964 1055
965sub size_allocate { 1056sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
967 1058
1059 $self->update_slider;
1060
968 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1062}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1063
977############################################################################# 1064#############################################################################
978 1065
979package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
980 1067
… …
996 1083
997 if ($self->{bg}) { 1084 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
999 1086
1000 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
1003 1090
1004 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1092 glVertex 0 , 0;
1006 glVertex 0 , $h; 1093 glVertex 0 , $h;
1007 glVertex $w, $h; 1094 glVertex $w, $h;
… …
1029my @border = 1116my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1119
1033sub new { 1120sub new {
1034 my $class = shift; 1121 my ($class, %arg) = @_;
1035 1122
1036 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1126 border => 0.6,
1040 can_events => 1, 1127 can_events => 1,
1041 min_w => 16, 1128 min_w => 64,
1042 min_h => 16, 1129 min_h => 32,
1043 @_ 1130 %arg,
1044 ); 1131 );
1045 1132
1046 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1134 align => 0,
1048 valign => 1, 1135 valign => 1,
1049 text => $self->{title}, 1136 text => $self->{title},
1050 fontsize => $self->{border}; 1137 fontsize => $self->{border},
1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1051 1148
1052 $self 1149 $self
1150}
1151
1152sub add {
1153 my ($self, @widgets) = @_;
1154
1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1158}
1054 1159
1055sub border { 1160sub border {
1056 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1057} 1162}
1058 1163
1059sub size_request { 1164sub size_request {
1060 my ($self) = @_; 1165 my ($self) = @_;
1166
1167 $self->{title_widget}->size_request
1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1061 1172
1062 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1063 1174
1064 ( 1175 (
1065 $w + $self->border * 2, 1176 $w + $self->border * 2,
1066 $h + $self->border * 2, 1177 $h + $self->border * 2,
1067 ) 1178 )
1068} 1179}
1069 1180
1070sub size_allocate { 1181sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1072 1183
1184 if ($self->{title_widget}) {
1185 $self->{title_widget}{w} = $w;
1186 $self->{title_widget}{h} = $h;
1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1188 }
1189
1190 my $border = $self->border;
1191
1073 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1075 1194
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1208 1
1209}
1210
1082sub button_down { 1211sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1084 1213
1085 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1215 my $border = $self->border;
1087 1216
… …
1103 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1104 1233
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1236
1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1238 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1239 };
1111 1240
1112 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1118 1247
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1249
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
1123 } 1258 1
1124} 1259}
1125 1260
1126sub button_up { 1261sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1128 1263
1129 delete $self->{motion}; 1264 ! ! delete $self->{motion}
1130} 1265}
1131 1266
1132sub mouse_motion { 1267sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1134 1269
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
1136} 1273}
1137 1274
1138sub _draw { 1275sub _draw {
1139 my ($self) = @_; 1276 my ($self) = @_;
1140 1277
1278 my $child = $self->{children}[0];
1279
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1282
1144 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1285
1147 my $border = $self->border; 1286 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1302 }
1164 1303
1165 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1166 1305
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1306 $child->draw;
1307
1308 if ($self->{title_widget}) {
1309 glTranslate 0, $border - $self->{h};
1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1170} 1317}
1171 1318
1172############################################################################# 1319#############################################################################
1173 1320
1174package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1197 1344
1198 $child->set_parent ($self); 1345 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1200 1347
1201 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1202} 1355}
1203 1356
1204# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1358sub clear {
1206 my ($self) = @_; 1359 my ($self) = @_;
… …
1247 (sum @$ws), 1400 (sum @$ws),
1248 (sum @$hs), 1401 (sum @$hs),
1249 ) 1402 )
1250} 1403}
1251 1404
1252sub size_allocate { 1405sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1254 1407
1255 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1256 1409
1257 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1289 } 1442 }
1290 1443
1291 $y += $row_h; 1444 $y += $row_h;
1292 } 1445 }
1293 1446
1447 1
1294} 1448}
1295 1449
1296sub find_widget { 1450sub find_widget {
1297 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1298 1452
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1491 )
1338} 1492}
1339 1493
1340sub size_allocate { 1494sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1342 1496
1343 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1345 1499
1346 my @req; 1500 my @req;
1347 1501
1348 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1350 } else { 1504 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1353 1507
1354 if ($req > $space) { 1508 if ($req > $space) {
1355 # ah well, not enough space 1509 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1357 } else { 1511 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1513
1360 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1361 1515
1362 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1517 for 0 .. $#children;
1364 } 1518 }
1365 } 1519 }
1366 1520
1367 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1368 1522
1369 my $pos = 0; 1523 my $pos = 0;
1370 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1527
1374 $pos += $alloc; 1528 $pos += $alloc;
1375 } 1529 }
1376 1530
1377 1 1531 1
… …
1467 1621
1468 delete $self->{texture}; 1622 delete $self->{texture};
1469 $self->SUPER::update; 1623 $self->SUPER::update;
1470} 1624}
1471 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1472sub set_text { 1633sub set_text {
1473 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1474 1635
1475 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1477 1638
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1480 1640
1641 delete $self->{size_req};
1481 $self->realloc; 1642 $self->realloc;
1482 $self->update; 1643 $self->update;
1483} 1644}
1484 1645
1485sub set_markup { 1646sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1490 1651
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1653
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1495 1655
1656 delete $self->{size_req};
1496 $self->realloc; 1657 $self->realloc;
1497 $self->update; 1658 $self->update;
1498} 1659}
1499 1660
1500sub size_request { 1661sub size_request {
1501 my ($self) = @_; 1662 my ($self) = @_;
1502 1663
1664 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1670
1509 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1510 1672
1511 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1677
1515 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1516 1679
1517 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1519 } 1685 };
1520 1686
1521 ($w, $h) 1687 @{ $self->{size_req} }
1522} 1688}
1523 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1524sub size_allocate { 1694sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1526 1696
1697 delete $self->{ox};
1698
1527 delete $self->{texture}; 1699 delete $self->{texture}
1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1528} 1703}
1529 1704
1530sub set_fontsize { 1705sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1532 1707
1533 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1534 delete $self->{texture}; 1710 delete $self->{texture};
1535 1711
1536 $self->realloc; 1712 $self->realloc;
1537} 1713}
1538 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1539sub _draw { 1724sub _draw {
1540 my ($self) = @_; 1725 my ($self) = @_;
1541 1726
1542 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1543 1728
1544 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1736
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$self->{layout}->size]
1738 };
1553 1739
1740 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1557 1744
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1748 };
1564 1749
1565 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1752
1568 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1569 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574
1575 glDisable GL_TEXTURE_2D;
1576} 1754}
1577 1755
1578############################################################################# 1756#############################################################################
1579 1757
1580package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1594 can_hover => 1, 1772 can_hover => 1,
1595 can_focus => 1, 1773 can_focus => 1,
1596 valign => 0, 1774 valign => 0,
1597 can_events => 1, 1775 can_events => 1,
1598 #text => ... 1776 #text => ...
1777 #hidden => "*",
1599 @_ 1778 @_
1600 ) 1779 )
1601} 1780}
1602 1781
1603sub _set_text { 1782sub _set_text {
… …
1605 1784
1606 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1607 1786
1608 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1609 1788
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1790 $self->{text} = $text;
1614 1791
1615 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1617 1795
1618 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1619} 1800}
1620 1801
1621sub set_text { 1802sub set_text {
1622 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1623 1804
1624 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1806 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1807}
1629 1808
1630sub get_text { 1809sub get_text {
1631 $_[0]{text} 1810 $_[0]{text}
1632} 1811}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1638 1817
1639 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1640} 1819}
1641 1820
1642sub key_down { 1821sub invoke_key_down {
1643 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1644 1823
1645 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1843 $self->emit ('escape');
1665 } elsif ($uni) { 1844 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1667 } 1848 }
1668 1849
1669 $self->_set_text ($text); 1850 $self->_set_text ($text);
1670 1851
1671 $self->realloc; 1852 $self->realloc;
1672}
1673 1853
1854 1
1855}
1856
1674sub focus_in { 1857sub invoke_focus_in {
1675 my ($self) = @_; 1858 my ($self) = @_;
1676 1859
1677 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1678 1861
1679 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1680} 1863}
1681 1864
1682sub button_down { 1865sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1684 1867
1685 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1869
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1871
1689 # byte-index to char-index 1872 # byte-index to char-index
1690 my $text = $self->{text}; 1873 my $text = $self->{text};
1691 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1693 1876
1694 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1695 $self->update; 1878 $self->update;
1879
1880 1
1696} 1881}
1697 1882
1698sub mouse_motion { 1883sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1886
1887 1
1701} 1888}
1702 1889
1703sub _draw { 1890sub _draw {
1704 my ($self) = @_; 1891 my ($self) = @_;
1705 1892
1706 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1707 1894
1708 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1711 } else { 1898 } else {
1712 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1713 } 1900 }
1714 1901
1715 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1905 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1746 1933
1747our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1748 1935
1749use CFClient::OpenGL; 1936use CFClient::OpenGL;
1750 1937
1751sub key_down { 1938sub invoke_key_down {
1752 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1753 1940
1754 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1755 1942
1756 if ($sym == 13) { 1943 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1759 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1762 $self->update; 1950 $self->update;
1763 1951
1764 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1970 } else {
1783 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1784 } 1972 }
1785 1973
1786 } else { 1974 } else {
1787 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1788 } 1978 1
1789
1790} 1979}
1791 1980
1792############################################################################# 1981#############################################################################
1793 1982
1794package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1815 can_events => 1, 2004 can_events => 1,
1816 @_ 2005 @_
1817 ) 2006 )
1818} 2007}
1819 2008
1820sub activate { }
1821
1822sub button_up { 2009sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1824 2011
1825 $self->emit ("activate") 2012 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
2015
2016 1
1828} 2017}
1829 2018
1830sub _draw { 2019sub _draw {
1831 my ($self) = @_; 2020 my ($self) = @_;
1832 2021
1833 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2023
1839 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1842 2027
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 2029
1845 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1846 2031
1847 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1848} 2069}
1849 2070
1850############################################################################# 2071#############################################################################
1851 2072
1852package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2100 my ($self) = @_;
1880 2101
1881 (6) x 2 2102 (6) x 2
1882} 2103}
1883 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1884sub button_down { 2113sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1886 2115
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2118 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1891 } 2123 1
1892} 2124}
1893 2125
1894sub _draw { 2126sub _draw {
1895 my ($self) = @_; 2127 my ($self) = @_;
1896 2128
… …
1916package CFClient::UI::Image; 2148package CFClient::UI::Image;
1917 2149
1918our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1919 2151
1920use CFClient::OpenGL; 2152use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2153
1923our %loaded_images; 2154our %texture_cache;
1924 2155
1925sub new { 2156sub new {
1926 my $class = shift; 2157 my $class = shift;
1927 2158
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1929 2163
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
1931 2166
1932 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2169
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2171
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2173
1941 $self 2174 $self
1942} 2175}
1943 2176
1944sub size_request { 2177sub size_request {
1945 my ($self) = @_; 2178 my ($self) = @_;
1946 2179
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1948} 2181}
1949 2182
1950sub _draw { 2183sub _draw {
1951 my ($self) = @_; 2184 my ($self) = @_;
1952 2185
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2296
2064 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2302
2067 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2308
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2088 2325
2089 if ($t3) { 2326 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2333 glEnd;
2097 } 2334 }
2098 2335
2099 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2187 $self->update; 2424 $self->update;
2188 2425
2189 $self 2426 $self
2190} 2427}
2191 2428
2192sub changed { }
2193
2194sub set_range { 2429sub set_range {
2195 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2196 2431
2197 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2198 2433
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2201} 2438}
2202 2439
2203sub set_value { 2440sub set_value {
2204 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2205 2442
… …
2216 if $unit; 2453 if $unit;
2217 2454
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2456
2220 if ($value != $old_value) { 2457 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2222 $self->update; 2459 $self->update;
2223 } 2460 }
2224} 2461}
2225 2462
2226sub size_request { 2463sub size_request {
2227 my ($self) = @_; 2464 my ($self) = @_;
2228 2465
2229 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2230} 2467}
2231 2468
2232sub button_down { 2469sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2234 2471
2235 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2473
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2475
2239 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2477}
2241 2478
2242sub mouse_motion { 2479sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2244 2481
2245 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2484
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2486
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2488
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2489 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2490 } else {
2491 return 0;
2492 }
2493
2253 } 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2254} 2505}
2255 2506
2256sub update { 2507sub update {
2257 my ($self) = @_; 2508 my ($self) = @_;
2258 2509
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2510 delete $self->{knob_w};
2511 $self->SUPER::update;
2512}
2513
2514sub _draw {
2515 my ($self) = @_;
2516
2517 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2261 2519
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2264 2522
… …
2270 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2272 2530
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2275 }); 2533 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2534
2283 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2284 2536
2285 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2286 2538
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2349 2601
2350############################################################################# 2602#############################################################################
2351 2603
2352package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2353 2605
2354our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2355 2607
2356use CFClient::OpenGL; 2608use CFClient::OpenGL;
2357 2609
2358sub new { 2610sub new {
2359 my $class = shift; 2611 my $class = shift;
2360 2612
2361 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2362 fontsize => 1, 2614 fontsize => 1,
2363 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2364 #font => default_font 2617 #font => default_font
2365 @_, 2618 @_,
2366 2619
2367 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2368 par => [], 2621 par => [],
2369 height => 0, 2622 height => 0,
2370 children => [ 2623 children => [
2371 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2383 2636
2384 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2638 $self->reflow;
2386} 2639}
2387 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2388sub size_allocate { 2650sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2390 2652
2391 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2655
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2660
2397 $self->reflow; 2661 $self->reflow;
2398}
2399 2662
2400sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2402 2679
2403 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2404 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2408 2693 );
2694
2409 $layout->size 2695 $layout
2410} 2696}
2411 2697
2412sub reflow { 2698sub reflow {
2413 my ($self) = @_; 2699 my ($self) = @_;
2414 2700
… …
2423 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2424} 2710}
2425 2711
2426sub clear { 2712sub clear {
2427 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2428 2717
2429 $self->{par} = []; 2718 $self->{par} = [];
2430 $self->{height} = 0; 2719 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2721}
2433 2722
2434sub add_paragraph { 2723sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2436 2725
2437 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2727
2439 $self->{height} += $h; 2728 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2441 } 2735 };
2442 2736
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2444} 2749}
2445 2750
2446sub update { 2751sub update {
2447 my ($self) = @_; 2752 my ($self) = @_;
2448 2753
… …
2450 2755
2451 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2452 2757
2453 delete $self->{texture}; 2758 delete $self->{texture};
2454 2759
2455 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2762
2458 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2764 my $height = 0;
2460 2765
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2770
2471 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2472 } 2774 }
2473 2775
2474 $height += $_->[1]; 2776 $height += $para->{h};
2475 } 2777 }
2476 2778
2477 $self->{height} = $height; 2779 $self->{height} = $height;
2478 2780
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2782
2481 delete $self->{texture}; 2783 delete $self->{texture};
2482 } 2784 }
2483 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2487 2793
2488 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2489 2795
2490 my $y0 = $top; 2796 my $y0 = $top;
2491 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2492 2798
2493 my $y = 0; 2799 my $y = 0;
2494 2800
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2802 my $h = $para->{h};
2505 2803
2506 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 2805
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2512 2807
2513 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2515 } 2822 }
2516 2823
2517 $y += $h; 2824 $y += $h;
2518 } 2825 }
2519
2520 glDisable GL_BLEND;
2521 }; 2826 };
2522 }); 2827 });
2523} 2828}
2524 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2525sub _draw { 2839sub _draw {
2526 my ($self) = @_; 2840 my ($self) = @_;
2527 2841
2528 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2533 2847
2534 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2535
2536} 2849}
2537 2850
2538############################################################################# 2851#############################################################################
2539 2852
2540package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2631 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2632 2948
2633 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2950 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2963
2648 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2649} 2965}
2650 2966
2651sub size_allocate { 2967sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2653 2969
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2971}
2656 2972
2657sub visibility_change { 2973sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2659 2975
2660 return unless $visible; 2976 return unless $visible;
2661 2977
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2980 or return;
2665 2981
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2983
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2670 2986
2671 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2672 }); 2988 });
2673} 2989}
2674 2990
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3080
2765 if ($tex) { 3081 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2771 } 3087 }
2772} 3088}
2773 3089
2774sub DESTROY { 3090sub destroy {
2775 my ($self) = @_; 3091 my ($self) = @_;
2776 3092
2777 $self->{timer}->cancel 3093 $self->{timer}->cancel
2778 if $self->{timer}; 3094 if $self->{timer};
2779 3095
2780 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2781} 3097}
2782 3098
2783############################################################################# 3099#############################################################################
2784 3100
2785package CFClient::UI::Inventory; 3101package CFClient::UI::Buttonbar;
2786 3102
2787our @ISA = CFClient::UI::ScrolledWindow::; 3103our @ISA = CFClient::UI::HBox::;
2788 3104
2789sub new { 3105# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 3106
2825############################################################################# 3107#############################################################################
2826 3108
2827package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2828 3110
… …
2840 ); 3122 );
2841 3123
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3125
2844 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2846 3128
2847 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2848 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2849 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3146 can_hover => 1,
2851 can_events => 1, 3147 can_events => 1,
2852 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2853 } 3151 }
2854 3152
2855 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2856 3154
2857 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2862 3160
2863# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2864sub popup { 3162sub popup {
2865 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2866 3164
2867 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2868 3166
2869 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3168 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2872 3170
2873 $self->show; 3171 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3173}
2876 3174
2877sub mouse_motion { 3175sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2879 3177
2880 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3181
3182 0
3183}
3184
2885sub button_up { 3185sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2887 3187
2888 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3189 undef $GRAB;
2890 $self->hide; 3190 $self->hide;
2891 3191
2892 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2894 } 3198 1
2895} 3199}
2896 3200
2897############################################################################# 3201#############################################################################
2898 3202
2899package CFClient::UI::Statusbox; 3203package CFClient::UI::Multiplexer;
2900 3204
2901our @ISA = CFClient::UI::VBox::; 3205our @ISA = CFClient::UI::Container::;
2902 3206
2903sub new { 3207sub new {
2904 my $class = shift; 3208 my $class = shift;
2905 3209
2906 $class->SUPER::new ( 3210 my $self = $class->SUPER::new (
3211 @_,
3212 );
3213
3214 $self->{current} = $self->{children}[0]
3215 if @{ $self->{children} };
3216
3217 $self
3218}
3219
3220sub add {
3221 my ($self, @widgets) = @_;
3222
3223 $self->SUPER::add (@widgets);
3224
3225 $self->{current} = $self->{children}[0]
3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3235sub set_current_page {
3236 my ($self, $page_or_widget) = @_;
3237
3238 my $widget = ref $page_or_widget
3239 ? $page_or_widget
3240 : $self->{children}[$page_or_widget];
3241
3242 $self->{current} = $widget;
3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3244
3245 $self->emit (page_changed => $self->{current});
3246
3247 $self->realloc;
3248}
3249
3250sub visible_children {
3251 $_[0]{current}
3252}
3253
3254sub size_request {
3255 my ($self) = @_;
3256
3257 $self->{current}->size_request
3258}
3259
3260sub invoke_size_allocate {
3261 my ($self, $w, $h) = @_;
3262
3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3266}
3267
3268sub _draw {
3269 my ($self) = @_;
3270
3271 $self->{current}->draw;
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Notebook;
3277
3278our @ISA = CFClient::UI::VBox::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self
3287 @_,
3288 );
3289
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292
3293 $self
3294}
3295
3296sub add {
3297 my ($self, $title, $widget, $tooltip) = @_;
3298
3299 Scalar::Util::weaken $self;
3300
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3316sub set_current_page {
3317 my ($self, $page) = @_;
3318
3319 $self->{multiplexer}->set_current_page ($page);
3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3389 fontsize => 0.8,
2908 @_, 3390 @_,
2909 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
2910} 3398}
2911 3399
2912sub reorder { 3400sub reorder {
2913 my ($self) = @_; 3401 my ($self) = @_;
2914 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
2915 3408
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3411 }
2919 3412
… …
2922 my @items = sort { 3415 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2926 3419
3420 $self->{timer}->interval (1);
3421
2927 my $count = 10 + 1; 3422 my $count = 10 + 1;
2928 for my $item (@items) { 3423 for my $item (@items) {
2929 last unless --$count; 3424 last unless --$count;
2930 3425
2931 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3430 : $item->{text};
2936 3431
… …
2944 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3445 can_events => 1,
2951 can_hover => 1 3446 can_hover => 1
2952 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
2953 } 3460 }
2954 3461
2955 $self->clear; 3462 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2957} 3464}
… …
2962 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2964 3471
2965 return unless $text; 3472 return unless $text;
2966 3473
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3475
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3477
2971 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2973 $item->{count}++; 3480 $item->{count}++;
2974 } else { 3481 } else {
2975 $item->{count} = 1; 3482 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2977 } 3484 }
2978 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3487 delete $item->{label};
2981 } else { 3488 } else {
2982 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
2989 count => 1, 3496 count => 1,
2990 %arg, 3497 %arg,
2991 }; 3498 };
2992 } 3499 }
2993 3500
3501 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3502 $self->reorder;
3503 });
2995} 3504}
2996 3505
2997sub reconfigure { 3506sub reconfigure {
2998 my ($self) = @_; 3507 my ($self) = @_;
2999 3508
… …
3002 3511
3003 $self->reorder; 3512 $self->reorder;
3004 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3005} 3514}
3006 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3007############################################################################# 3524#############################################################################
3008 3525
3526package CFClient::UI::Inventory;
3527
3528our @ISA = CFClient::UI::Table::;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3009package CFClient::UI::Root; 3690package CFClient::UI::Root;
3010 3691
3011our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3012 3695
3013use CFClient::OpenGL; 3696use CFClient::OpenGL;
3014 3697
3015sub new { 3698sub new {
3016 my $class = shift; 3699 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3044 3727
3045 int $coord + 0.5 3728 int $coord + 0.5
3046} 3729}
3047 3730
3048sub size_allocate { 3731sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3050 3733
3051 for my $child ($self->children) { 3734 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3736
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3059 3742
3060 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3061 } 3744 }
3745
3746 1
3062} 3747}
3063 3748
3064sub coord2local { 3749sub coord2local {
3065 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3066 3751
… …
3122 $_->() 3807 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
3124 } 3809 }
3125 3810
3126 if ($self->{realloc}) { 3811 if ($self->{realloc}) {
3812 my %queue;
3127 my @queue; 3813 my @queue;
3814 my $widget;
3128 3815
3816 outer:
3129 while () { 3817 while () {
3130 if ($self->{realloc}) { 3818 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3819 for $widget (values %$realloc) {
3820 $widget->{visible} or next; # do not resize invisible widgets
3132 3821
3133 use sort 'stable'; 3822 $queue{$widget+0}++ and next; # duplicates are common
3134 3823
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3824 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3825 }
3137 } 3826 }
3138 3827
3828 while () {
3829 @queue or last outer;
3830
3139 my $widget = pop @queue || last; 3831 $widget = pop @{ $queue[-1] || [] }
3832 and last;
3833
3834 pop @queue;
3835 }
3140 3836
3141 $widget->{visible} or last; # do not resize invisible widgets 3837 delete $queue{$widget+0};
3142 3838
3143 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3144 3840
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3846
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3849
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3853 $widget->{req_h} = $h;
3155 3854
3156 $self->{size_alloc}{$widget+0} = $widget; 3855 $self->{size_alloc}{$widget+0} = $widget;
3157 3856
3158 if (my $parent = $widget->{parent}) { 3857 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3858 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3859 unless $queue{$parent+0};
3860
3161 $parent->{force_size_alloc} = 1; 3861 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3862 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3863 }
3164 } 3864 }
3165 3865
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 3878
3179 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3181 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3182 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3184 3890
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3892 $widget->{old_w} = $widget->{w};
3893 $widget->{old_h} = $widget->{h};
3894
3186 $widget->{w} = $w; 3895 $widget->{w} = $w;
3187 $widget->{h} = $h; 3896 $widget->{h} = $h;
3188 3897
3189 $widget->emit (size_allocate => $w, $h); 3898 $widget->emit (size_allocate => $w, $h);
3190 } 3899 }
… …
3205 glLoadIdentity; 3914 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3917 glLoadIdentity;
3209 3918
3919 {
3920 package CFClient::UI::Base;
3921
3922 ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h});
3924 }
3925
3210 $self->_draw; 3926 $self->_draw;
3211} 3927}
3212
3213#############################################################################
3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording",
3239 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped."
3242 ."To bind the action you have to click on the 'Bind' button",
3243 on_activate => sub {
3244 unless ($self->{recording}) {
3245 $self->start;
3246 } else {
3247 $self->stop;
3248 }
3249 });
3250
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3252
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button
3255 text => "ok",
3256 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub {
3258 $self->hide;
3259 $self->commit;
3260 });
3261
3262 $hb->add (new CFClient::UI::Button
3263 text => "cancel",
3264 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->{binding_cancel}->()
3268 if $self->{binding_cancel};
3269 });
3270
3271 $self->update_binding_widgets;
3272
3273 $self
3274}
3275
3276sub commit {
3277 my ($self) = @_;
3278 my ($mod, $sym, $cmds) = $self->get_binding;
3279 if ($sym != 0 && @$cmds > 0) {
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change};
3284 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!");
3286 $self->{binding_cancel}->()
3287 if $self->{binding_cancel};
3288 }
3289}
3290
3291sub start {
3292 my ($self) = @_;
3293
3294 $self->{rec_btn}->set_text ("stop recording");
3295 $self->{recording} = 1;
3296 $self->clear_command_list;
3297 $::CONN->start_record if $::CONN;
3298}
3299
3300sub stop {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("start recording");
3304 $self->{recording} = 0;
3305
3306 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec);
3310}
3311
3312sub ask_for_bind {
3313 my ($self, $commit) = @_;
3314
3315 CFClient::Binder::open_binding_dialog (sub {
3316 my ($mod, $sym) = @_;
3317 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3318 $self->update_binding_widgets;
3319 $self->commit if $commit;
3320 });
3321}
3322
3323sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325
3326 $self->clear_command_list;
3327 $self->{recording} = 0;
3328 $self->{rec_btn}->set_text ("start recording");
3329
3330 $self->{binding} = [$mod, $sym];
3331 $self->{commands} = $cmds;
3332
3333 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb;
3335
3336 $self->update_binding_widgets;
3337}
3338
3339sub update_binding_widgets {
3340 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding;
3342 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3343 $self->set_command_list ($cmds);
3344}
3345
3346sub get_binding {
3347 my ($self) = @_;
3348 return (
3349 $self->{binding}->[0],
3350 $self->{binding}->[1],
3351 [ grep { defined $_ } @{$self->{commands}} ]
3352 );
3353}
3354
3355sub clear_command_list {
3356 my ($self) = @_;
3357 $self->{cmdbox}->clear ();
3358}
3359
3360sub set_command_list {
3361 my ($self, $cmds) = @_;
3362
3363 $self->{cmdbox}->clear ();
3364 $self->{commands} = $cmds;
3365
3366 my $idx = 0;
3367
3368 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370
3371 my $i = $idx;
3372 $hb->add (new CFClient::UI::Button
3373 text => "delete",
3374 tooltip => "Deletes the action from the record",
3375 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef;
3378 });
3379
3380 $hb->add (new CFClient::UI::Label text => $_);
3381
3382 $idx++
3383 }
3384}
3385
3386 3928
3387############################################################################# 3929#############################################################################
3388 3930
3389package CFClient::UI; 3931package CFClient::UI;
3390 3932

Diff Legend

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