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.263 by elmex, Wed May 31 14:04:52 2006 UTC vs.
Revision 1.338 by root, Mon Jul 24 08:23:28 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
… …
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";
337} 360}
338 361
362sub baseline_shift {
363 0
364}
365
339sub configure { 366sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
341 368
342 if ($self->{aspect}) { 369 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
344 371
345 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
347 374
348 # use alignment to adjust x, y 375 # use alignment to adjust x, y
349 376
350 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
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 {
402 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
403 433
434 Carp::confess unless $self->{parent};#d#
435
404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
405} 437}
406 438
407# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
408sub coord2global { 440sub coord2global {
409 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
410 442
443 Carp::confess unless $self->{parent};#d#
444
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 446}
413 447
414sub focus_in { 448sub invoke_focus_in {
415 my ($self) = @_; 449 my ($self) = @_;
416 450
417 return if $FOCUS == $self; 451 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
419 453
420 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
421 455
422 $self->_emit (focus_in => $focus); 456 $self->update;
423 457
424 $focus->update if $focus; 458 0
425 $FOCUS->update;
426} 459}
427 460
428sub focus_out { 461sub invoke_focus_out {
429 my ($self) = @_; 462 my ($self) = @_;
430 463
431 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
432 465
433 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
434 467
435 $self->_emit (focus_out => $focus); 468 $self->update;
436 469
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 471 unless $FOCUS;
441}
442 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
443sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
444sub button_up { } 484sub invoke_button_up { 0 }
445sub key_down { } 485sub invoke_key_down { 0 }
446sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
447 488
448sub button_down { 489sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
450 491
451 $self->focus_in; 492 $self->grab_focus;
452}
453 493
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
531}
459 532
460sub find_widget { 533sub find_widget {
461 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
462 535
463 return () unless $self->{can_events}; 536 return () unless $self->{can_events};
… …
472sub set_parent { 545sub set_parent {
473 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
474 547
475 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 549 $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} 550}
501 551
502sub realloc { 552sub realloc {
503 my ($self) = @_; 553 my ($self) = @_;
504 554
… …
525 575
526 $self->realloc; 576 $self->realloc;
527 $self->update; 577 $self->update;
528} 578}
529 579
580# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583
530sub draw { 584sub draw {
531 my ($self) = @_; 585 my ($self) = @_;
532 586
533 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 596
535 glPushMatrix; 597 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 599
540 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 602 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 604 glBegin GL_QUADS;
547 glVertex $x , $y; 605 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
551 glEnd; 609 glEnd;
552 glDisable GL_BLEND; 610 glDisable GL_BLEND;
553 } 611 }
554 612
555 if ($ENV{CFPLUS_DEBUG} & 1) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 614 glPushMatrix;
557 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 618 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
564 glEnd; 622 glEnd;
565 glPopMatrix; 623 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
568} 629}
569 630
570sub _draw { 631sub _draw {
571 my ($self) = @_; 632 my ($self) = @_;
572 633
… …
574} 635}
575 636
576sub DESTROY { 637sub DESTROY {
577 my ($self) = @_; 638 my ($self) = @_;
578 639
640 return if CFClient::in_destruct;
641
579 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
580 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 646}
582 647
583############################################################################# 648#############################################################################
584 649
585package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
610 675
611 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
613 678
614 glEnable GL_BLEND; 679 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 681 glColor_premultiply @$color;
617 682
618 glBegin GL_QUADS; 683 glBegin GL_QUADS;
619 glVertex 0 , 0; 684 glVertex 0 , 0;
620 glVertex 0 , $h; 685 glVertex 0 , $h;
621 glVertex $w, $h; 686 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
653 718
654sub new { 719sub new {
655 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
656 721
657 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
658 723
659 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
660 children => [], 725 children => [],
661 can_events => 0, 726 can_events => 0,
662 %arg, 727 %arg,
663 ); 728 );
729
664 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
665 732
666 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
667} 742}
668 743
669sub add { 744sub add {
670 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
671 746
… …
717 $x -= $self->{x}; 792 $x -= $self->{x};
718 $y -= $self->{y}; 793 $y -= $self->{y};
719 794
720 my $res; 795 my $res;
721 796
722 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
724 and return $res; 799 and return $res;
725 } 800 }
726 801
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 823}
749 824
750sub add { 825sub add {
751 my ($self, $child) = @_; 826 my ($self, $child) = @_;
752 827
753 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
756} 830}
757 831
758sub remove { 832sub remove {
759 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
768 842
769sub size_request { 843sub size_request {
770 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
771} 845}
772 846
773sub size_allocate { 847sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
775 849
776 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
777} 853}
778 854
779############################################################################# 855#############################################################################
856
857# back-buffered drawing area
780 858
781package CFClient::UI::Window; 859package CFClient::UI::Window;
782 860
783our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
784 862
… …
795 873
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 875 $self->SUPER::update;
798} 876}
799 877
800sub size_allocate { 878sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
802 880
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
805} 884}
806 885
807sub _render { 886sub _render {
887 my ($self) = @_;
888
808 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
809} 890}
810 891
811sub render_child { 892sub render_child {
812 my ($self) = @_; 893 my ($self) = @_;
813 894
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
817 898
899 {
900 package CFClient::UI::Base;
901
902 ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h});
904 }
905
818 $self->_render; 906 $self->_render;
819 }; 907 };
820} 908}
821 909
822sub _draw { 910sub _draw {
823 my ($self) = @_; 911 my ($self) = @_;
824 912
825 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
826 914
827 my $tex = $self->{texture} 915 my $tex = $self->{texture}
828 or return; 916 or return;
829 917
830 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
833 921
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 923
836 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
837} 925}
… …
861 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
862 950
863 ($w, $h) 951 ($w, $h)
864} 952}
865 953
866sub size_allocate { 954sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
868 956
869 my $child = $self->child; 957 my $child = $self->child;
870 958
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 961
874 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
875 $self->update; 963 $self->update;
964
965 1
876} 966}
877 967
878sub set_offset { 968sub set_offset {
879 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
880 970
… …
913} 1003}
914 1004
915sub _render { 1005sub _render {
916 my ($self) = @_; 1006 my ($self) = @_;
917 1007
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
1010
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 1012
920 $self->SUPER::_render; 1013 $self->SUPER::_render;
921} 1014}
922 1015
… …
925package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
926 1019
927our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
928 1021
929sub new { 1022sub new {
930 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
931 1026
932 my $self; 1027 my $self;
933 1028
934 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
935 vertical => 1, 1030 vertical => 1,
… …
938 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
939 }, 1034 },
940 ; 1035 ;
941 1036
942 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
944 slider => $slider, 1040 slider => $slider,
945 @_, 1041 %arg,
946 ); 1042 );
947 1043
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
951 1046
952 $self 1047 $self
953} 1048}
954 1049
1050#TODO# update range on size_allocate depending on child
1051
1052sub add {
1053 my ($self, $widget) = @_;
1054
1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
955sub update { 1074sub update {
956 my ($self) = @_; 1075 my ($self) = @_;
957 1076
958 $self->SUPER::update; 1077 $self->SUPER::update;
959 1078
960 # todo: overwrite size_allocate of child 1079 $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} 1080}
964 1081
965sub size_allocate { 1082sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
967 1084
1085 $self->update_slider;
1086
968 $self->SUPER::size_allocate ($w, $h); 1087 $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} 1088}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1089
977############################################################################# 1090#############################################################################
978 1091
979package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
980 1093
… …
996 1109
997 if ($self->{bg}) { 1110 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
999 1112
1000 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1003 1116
1004 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1118 glVertex 0 , 0;
1006 glVertex 0 , $h; 1119 glVertex 0 , $h;
1007 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1029my @border = 1142my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 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); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1145
1033sub new { 1146sub new {
1034 my $class = shift; 1147 my ($class, %arg) = @_;
1035 1148
1036 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1152 border => 0.6,
1040 can_events => 1, 1153 can_events => 1,
1041 min_w => 16, 1154 min_w => 64,
1042 min_h => 16, 1155 min_h => 32,
1043 @_ 1156 %arg,
1044 ); 1157 );
1045 1158
1046 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1160 align => 0,
1048 valign => 1, 1161 valign => 1,
1049 text => $self->{title}, 1162 text => $self->{title},
1050 fontsize => $self->{border}; 1163 fontsize => $self->{border},
1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1051 1174
1052 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1184}
1054 1185
1055sub border { 1186sub border {
1056 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1057} 1188}
1058 1189
1059sub size_request { 1190sub size_request {
1060 my ($self) = @_; 1191 my ($self) = @_;
1192
1193 $self->{title_widget}->size_request
1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1061 1198
1062 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1063 1200
1064 ( 1201 (
1065 $w + $self->border * 2, 1202 $w + $self->border * 2,
1066 $h + $self->border * 2, 1203 $h + $self->border * 2,
1067 ) 1204 )
1068} 1205}
1069 1206
1070sub size_allocate { 1207sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1072 1209
1210 if ($self->{title_widget}) {
1211 $self->{title_widget}{w} = $w;
1212 $self->{title_widget}{h} = $h;
1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1214 }
1215
1216 my $border = $self->border;
1217
1073 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1075 1220
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); 1221 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1234 1
1235}
1236
1082sub button_down { 1237sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1084 1239
1085 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1241 my $border = $self->border;
1087 1242
… …
1103 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1104 1259
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1264 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1265 };
1111 1266
1112 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1118 1273
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1275
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1123 } 1284 1
1124} 1285}
1125 1286
1126sub button_up { 1287sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1128 1289
1129 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1130} 1291}
1131 1292
1132sub mouse_motion { 1293sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1134 1295
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1136} 1299}
1137 1300
1138sub _draw { 1301sub _draw {
1139 my ($self) = @_; 1302 my ($self) = @_;
1140 1303
1304 my $child = $self->{children}[0];
1305
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1308
1144 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1311
1147 my $border = $self->border; 1312 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1328 }
1164 1329
1165 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1166 1331
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1332 $child->draw;
1333
1334 if ($self->{title_widget}) {
1335 glTranslate 0, $border - $self->{h};
1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1170} 1343}
1171 1344
1172############################################################################# 1345#############################################################################
1173 1346
1174package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1191sub children { 1364sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193} 1366}
1194 1367
1195sub add { 1368sub add {
1196 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1197 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1198 $child->set_parent ($self); 1373 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1200 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1201 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1202} 1386}
1203 1387
1204# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1389sub clear {
1206 my ($self) = @_; 1390 my ($self) = @_;
… …
1247 (sum @$ws), 1431 (sum @$ws),
1248 (sum @$hs), 1432 (sum @$hs),
1249 ) 1433 )
1250} 1434}
1251 1435
1252sub size_allocate { 1436sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1254 1438
1255 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1256 1440
1257 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1289 } 1473 }
1290 1474
1291 $y += $row_h; 1475 $y += $row_h;
1292 } 1476 }
1293 1477
1478 1
1294} 1479}
1295 1480
1296sub find_widget { 1481sub find_widget {
1297 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1298 1483
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1522 )
1338} 1523}
1339 1524
1340sub size_allocate { 1525sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1342 1527
1343 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1345 1530
1346 my @req; 1531 my @req;
1347 1532
1348 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1350 } else { 1535 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1353 1538
1354 if ($req > $space) { 1539 if ($req > $space) {
1355 # ah well, not enough space 1540 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1357 } else { 1542 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1544
1360 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1361 1546
1362 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1548 for 0 .. $#children;
1364 } 1549 }
1365 } 1550 }
1366 1551
1367 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1368 1553
1369 my $pos = 0; 1554 my $pos = 0;
1370 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1558
1374 $pos += $alloc; 1559 $pos += $alloc;
1375 } 1560 }
1376 1561
1377 1 1562 1
… …
1450 } 1635 }
1451 1636
1452 $self 1637 $self
1453} 1638}
1454 1639
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1640sub update {
1466 my ($self) = @_; 1641 my ($self) = @_;
1467 1642
1468 delete $self->{texture}; 1643 delete $self->{texture};
1469 $self->SUPER::update; 1644 $self->SUPER::update;
1470} 1645}
1471 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1472sub set_text { 1654sub set_text {
1473 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1474 1656
1475 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1477 1659
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1480 1661
1662 delete $self->{size_req};
1481 $self->realloc; 1663 $self->realloc;
1482 $self->update; 1664 $self->update;
1483} 1665}
1484 1666
1485sub set_markup { 1667sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1490 1672
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1674
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1495 1676
1677 delete $self->{size_req};
1496 $self->realloc; 1678 $self->realloc;
1497 $self->update; 1679 $self->update;
1498} 1680}
1499 1681
1500sub size_request { 1682sub size_request {
1501 my ($self) = @_; 1683 my ($self) = @_;
1502 1684
1685 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1691
1509 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1510 1693
1511 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1698
1515 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1516 1700
1517 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1519 } 1706 };
1520 1707
1521 ($w, $h) 1708 @{ $self->{size_req} }
1522} 1709}
1523 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1524sub size_allocate { 1715sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1526 1717
1718 delete $self->{ox};
1719
1527 delete $self->{texture}; 1720 delete $self->{texture}
1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1528} 1724}
1529 1725
1530sub set_fontsize { 1726sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1532 1728
1533 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1534 delete $self->{texture}; 1731 delete $self->{texture};
1535 1732
1536 $self->realloc; 1733 $self->realloc;
1537} 1734}
1538 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1539sub _draw { 1745sub _draw {
1540 my ($self) = @_; 1746 my ($self) = @_;
1541 1747
1542 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1543 1749
1544 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1757
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$self->{layout}->size]
1759 };
1553 1760
1761 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1557 1765
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1769 };
1564 1770
1565 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1773
1568 if ($tex->{format} == GL_ALPHA) { 1774 $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} 1775}
1577 1776
1578############################################################################# 1777#############################################################################
1579 1778
1580package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1594 can_hover => 1, 1793 can_hover => 1,
1595 can_focus => 1, 1794 can_focus => 1,
1596 valign => 0, 1795 valign => 0,
1597 can_events => 1, 1796 can_events => 1,
1598 #text => ... 1797 #text => ...
1798 #hidden => "*",
1599 @_ 1799 @_
1600 ) 1800 )
1601} 1801}
1602 1802
1603sub _set_text { 1803sub _set_text {
… …
1605 1805
1606 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1607 1807
1608 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1609 1809
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1811 $self->{text} = $text;
1614 1812
1615 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1617 1816
1618 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1619} 1821}
1620 1822
1621sub set_text { 1823sub set_text {
1622 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1623 1825
1624 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1827 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1828}
1629 1829
1630sub get_text { 1830sub get_text {
1631 $_[0]{text} 1831 $_[0]{text}
1632} 1832}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1638 1838
1639 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1640} 1840}
1641 1841
1642sub key_down { 1842sub invoke_key_down {
1643 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1644 1844
1645 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1864 $self->emit ('escape');
1665 } elsif ($uni) { 1865 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1667 } 1869 }
1668 1870
1669 $self->_set_text ($text); 1871 $self->_set_text ($text);
1670 1872
1671 $self->realloc; 1873 $self->realloc;
1672}
1673 1874
1875 1
1876}
1877
1674sub focus_in { 1878sub invoke_focus_in {
1675 my ($self) = @_; 1879 my ($self) = @_;
1676 1880
1677 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1678 1882
1679 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1680} 1884}
1681 1885
1682sub button_down { 1886sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1684 1888
1685 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1890
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1892
1689 # byte-index to char-index 1893 # byte-index to char-index
1690 my $text = $self->{text}; 1894 my $text = $self->{text};
1691 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1693 1897
1694 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1695 $self->update; 1899 $self->update;
1900
1901 1
1696} 1902}
1697 1903
1698sub mouse_motion { 1904sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1907
1908 1
1701} 1909}
1702 1910
1703sub _draw { 1911sub _draw {
1704 my ($self) = @_; 1912 my ($self) = @_;
1705 1913
1706 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1707 1915
1708 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1711 } else { 1919 } else {
1712 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1713 } 1921 }
1714 1922
1715 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1926 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1746 1954
1747our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1748 1956
1749use CFClient::OpenGL; 1957use CFClient::OpenGL;
1750 1958
1751sub key_down { 1959sub invoke_key_down {
1752 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1753 1961
1754 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1755 1963
1756 if ($sym == 13) { 1964 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1759 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1762 $self->update; 1971 $self->update;
1763 1972
1764 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1991 } else {
1783 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1784 } 1993 }
1785 1994
1786 } else { 1995 } else {
1787 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1788 } 1999 1
1789
1790} 2000}
1791 2001
1792############################################################################# 2002#############################################################################
1793 2003
1794package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1815 can_events => 1, 2025 can_events => 1,
1816 @_ 2026 @_
1817 ) 2027 )
1818} 2028}
1819 2029
1820sub activate { }
1821
1822sub button_up { 2030sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1824 2032
1825 $self->emit ("activate") 2033 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1828} 2038}
1829 2039
1830sub _draw { 2040sub _draw {
1831 my ($self) = @_; 2041 my ($self) = @_;
1832 2042
1833 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2044
1839 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1842 2048
… …
1879 my ($self) = @_; 2085 my ($self) = @_;
1880 2086
1881 (6) x 2 2087 (6) x 2
1882} 2088}
1883 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1884sub button_down { 2098sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1886 2100
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2103 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2104 } else {
2105 return 0
2106 }
2107
1891 } 2108 1
1892} 2109}
1893 2110
1894sub _draw { 2111sub _draw {
1895 my ($self) = @_; 2112 my ($self) = @_;
1896 2113
… …
1916package CFClient::UI::Image; 2133package CFClient::UI::Image;
1917 2134
1918our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
1919 2136
1920use CFClient::OpenGL; 2137use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2138
1923our %loaded_images; 2139our %texture_cache;
1924 2140
1925sub new { 2141sub new {
1926 my $class = shift; 2142 my $class = shift;
1927 2143
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
1929 2148
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
1931 2151
1932 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2154
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2156
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2158
1941 $self 2159 $self
1942} 2160}
1943 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
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
… …
1962 } 2195 }
1963 2196
1964 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2199
1967 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
1968 2201
1969 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
1970} 2239}
1971 2240
1972############################################################################# 2241#############################################################################
1973 2242
1974package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2332
2064 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2338
2067 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2344
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
2088 2361
2089 if ($t3) { 2362 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2369 glEnd;
2097 } 2370 }
2098 2371
2099 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2187 $self->update; 2460 $self->update;
2188 2461
2189 $self 2462 $self
2190} 2463}
2191 2464
2192sub changed { }
2193
2194sub set_range { 2465sub set_range {
2195 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2196 2467
2197 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2198 2469
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2201} 2474}
2202 2475
2203sub set_value { 2476sub set_value {
2204 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2205 2478
… …
2216 if $unit; 2489 if $unit;
2217 2490
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2492
2220 if ($value != $old_value) { 2493 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2222 $self->update; 2495 $self->update;
2223 } 2496 }
2224} 2497}
2225 2498
2226sub size_request { 2499sub size_request {
2227 my ($self) = @_; 2500 my ($self) = @_;
2228 2501
2229 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2230} 2503}
2231 2504
2232sub button_down { 2505sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2234 2507
2235 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2509
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2511
2239 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2513}
2241 2514
2242sub mouse_motion { 2515sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2244 2517
2245 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2520
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2522
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2524
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2525 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2526 } else {
2527 return 0;
2528 }
2529
2253 } 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2254} 2541}
2255 2542
2256sub update { 2543sub update {
2257 my ($self) = @_; 2544 my ($self) = @_;
2258 2545
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2546 delete $self->{knob_w};
2547 $self->SUPER::update;
2548}
2549
2550sub _draw {
2551 my ($self) = @_;
2552
2553 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2261 2555
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2557 my $range = ($hi - $page - $lo) || 1e-100;
2264 2558
… …
2270 $value = ($value - $lo) / $range; 2564 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2565 $value = $value * $self->{scale} + $self->{offset};
2272 2566
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2568 $self->{knob_w} = $knob_w;
2275 }); 2569 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2570
2283 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2284 2572
2285 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2286 2574
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2349 2637
2350############################################################################# 2638#############################################################################
2351 2639
2352package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2353 2641
2354our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2355 2643
2356use CFClient::OpenGL; 2644use CFClient::OpenGL;
2357 2645
2358sub new { 2646sub new {
2359 my $class = shift; 2647 my $class = shift;
2360 2648
2361 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2362 fontsize => 1, 2650 fontsize => 1,
2363 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2364 #font => default_font 2653 #font => default_font
2365 @_, 2654 @_,
2366 2655
2367 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2368 par => [], 2657 par => [],
2369 height => 0, 2658 height => 0,
2370 children => [ 2659 children => [
2371 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2383 2672
2384 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2674 $self->reflow;
2386} 2675}
2387 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2388sub size_allocate { 2686sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2390 2688
2391 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2691
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2696
2397 $self->reflow; 2697 $self->reflow;
2398}
2399 2698
2400sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2402 2715
2403 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2404 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2408 2729 );
2730
2409 $layout->size 2731 $layout
2410} 2732}
2411 2733
2412sub reflow { 2734sub reflow {
2413 my ($self) = @_; 2735 my ($self) = @_;
2414 2736
… …
2423 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2424} 2746}
2425 2747
2426sub clear { 2748sub clear {
2427 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2428 2753
2429 $self->{par} = []; 2754 $self->{par} = [];
2430 $self->{height} = 0; 2755 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2757}
2433 2758
2434sub add_paragraph { 2759sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2760 my $self = shift;
2436 2761
2437 for my $line (split /\n/, $text) { 2762 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 2763 $para = {
2439 $self->{height} += $h; 2764 fg => [1, 1, 1, 1],
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 indent => 0,
2441 } 2766 markup => "",
2767 widget => [],
2768 ref $para ? %$para : (markup => $para),
2769 w => 1e10,
2770 wrapped => 1,
2771 };
2442 2772
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para;
2775 }
2776
2777 $self->{need_reflow}++;
2778 $self->update;
2779}
2780
2781sub scroll_to_bottom {
2782 my ($self) = @_;
2783
2784 $self->{scroll_to_bottom} = 1;
2785 $self->update;
2444} 2786}
2445 2787
2446sub update { 2788sub update {
2447 my ($self) = @_; 2789 my ($self) = @_;
2448 2790
… …
2450 2792
2451 return unless $self->{h} > 0; 2793 return unless $self->{h} > 0;
2452 2794
2453 delete $self->{texture}; 2795 delete $self->{texture};
2454 2796
2455 $ROOT->on_post_alloc ($self, sub { 2797 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2798 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2799
2458 if (delete $self->{need_reflow}) { 2800 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2801 my $height = 0;
2460 2802
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2803 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2804 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2805 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2806 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2807
2471 $_->[1] = $h; 2808 $para->{w} = $w + $para->{indent};
2809 $para->{h} = $h;
2810 $para->{wrapped} = $layout->has_wrapped;
2472 } 2811 }
2473 2812
2474 $height += $_->[1]; 2813 $height += $para->{h};
2475 } 2814 }
2476 2815
2477 $self->{height} = $height; 2816 $self->{height} = $height;
2478 2817
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2818 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2819
2481 delete $self->{texture}; 2820 delete $self->{texture};
2482 } 2821 }
2483 2822
2823 if (delete $self->{scroll_to_bottom}) {
2824 $self->{children}[1]->set_value (1e10);
2825 }
2826
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2827 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2828 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2829 glClear GL_COLOR_BUFFER_BIT;
2487 2830
2488 my $top = int $self->{children}[1]{range}[0]; 2831 my $top = int $self->{children}[1]{range}[0];
2489 2832
2490 my $y0 = $top; 2833 my $y0 = $top;
2491 my $y1 = $top + $H; 2834 my $y1 = $top + $H;
2492 2835
2493 my $y = 0; 2836 my $y = 0;
2494 2837
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}}) { 2838 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2839 my $h = $para->{h};
2505 2840
2506 if ($y0 < $y + $h && $y < $y1) { 2841 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 2842
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2843 my $layout = $self->get_layout ($para);
2512 2844
2513 glRasterPos $par->[3], $y - $y0; 2845 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2846
2847 if (my @w = @{ $para->{widget} }) {
2848 my @s = $layout->get_shapes;
2849
2850 for (@w) {
2851 my ($dx, $dy) = splice @s, 0, 2, ();
2852
2853 $_->{x} = $dx + $para->{indent};
2854 $_->{y} = $dy + $y - $y0;
2855
2856 $_->draw;
2857 }
2858 }
2515 } 2859 }
2516 2860
2517 $y += $h; 2861 $y += $h;
2518 } 2862 }
2519
2520 glDisable GL_BLEND;
2521 }; 2863 };
2522 }); 2864 });
2523} 2865}
2524 2866
2867sub reconfigure {
2868 my ($self) = @_;
2869
2870 $self->SUPER::reconfigure;
2871
2872 $_->{w} = 1e10 for @{ $self->{par} };
2873 $self->reflow;
2874}
2875
2525sub _draw { 2876sub _draw {
2526 my ($self) = @_; 2877 my ($self) = @_;
2527 2878
2528 glEnable GL_TEXTURE_2D; 2879 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2880 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2881 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2882 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2883 glDisable GL_TEXTURE_2D;
2533 2884
2534 $self->{children}[1]->draw; 2885 $self->{children}[1]->draw;
2535
2536} 2886}
2537 2887
2538############################################################################# 2888#############################################################################
2539 2889
2540package CFClient::UI::Animator; 2890package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2977 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2978 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2979 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2980 . "visible $widget->{visible}";
2631 } 2981 }
2982
2983 $tooltip =~ s/^\n+//;
2984 $tooltip =~ s/\n+$//;
2632 2985
2633 $self->add (new CFClient::UI::Label 2986 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2987 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2988 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2989 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2999 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 3000
2648 ($w + 4, $h + 4) 3001 ($w + 4, $h + 4)
2649} 3002}
2650 3003
2651sub size_allocate { 3004sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2653 3006
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 3007 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 3008}
2656 3009
2657sub visibility_change { 3010sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 3011 my ($self, $visible) = @_;
2659 3012
2660 return unless $visible; 3013 return unless $visible;
2661 3014
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 3015 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner} 3016 my $widget = $self->{owner}
2664 or return; 3017 or return;
2665 3018
3019 if ($widget->{visible}) {
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3020 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 3021
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3022 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 3023 if $x + $self->{w} > $self->{root}{w};
2670 3024
2671 $self->move_abs ($x, $y); 3025 $self->move_abs ($x, $y);
3026 } else {
3027 $self->hide;
3028 }
2672 }); 3029 });
2673} 3030}
2674 3031
2675sub _draw { 3032sub _draw {
2676 my ($self) = @_; 3033 my ($self) = @_;
… …
2702 3059
2703############################################################################# 3060#############################################################################
2704 3061
2705package CFClient::UI::Face; 3062package CFClient::UI::Face;
2706 3063
2707our @ISA = CFClient::UI::Base::; 3064our @ISA = CFClient::UI::DrawBG::;
2708 3065
2709use CFClient::OpenGL; 3066use CFClient::OpenGL;
2710 3067
2711sub new { 3068sub new {
2712 my $class = shift; 3069 my $class = shift;
… …
2749sub _draw { 3106sub _draw {
2750 my ($self) = @_; 3107 my ($self) = @_;
2751 3108
2752 return unless $::CONN; 3109 return unless $::CONN;
2753 3110
3111 $self->SUPER::_draw;
3112
2754 my $face; 3113 my $face;
2755 3114
2756 if ($self->{frame}) { 3115 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}]; 3116 my $anim = $::CONN->{anim}[$self->{anim}];
2758 3117
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3123
2765 if ($tex) { 3124 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3125 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3127 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2771 } 3130 }
2772} 3131}
2773 3132
2774sub DESTROY { 3133sub destroy {
2775 my ($self) = @_; 3134 my ($self) = @_;
2776 3135
2777 $self->{timer}->cancel 3136 $self->{timer}->cancel
2778 if $self->{timer}; 3137 if $self->{timer};
2779 3138
2780 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2781} 3140}
2782 3141
2783############################################################################# 3142#############################################################################
2784 3143
2785package CFClient::UI::Inventory; 3144package CFClient::UI::Buttonbar;
2786 3145
2787our @ISA = CFClient::UI::ScrolledWindow::; 3146our @ISA = CFClient::UI::HBox::;
2788 3147
2789sub new { 3148# 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 3149
2825############################################################################# 3150#############################################################################
2826 3151
2827package CFClient::UI::Menu; 3152package CFClient::UI::Menu;
2828 3153
… …
2840 ); 3165 );
2841 3166
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3168
2844 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2846 3171
2847 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2848 if (!ref $widget) { 3173 if (!ref $widget) {
3174 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2;
3176
3177 $widget = new CFClient::UI::HBox
3178 can_hover => 1,
3179 can_events => 1,
3180 tooltip => $tooltip,
3181 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1),
3184 ],
3185 ;
3186
3187 } else {
2849 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3189 can_hover => 1,
2851 can_events => 1, 3190 can_events => 1,
2852 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2853 } 3194 }
2854 3195
2855 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2856 3197
2857 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2862 3203
2863# popup given the event (must be a mouse button down event currently) 3204# popup given the event (must be a mouse button down event currently)
2864sub popup { 3205sub popup {
2865 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2866 3207
2867 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2868 3209
2869 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3211 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2872 3213
2873 $self->show; 3214 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3215 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3216}
2876 3217
2877sub mouse_motion { 3218sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2879 3220
2880 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3224
3225 0
3226}
3227
2885sub button_up { 3228sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2887 3230
2888 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3232 undef $GRAB;
2890 $self->hide; 3233 $self->hide;
2891 3234
2892 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
3237 } else {
3238 return 0
3239 }
3240
2894 } 3241 1
2895} 3242}
2896 3243
2897############################################################################# 3244#############################################################################
2898 3245
2899package CFClient::UI::Statusbox; 3246package CFClient::UI::Multiplexer;
2900 3247
2901our @ISA = CFClient::UI::VBox::; 3248our @ISA = CFClient::UI::Container::;
2902 3249
2903sub new { 3250sub new {
2904 my $class = shift; 3251 my $class = shift;
2905 3252
2906 $class->SUPER::new ( 3253 my $self = $class->SUPER::new (
3254 @_,
3255 );
3256
3257 $self->{current} = $self->{children}[0]
3258 if @{ $self->{children} };
3259
3260 $self
3261}
3262
3263sub add {
3264 my ($self, @widgets) = @_;
3265
3266 $self->SUPER::add (@widgets);
3267
3268 $self->{current} = $self->{children}[0]
3269 if @{ $self->{children} };
3270}
3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
3278sub set_current_page {
3279 my ($self, $page_or_widget) = @_;
3280
3281 my $widget = ref $page_or_widget
3282 ? $page_or_widget
3283 : $self->{children}[$page_or_widget];
3284
3285 $self->{current} = $widget;
3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3287
3288 $self->emit (page_changed => $self->{current});
3289
3290 $self->realloc;
3291}
3292
3293sub visible_children {
3294 $_[0]{current}
3295}
3296
3297sub size_request {
3298 my ($self) = @_;
3299
3300 $self->{current}->size_request
3301}
3302
3303sub invoke_size_allocate {
3304 my ($self, $w, $h) = @_;
3305
3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3309}
3310
3311sub _draw {
3312 my ($self) = @_;
3313
3314 $self->{current}->draw;
3315}
3316
3317#############################################################################
3318
3319package CFClient::UI::Notebook;
3320
3321our @ISA = CFClient::UI::VBox::;
3322
3323sub new {
3324 my $class = shift;
3325
3326 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self
3330 @_,
3331 );
3332
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3334 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3335
3336 $self
3337}
3338
3339sub add {
3340 my ($self, $title, $widget, $tooltip) = @_;
3341
3342 Scalar::Util::weaken $self;
3343
3344 $self->{buttonbar}->add (new CFClient::UI::Button
3345 markup => $title,
3346 tooltip => $tooltip,
3347 on_activate => sub { $self->set_current_page ($widget) },
3348 );
3349
3350 $self->{multiplexer}->add ($widget);
3351}
3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3359sub set_current_page {
3360 my ($self, $page) = @_;
3361
3362 $self->{multiplexer}->set_current_page ($page);
3363 $self->emit (page_changed => $self->{multiplexer}{current});
3364}
3365
3366#############################################################################
3367
3368package CFClient::UI::Selector;
3369
3370use utf8;
3371
3372our @ISA = CFClient::UI::Button::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 options => [], # [value, title, longdesc], ...
3379 value => undef,
3380 @_,
3381 );
3382
3383 $self->_set_value ($self->{value});
3384
3385 $self
3386}
3387
3388sub invoke_button_down {
3389 my ($self, $ev) = @_;
3390
3391 my @menu_items;
3392
3393 for (@{ $self->{options} }) {
3394 my ($value, $title, $tooltip) = @$_;
3395
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 }
3398
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400}
3401
3402sub _set_value {
3403 my ($self, $value) = @_;
3404
3405 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3406 or return;
3407
3408 $self->{value} = $item->[0];
3409 $self->set_markup ("$item->[1] ⇓");
3410 $self->set_tooltip ($item->[2]);
3411}
3412
3413sub set_value {
3414 my ($self, $value) = @_;
3415
3416 return unless $self->{value} ne $value;
3417
3418 $self->_set_value ($value);
3419 $self->emit (changed => $value);
3420}
3421
3422#############################################################################
3423
3424package CFClient::UI::Statusbox;
3425
3426our @ISA = CFClient::UI::VBox::;
3427
3428sub new {
3429 my $class = shift;
3430
3431 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3432 fontsize => 0.8,
2908 @_, 3433 @_,
2909 ) 3434 );
3435
3436 Scalar::Util::weaken (my $this = $self);
3437
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439
3440 $self
2910} 3441}
2911 3442
2912sub reorder { 3443sub reorder {
2913 my ($self) = @_; 3444 my ($self) = @_;
2914 my $NOW = time; 3445 my $NOW = Time::HiRes::time;
3446
3447 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} };
2915 3451
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3454 }
2919 3455
… …
2922 my @items = sort { 3458 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
2926 3462
3463 $self->{timer}->interval (1);
3464
2927 my $count = 10 + 1; 3465 my $count = 10 + 1;
2928 for my $item (@items) { 3466 for my $item (@items) {
2929 last unless --$count; 3467 last unless --$count;
2930 3468
2931 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3473 : $item->{text};
2936 3474
… …
2944 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3488 can_events => 1,
2951 can_hover => 1 3489 can_hover => 1
2952 }; 3490 };
3491
3492 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3493 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3494 $label->update;
3495 $label->set_max_size (undef, $label->{req_h} * $diff)
3496 if $diff < 1;
3497 $self->{timer}->interval (1/30);
3498 } else {
3499 $label->{fg}[3] = $item->{fg}[3] || 1;
3500 }
3501
3502 push @widgets, $label;
2953 } 3503 }
2954 3504
2955 $self->clear; 3505 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
2957} 3507}
… …
2962 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
2964 3514
2965 return unless $text; 3515 return unless $text;
2966 3516
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3518
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3520
2971 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
2973 $item->{count}++; 3523 $item->{count}++;
2974 } else { 3524 } else {
2975 $item->{count} = 1; 3525 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
2977 } 3527 }
2978 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3530 delete $item->{label};
2981 } else { 3531 } else {
2982 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
2989 count => 1, 3539 count => 1,
2990 %arg, 3540 %arg,
2991 }; 3541 };
2992 } 3542 }
2993 3543
3544 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3545 $self->reorder;
3546 });
2995} 3547}
2996 3548
2997sub reconfigure { 3549sub reconfigure {
2998 my ($self) = @_; 3550 my ($self) = @_;
2999 3551
… …
3002 3554
3003 $self->reorder; 3555 $self->reorder;
3004 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
3005} 3557}
3006 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
3007############################################################################# 3567#############################################################################
3008 3568
3569package CFClient::UI::Inventory;
3570
3571our @ISA = CFClient::UI::Table::;
3572
3573sub new {
3574 my $class = shift;
3575
3576 my $self = $class->SUPER::new (
3577 col_expand => [0, 1, 0],
3578 items => [],
3579 @_,
3580 );
3581
3582 $self->set_sort_order (undef);
3583
3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3620}
3621
3622sub set_items {
3623 my ($self, $items) = @_;
3624
3625 $self->{items} = [$items ? values %$items : ()];
3626 $self->update_items;
3627}
3628
3629#############################################################################
3630
3631package CFClient::UI::SpellList;
3632
3633our @ISA = CFClient::UI::Table::;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3641 @_,
3642 )
3643}
3644
3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3730sub add_spell {
3731 my ($self, $spell) = @_;
3732
3733 $self->{spell}->{$spell->{name}} = $spell;
3734 $self->rebuild_spell_list;
3735}
3736
3737sub remove_spell {
3738 my ($self, $spell) = @_;
3739
3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3751#############################################################################
3752
3009package CFClient::UI::Root; 3753package CFClient::UI::Root;
3010 3754
3011our @ISA = CFClient::UI::Container::; 3755our @ISA = CFClient::UI::Container::;
3756
3757use List::Util qw(min max);
3012 3758
3013use CFClient::OpenGL; 3759use CFClient::OpenGL;
3014 3760
3015sub new { 3761sub new {
3016 my $class = shift; 3762 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3044 3790
3045 int $coord + 0.5 3791 int $coord + 0.5
3046} 3792}
3047 3793
3048sub size_allocate { 3794sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3050 3796
3051 for my $child ($self->children) { 3797 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3799
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3059 3805
3060 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3061 } 3807 }
3808
3809 1
3062} 3810}
3063 3811
3064sub coord2local { 3812sub coord2local {
3065 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3066 3814
… …
3122 $_->() 3870 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3871 for values %{delete $self->{refresh_hook}};
3124 } 3872 }
3125 3873
3126 if ($self->{realloc}) { 3874 if ($self->{realloc}) {
3875 my %queue;
3127 my @queue; 3876 my @queue;
3877 my $widget;
3128 3878
3879 outer:
3129 while () { 3880 while () {
3130 if ($self->{realloc}) { 3881 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3882 for $widget (values %$realloc) {
3883 $widget->{visible} or next; # do not resize invisible widgets
3132 3884
3133 use sort 'stable'; 3885 $queue{$widget+0}++ and next; # duplicates are common
3134 3886
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3887 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3888 }
3137 } 3889 }
3138 3890
3891 while () {
3892 @queue or last outer;
3893
3139 my $widget = pop @queue || last; 3894 $widget = pop @{ $queue[-1] || [] }
3895 and last;
3896
3897 pop @queue;
3898 }
3140 3899
3141 $widget->{visible} or last; # do not resize invisible widgets 3900 delete $queue{$widget+0};
3142 3901
3143 my ($w, $h) = $widget->size_request; 3902 my ($w, $h) = $widget->size_request;
3144 3903
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3904 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3905 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3906
3907 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3908 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3909
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3910 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3911 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3912
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3913 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3916 $widget->{req_h} = $h;
3155 3917
3156 $self->{size_alloc}{$widget+0} = $widget; 3918 $self->{size_alloc}{$widget+0} = $widget;
3157 3919
3158 if (my $parent = $widget->{parent}) { 3920 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3921 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3922 unless $queue{$parent+0};
3923
3161 $parent->{force_size_alloc} = 1; 3924 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3925 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3926 }
3164 } 3927 }
3165 3928
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 3941
3179 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3181 3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950
3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3953
3182 $w = int $w + 0.5; 3954 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3955 $h = int $h + 0.5;
3184 3956
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3957 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3958 $widget->{old_w} = $widget->{w};
3959 $widget->{old_h} = $widget->{h};
3960
3186 $widget->{w} = $w; 3961 $widget->{w} = $w;
3187 $widget->{h} = $h; 3962 $widget->{h} = $h;
3188 3963
3189 $widget->emit (size_allocate => $w, $h); 3964 $widget->emit (size_allocate => $w, $h);
3190 } 3965 }
… …
3205 glLoadIdentity; 3980 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3981 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3982 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3983 glLoadIdentity;
3209 3984
3985 {
3986 package CFClient::UI::Base;
3987
3988 ($draw_x, $draw_y, $draw_w, $draw_h) =
3989 (0, 0, $self->{w}, $self->{h});
3990 }
3991
3210 $self->_draw; 3992 $self->_draw;
3211}
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
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440
3441 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3443 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3444 expand => 1);
3445
3446 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3447 text => "bind to key",
3448 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3449}
3450
3451sub rebuild_spell_list {
3452 my ($self) = @_;
3453 $self->{tbl_idx} = 0;
3454 $self->add_spell ($_) for values %{$self->{spells}};
3455}
3456
3457sub remove_spell {
3458 my ($self, $spell) = @_;
3459 delete $self->{spells}->{$spell->{name}};
3460 $self->rebuild_spell_list;
3461} 3993}
3462 3994
3463############################################################################# 3995#############################################################################
3464 3996
3465package CFClient::UI; 3997package CFClient::UI;

Diff Legend

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