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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 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 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 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
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 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 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
171sub rescale_widgets { 186sub rescale_widgets {
172 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
173 188
174 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 190 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 193
179 $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.]+$/;
180 $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};
181 $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};
182 $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.]+$/;
183 $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};
184 $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};
185 200
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
333} 355}
334 356
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
338} 364}
339 365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
376} 403}
377 404
378sub set_max_size { 405sub set_max_size {
379 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
380 407
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
383} 412}
384 413
385sub set_tooltip { 414sub set_tooltip {
386 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
387 416
… …
392 421
393 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
394 423
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 427 }
399} 428}
400 429
401# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
402sub coord2local { 431sub coord2local {
403 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
404 433
434 Carp::confess unless $self->{parent};#d#
435
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 437}
407 438
408# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
409sub coord2global { 440sub coord2global {
410 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
411 442
443 Carp::confess unless $self->{parent};#d#
444
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 446}
414 447
415sub focus_in { 448sub invoke_focus_in {
416 my ($self) = @_; 449 my ($self) = @_;
417 450
418 return if $FOCUS == $self; 451 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
420 453
421 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
422 455
423 $self->_emit (focus_in => $focus); 456 $self->update;
424 457
425 $focus->update if $focus; 458 0
426 $FOCUS->update;
427} 459}
428 460
429sub focus_out { 461sub invoke_focus_out {
430 my ($self) = @_; 462 my ($self) = @_;
431 463
432 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
433 465
434 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
435 467
436 $self->_emit (focus_out => $focus); 468 $self->update;
437 469
438 $focus->update if $focus; #?
439
440 $::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
441 unless $FOCUS; 471 unless $FOCUS;
442}
443 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
444sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
445sub button_up { } 484sub invoke_button_up { 0 }
446sub key_down { } 485sub invoke_key_down { 0 }
447sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
448 488
449sub button_down { 489sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
451 491
452 $self->focus_in; 492 $self->grab_focus;
453}
454 493
455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
459sub 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}
460 532
461sub find_widget { 533sub find_widget {
462 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
463 535
464 return () unless $self->{can_events}; 536 return () unless $self->{can_events};
… …
473sub set_parent { 545sub set_parent {
474 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
475 547
476 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
477 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
478}
479
480sub connect {
481 my ($self, $signal, $cb) = @_;
482
483 push @{ $self->{signal_cb}{$signal} }, $cb;
484}
485
486sub _emit {
487 my ($self, $signal, @args) = @_;
488
489 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
490}
491
492sub emit {
493 my ($self, $signal, @args) = @_;
494
495 $self->_emit ($signal, @args)
496 || $self->$signal (@args);
497}
498
499sub visibility_change {
500 #my ($self, $visible) = @_;
501} 550}
502 551
503sub realloc { 552sub realloc {
504 my ($self) = @_; 553 my ($self) = @_;
505 554
… …
526 575
527 $self->realloc; 576 $self->realloc;
528 $self->update; 577 $self->update;
529} 578}
530 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
531sub draw { 584sub draw {
532 my ($self) = @_; 585 my ($self) = @_;
533 586
534 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);
535 596
536 glPushMatrix; 597 glPushMatrix;
537 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
538 $self->_draw;
539 glPopMatrix;
540 599
541 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
542 my ($x, $y) = @$self{qw(x y)};
543
544 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
545 glEnable GL_BLEND; 602 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glBegin GL_QUADS; 604 glBegin GL_QUADS;
548 glVertex $x , $y; 605 glVertex 0 , 0;
549 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
550 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
551 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
552 glEnd; 609 glEnd;
553 glDisable GL_BLEND; 610 glDisable GL_BLEND;
554 } 611 }
555 612
556 if ($ENV{CFPLUS_DEBUG} & 1) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
557 glPushMatrix; 614 glPushMatrix;
558 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
560 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
561 glVertex 0 , 0; 618 glVertex 0 , 0;
562 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
563 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
564 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
565 glEnd; 622 glEnd;
566 glPopMatrix; 623 glPopMatrix;
567 #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;
568 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
569} 629}
570 630
571sub _draw { 631sub _draw {
572 my ($self) = @_; 632 my ($self) = @_;
573 633
… …
575} 635}
576 636
577sub DESTROY { 637sub DESTROY {
578 my ($self) = @_; 638 my ($self) = @_;
579 639
640 return if CFClient::in_destruct;
641
580 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
581 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
582} 646}
583 647
584############################################################################# 648#############################################################################
585 649
586package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
611 675
612 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
613 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
614 678
615 glEnable GL_BLEND; 679 glEnable GL_BLEND;
616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617 glColor @$color; 681 glColor_premultiply @$color;
618 682
619 glBegin GL_QUADS; 683 glBegin GL_QUADS;
620 glVertex 0 , 0; 684 glVertex 0 , 0;
621 glVertex 0 , $h; 685 glVertex 0 , $h;
622 glVertex $w, $h; 686 glVertex $w, $h;
… …
653our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
654 718
655sub new { 719sub new {
656 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
657 721
658 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
659 723
660 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
661 children => [], 725 children => [],
662 can_events => 0, 726 can_events => 0,
663 %arg, 727 %arg,
664 ); 728 );
729
665 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
666 732
667 $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;
668} 742}
669 743
670sub add { 744sub add {
671 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
672 746
… …
718 $x -= $self->{x}; 792 $x -= $self->{x};
719 $y -= $self->{y}; 793 $y -= $self->{y};
720 794
721 my $res; 795 my $res;
722 796
723 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
725 and return $res; 799 and return $res;
726 } 800 }
727 801
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
749} 823}
750 824
751sub add { 825sub add {
752 my ($self, $child) = @_; 826 my ($self, $child) = @_;
753 827
754 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
755
756 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
757} 830}
758 831
759sub remove { 832sub remove {
760 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
769 842
770sub size_request { 843sub size_request {
771 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
772} 845}
773 846
774sub size_allocate { 847sub invoke_size_allocate {
775 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
776 849
777 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
778} 853}
779 854
780############################################################################# 855#############################################################################
856
857# back-buffered drawing area
781 858
782package CFClient::UI::Window; 859package CFClient::UI::Window;
783 860
784our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
785 862
… …
796 873
797 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
798 $self->SUPER::update; 875 $self->SUPER::update;
799} 876}
800 877
801sub size_allocate { 878sub invoke_size_allocate {
802 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
803 880
804 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
806} 884}
807 885
808sub _render { 886sub _render {
887 my ($self) = @_;
888
809 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
810} 890}
811 891
812sub render_child { 892sub render_child {
813 my ($self) = @_; 893 my ($self) = @_;
814 894
815 $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 {
816 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
818 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
819 $self->_render; 906 $self->_render;
820 }; 907 };
821} 908}
822 909
823sub _draw { 910sub _draw {
824 my ($self) = @_; 911 my ($self) = @_;
825 912
826 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
827 914
828 my $tex = $self->{texture} 915 my $tex = $self->{texture}
829 or return; 916 or return;
830 917
831 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
834 921
835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
836 923
837 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
838} 925}
… …
862 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
863 950
864 ($w, $h) 951 ($w, $h)
865} 952}
866 953
867sub size_allocate { 954sub invoke_size_allocate {
868 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
869 956
870 my $child = $self->child; 957 my $child = $self->child;
871 958
872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
874 961
875 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
876 $self->update; 963 $self->update;
964
965 1
877} 966}
878 967
879sub set_offset { 968sub set_offset {
880 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
881 970
… …
914} 1003}
915 1004
916sub _render { 1005sub _render {
917 my ($self) = @_; 1006 my ($self) = @_;
918 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
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 1012
921 $self->SUPER::_render; 1013 $self->SUPER::_render;
922} 1014}
923 1015
… …
926package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
927 1019
928our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
929 1021
930sub new { 1022sub new {
931 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
932 1026
933 my $self; 1027 my $self;
934 1028
935 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
936 vertical => 1, 1030 vertical => 1,
… …
939 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
940 }, 1034 },
941 ; 1035 ;
942 1036
943 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
945 slider => $slider, 1040 slider => $slider,
946 @_, 1041 %arg,
947 ); 1042 );
948 1043
949 $self->{vp}->add ($self->{scrolled});
950 $self->add ($self->{vp});
951 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
952 1046
953 $self 1047 $self
954} 1048}
955 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
956sub update { 1074sub update {
957 my ($self) = @_; 1075 my ($self) = @_;
958 1076
959 $self->SUPER::update; 1077 $self->SUPER::update;
960 1078
961 # todo: overwrite size_allocate of child 1079 $self->update_slider;
962 my $child = $self->{vp}->child;
963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
964} 1080}
965 1081
966sub size_allocate { 1082sub invoke_size_allocate {
967 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
968 1084
1085 $self->update_slider;
1086
969 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
970
971 my $child = $self->{vp}->child;
972 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
973} 1088}
974
975#TODO# update range on size_allocate depending on child
976# update viewport offset on scroll
977 1089
978############################################################################# 1090#############################################################################
979 1091
980package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
981 1093
… …
997 1109
998 if ($self->{bg}) { 1110 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1000 1112
1001 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1004 1116
1005 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1118 glVertex 0 , 0;
1007 glVertex 0 , $h; 1119 glVertex 0 , $h;
1008 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1030my @border = 1142my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032 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);
1033 1145
1034sub new { 1146sub new {
1035 my $class = shift; 1147 my ($class, %arg) = @_;
1036 1148
1037 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1152 border => 0.6,
1041 can_events => 1, 1153 can_events => 1,
1042 min_w => 16, 1154 min_w => 64,
1043 min_h => 16, 1155 min_h => 32,
1044 @_ 1156 %arg,
1045 ); 1157 );
1046 1158
1047 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1048 align => 0, 1160 align => 0,
1049 valign => 1, 1161 valign => 1,
1050 text => $self->{title}, 1162 text => $self->{title},
1051 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 }
1052 1174
1053 $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};
1054} 1184}
1055 1185
1056sub border { 1186sub border {
1057 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1058} 1188}
1059 1189
1060sub size_request { 1190sub size_request {
1061 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};
1062 1198
1063 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1064 1200
1065 ( 1201 (
1066 $w + $self->border * 2, 1202 $w + $self->border * 2,
1067 $h + $self->border * 2, 1203 $h + $self->border * 2,
1068 ) 1204 )
1069} 1205}
1070 1206
1071sub size_allocate { 1207sub invoke_size_allocate {
1072 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1073 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
1074 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1076 1220
1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078 if $self->{title};
1079
1080 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1081}
1082 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
1083sub button_down { 1237sub invoke_button_down {
1084 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1085 1239
1086 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1087 my $border = $self->border; 1241 my $border = $self->border;
1088 1242
… …
1104 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1105 1259
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1264 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1265 };
1112 1266
1113 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1118 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1119 1273
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1275
1122 $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});
1123 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1124 } 1284 1
1125} 1285}
1126 1286
1127sub button_up { 1287sub invoke_button_up {
1128 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1129 1289
1130 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1131} 1291}
1132 1292
1133sub mouse_motion { 1293sub invoke_mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1135 1295
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1137} 1299}
1138 1300
1139sub _draw { 1301sub _draw {
1140 my ($self) = @_; 1302 my ($self) = @_;
1141 1303
1304 my $child = $self->{children}[0];
1305
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1308
1145 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1311
1148 my $border = $self->border; 1312 my $border = $self->border;
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1328 }
1165 1329
1166 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1167 1331
1168 $self->{title}->draw if $self->{title};
1169
1170 $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};
1171} 1343}
1172 1344
1173############################################################################# 1345#############################################################################
1174 1346
1175package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1192sub children { 1364sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1194} 1366}
1195 1367
1196sub add { 1368sub add {
1197 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1198 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1199 $child->set_parent ($self); 1373 $child->set_parent ($self);
1200 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1201 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1202 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1203} 1386}
1204 1387
1205# 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?
1206sub clear { 1389sub clear {
1207 my ($self) = @_; 1390 my ($self) = @_;
… …
1248 (sum @$ws), 1431 (sum @$ws),
1249 (sum @$hs), 1432 (sum @$hs),
1250 ) 1433 )
1251} 1434}
1252 1435
1253sub size_allocate { 1436sub invoke_size_allocate {
1254 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1255 1438
1256 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1257 1440
1258 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1290 } 1473 }
1291 1474
1292 $y += $row_h; 1475 $y += $row_h;
1293 } 1476 }
1294 1477
1478 1
1295} 1479}
1296 1480
1297sub find_widget { 1481sub find_widget {
1298 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1299 1483
… …
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 ) 1522 )
1339} 1523}
1340 1524
1341sub size_allocate { 1525sub invoke_size_allocate {
1342 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1343 1527
1344 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1345 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1346 1530
1347 my @req; 1531 my @req;
1348 1532
1349 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1350 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1351 } else { 1535 } else {
1352 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1353 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1354 1538
1355 if ($req > $space) { 1539 if ($req > $space) {
1356 # ah well, not enough space 1540 # ah well, not enough space
1357 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1358 } else { 1542 } else {
1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1360 1544
1361 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1362 1546
1363 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1364 for 0 .. $#$children; 1548 for 0 .. $#children;
1365 } 1549 }
1366 } 1550 }
1367 1551
1368 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1369 1553
1370 my $pos = 0; 1554 my $pos = 0;
1371 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1372 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1373 $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));
1374 1558
1375 $pos += $alloc; 1559 $pos += $alloc;
1376 } 1560 }
1377 1561
1378 1 1562 1
… …
1451 } 1635 }
1452 1636
1453 $self 1637 $self
1454} 1638}
1455 1639
1456sub escape($) {
1457 local $_ = $_[0];
1458
1459 s/&/&amp;/g;
1460 s/>/&gt;/g;
1461 s/</&lt;/g;
1462
1463 $_
1464}
1465
1466sub update { 1640sub update {
1467 my ($self) = @_; 1641 my ($self) = @_;
1468 1642
1469 delete $self->{texture}; 1643 delete $self->{texture};
1470 $self->SUPER::update; 1644 $self->SUPER::update;
1471} 1645}
1472 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1473sub set_text { 1654sub set_text {
1474 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1475 1656
1476 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1478 1659
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1481 1661
1662 delete $self->{size_req};
1482 $self->realloc; 1663 $self->realloc;
1483 $self->update; 1664 $self->update;
1484} 1665}
1485 1666
1486sub set_markup { 1667sub set_markup {
… …
1489 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1490 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1491 1672
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1674
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1496 1676
1677 delete $self->{size_req};
1497 $self->realloc; 1678 $self->realloc;
1498 $self->update; 1679 $self->update;
1499} 1680}
1500 1681
1501sub size_request { 1682sub size_request {
1502 my ($self) = @_; 1683 my ($self) = @_;
1503 1684
1685 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1691
1510 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1511 1693
1512 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1513 $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);
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1698
1516 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1517 1700
1518 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1520 } 1706 };
1521 1707
1522 ($w, $h) 1708 @{ $self->{size_req} }
1523} 1709}
1524 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1525sub size_allocate { 1715sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1717
1718 delete $self->{ox};
1527 1719
1528 delete $self->{texture} 1720 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1530} 1724}
1531 1725
1532sub set_fontsize { 1726sub set_fontsize {
1533 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1534 1728
1535 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1536 delete $self->{texture}; 1731 delete $self->{texture};
1537 1732
1538 $self->realloc; 1733 $self->realloc;
1539} 1734}
1540 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1541sub _draw { 1745sub _draw {
1542 my ($self) = @_; 1746 my ($self) = @_;
1543 1747
1544 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1545 1749
1546 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1548 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1549 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 1757
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$self->{layout}->size]
1759 };
1555 1760
1761 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1559 1765
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1563
1564 $tex
1565 }; 1769 };
1566 1770
1567 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1569 1773
1570 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1571 glColor @{$self->{fg}};
1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1573 } else {
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1575 }
1576
1577 glDisable GL_TEXTURE_2D;
1578} 1775}
1579 1776
1580############################################################################# 1777#############################################################################
1581 1778
1582package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1596 can_hover => 1, 1793 can_hover => 1,
1597 can_focus => 1, 1794 can_focus => 1,
1598 valign => 0, 1795 valign => 0,
1599 can_events => 1, 1796 can_events => 1,
1600 #text => ... 1797 #text => ...
1798 #hidden => "*",
1601 @_ 1799 @_
1602 ) 1800 )
1603} 1801}
1604 1802
1605sub _set_text { 1803sub _set_text {
… …
1607 1805
1608 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1609 1807
1610 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1611 1809
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 1811 $self->{text} = $text;
1616 1812
1617 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1619 1816
1620 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1621} 1821}
1622 1822
1623sub set_text { 1823sub set_text {
1624 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1625 1825
1626 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 1827 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 1828}
1631 1829
1632sub get_text { 1830sub get_text {
1633 $_[0]{text} 1831 $_[0]{text}
1634} 1832}
… …
1639 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1640 1838
1641 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1642} 1840}
1643 1841
1644sub key_down { 1842sub invoke_key_down {
1645 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1646 1844
1647 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1648 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1649 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1661 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1662 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1663 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1664 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 1864 $self->emit ('escape');
1667 } elsif ($uni) { 1865 } elsif ($uni) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1669 } 1869 }
1670 1870
1671 $self->_set_text ($text); 1871 $self->_set_text ($text);
1672 1872
1673 $self->realloc; 1873 $self->realloc;
1674}
1675 1874
1875 1
1876}
1877
1676sub focus_in { 1878sub invoke_focus_in {
1677 my ($self) = @_; 1879 my ($self) = @_;
1678 1880
1679 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1680 1882
1681 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1682} 1884}
1683 1885
1684sub button_down { 1886sub invoke_button_down {
1685 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1686 1888
1687 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1688 1890
1689 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1690 1892
1691 # byte-index to char-index 1893 # byte-index to char-index
1692 my $text = $self->{text}; 1894 my $text = $self->{text};
1693 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1695 1897
1696 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1697 $self->update; 1899 $self->update;
1900
1901 1
1698} 1902}
1699 1903
1700sub mouse_motion { 1904sub invoke_mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1702# 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
1703} 1909}
1704 1910
1705sub _draw { 1911sub _draw {
1706 my ($self) = @_; 1912 my ($self) = @_;
1707 1913
1708 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1709 1915
1710 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1713 } else { 1919 } else {
1714 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1715 } 1921 }
1716 1922
1717 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1720 glVertex 0 , 0; 1926 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1748 1954
1749our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1750 1956
1751use CFClient::OpenGL; 1957use CFClient::OpenGL;
1752 1958
1753sub key_down { 1959sub invoke_key_down {
1754 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1755 1961
1756 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1757 1963
1758 if ($sym == 13) { 1964 if ($sym == 13) {
1759 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1760 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1761 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1763 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1764 $self->update; 1971 $self->update;
1765 1972
1766 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1767 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1768 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1784 } else { 1991 } else {
1785 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1786 } 1993 }
1787 1994
1788 } else { 1995 } else {
1789 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1790 } 1999 1
1791
1792} 2000}
1793 2001
1794############################################################################# 2002#############################################################################
1795 2003
1796package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1817 can_events => 1, 2025 can_events => 1,
1818 @_ 2026 @_
1819 ) 2027 )
1820} 2028}
1821 2029
1822sub activate { }
1823
1824sub button_up { 2030sub invoke_button_up {
1825 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1826 2032
1827 $self->emit ("activate") 2033 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1830} 2038}
1831 2039
1832sub _draw { 2040sub _draw {
1833 my ($self) = @_; 2041 my ($self) = @_;
1834 2042
1835 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 2044
1841 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1844 2048
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 2050
1847 glDisable GL_TEXTURE_2D; 2051 glDisable GL_TEXTURE_2D;
1848 2052
1849 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
2054}
2055
2056#############################################################################
2057
2058package CFClient::UI::ImageButton;
2059
2060our @ISA = CFClient::UI::Image::;
2061
2062use CFClient::OpenGL;
2063
2064my %textures;
2065
2066sub new {
2067 my $class = shift;
2068
2069 my $self = $class->SUPER::new (
2070 padding_x => 4,
2071 padding_y => 4,
2072 fg => [1, 1, 1],
2073 active_fg => [0, 0, 1],
2074 can_hover => 1,
2075 align => 0,
2076 valign => 0,
2077 can_events => 1,
2078 @_
2079 );
2080}
2081
2082sub invoke_button_up {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 $self->emit ("activate")
2086 if $x >= 0 && $x < $self->{w}
2087 && $y >= 0 && $y < $self->{h};
2088
2089 1
1850} 2090}
1851 2091
1852############################################################################# 2092#############################################################################
1853 2093
1854package CFClient::UI::CheckBox; 2094package CFClient::UI::CheckBox;
… …
1881 my ($self) = @_; 2121 my ($self) = @_;
1882 2122
1883 (6) x 2 2123 (6) x 2
1884} 2124}
1885 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
1886sub button_down { 2134sub invoke_button_down {
1887 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
1888 2136
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2139 $self->toggle;
1892 $self->_emit (changed => $self->{state}); 2140 } else {
2141 return 0
2142 }
2143
1893 } 2144 1
1894} 2145}
1895 2146
1896sub _draw { 2147sub _draw {
1897 my ($self) = @_; 2148 my ($self) = @_;
1898 2149
… …
1918package CFClient::UI::Image; 2169package CFClient::UI::Image;
1919 2170
1920our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
1921 2172
1922use CFClient::OpenGL; 2173use CFClient::OpenGL;
1923use Carp qw/confess/;
1924 2174
1925our %loaded_images; 2175our %texture_cache;
1926 2176
1927sub new { 2177sub new {
1928 my $class = shift; 2178 my $class = shift;
1929 2179
1930 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
1931 2184
1932 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
1933 2187
1934 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1935 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1936 2190
1937 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
1938 2192
1939 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1940
1941 $self->{aspect} = $tex->{w} / $tex->{h};
1942 2194
1943 $self 2195 $self
1944} 2196}
1945 2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
1946sub size_request { 2216sub size_request {
1947 my ($self) = @_; 2217 my ($self) = @_;
1948 2218
1949 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
1950} 2220}
1951 2221
1952sub _draw { 2222sub _draw {
1953 my ($self) = @_; 2223 my ($self) = @_;
1954 2224
… …
1964 } 2234 }
1965 2235
1966 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1968 2238
1969 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
1970 2240
1971 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
1972} 2242}
1973 2243
1974############################################################################# 2244#############################################################################
… …
2063 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2064 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2065 2335
2066 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2337 my $h2 = $self->{h} * (1 - $ycut2);
2338 my $h3 = $self->{h};
2339
2340 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2068 2341
2069 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2070 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2071 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2347
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2348 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2349 glBegin GL_QUADS;
… …
2090 2364
2091 if ($t3) { 2365 if ($t3) {
2092 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2093 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2094 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2095 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2096 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2097 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2098 glEnd; 2372 glEnd;
2099 } 2373 }
2100 2374
2101 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2189 $self->update; 2463 $self->update;
2190 2464
2191 $self 2465 $self
2192} 2466}
2193 2467
2194sub changed { }
2195
2196sub set_range { 2468sub set_range {
2197 my ($self, $range) = @_; 2469 my ($self, $range) = @_;
2198 2470
2199 ($range, $self->{range}) = ($self->{range}, $range); 2471 ($range, $self->{range}) = ($self->{range}, $range);
2200 2472
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2473 if ("@$range" ne "@{$self->{range}}") {
2474 $self->update;
2475 $self->set_value ($self->{range}[0]);
2476 }
2203} 2477}
2204 2478
2205sub set_value { 2479sub set_value {
2206 my ($self, $value) = @_; 2480 my ($self, $value) = @_;
2207 2481
… …
2218 if $unit; 2492 if $unit;
2219 2493
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2494 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221 2495
2222 if ($value != $old_value) { 2496 if ($value != $old_value) {
2223 $self->_emit (changed => $value); 2497 $self->emit (changed => $value);
2224 $self->update; 2498 $self->update;
2225 } 2499 }
2226} 2500}
2227 2501
2228sub size_request { 2502sub size_request {
2229 my ($self) = @_; 2503 my ($self) = @_;
2230 2504
2231 ($self->{req_w}, $self->{req_h}) 2505 ($self->{req_w}, $self->{req_h})
2232} 2506}
2233 2507
2234sub button_down { 2508sub invoke_button_down {
2235 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
2236 2510
2237 $self->SUPER::button_down ($ev, $x, $y); 2511 $self->SUPER::invoke_button_down ($ev, $x, $y);
2238 2512
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2513 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2514
2241 $self->mouse_motion ($ev, $x, $y); 2515 $self->invoke_mouse_motion ($ev, $x, $y)
2242} 2516}
2243 2517
2244sub mouse_motion { 2518sub invoke_mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2519 my ($self, $ev, $x, $y) = @_;
2246 2520
2247 if ($GRAB == $self) { 2521 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2522 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249 2523
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2524 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2525
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2526 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2527
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2528 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2529 } else {
2530 return 0;
2531 }
2532
2255 } 2533 1
2534}
2535
2536sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_;
2538
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2542
2543 ! ! $delta
2256} 2544}
2257 2545
2258sub update { 2546sub update {
2259 my ($self) = @_; 2547 my ($self) = @_;
2260 2548
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2549 delete $self->{knob_w};
2550 $self->SUPER::update;
2551}
2552
2553sub _draw {
2554 my ($self) = @_;
2555
2556 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2557 $self->set_value ($self->{range}[0]);
2263 2558
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2559 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2560 my $range = ($hi - $page - $lo) || 1e-100;
2266 2561
… …
2272 $value = ($value - $lo) / $range; 2567 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2568 $value = $value * $self->{scale} + $self->{offset};
2274 2569
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2570 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2571 $self->{knob_w} = $knob_w;
2277 }); 2572 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2573
2285 $self->SUPER::_draw (); 2574 $self->SUPER::_draw ();
2286 2575
2287 glScale $self->{w}, $self->{h}; 2576 glScale $self->{w}, $self->{h};
2288 2577
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2638sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2639sub set_value { shift->{slider}->set_value (@_) }
2351 2640
2352############################################################################# 2641#############################################################################
2353 2642
2354package CFClient::UI::TextView; 2643package CFClient::UI::TextScroller;
2355 2644
2356our @ISA = CFClient::UI::HBox::; 2645our @ISA = CFClient::UI::HBox::;
2357 2646
2358use CFClient::OpenGL; 2647use CFClient::OpenGL;
2359 2648
2360sub new { 2649sub new {
2361 my $class = shift; 2650 my $class = shift;
2362 2651
2363 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2364 fontsize => 1, 2653 fontsize => 1,
2365 can_events => 0, 2654 can_events => 1,
2655 indent => 0,
2366 #font => default_font 2656 #font => default_font
2367 @_, 2657 @_,
2368 2658
2369 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2370 par => [], 2660 par => [],
2371 height => 0, 2661 height => 0,
2372 children => [ 2662 children => [
2373 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2374 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2385 2675
2386 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2387 $self->reflow; 2677 $self->reflow;
2388} 2678}
2389 2679
2680sub size_request {
2681 my ($self) = @_;
2682
2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2687}
2688
2390sub size_allocate { 2689sub invoke_size_allocate {
2391 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2392 2691
2393 $self->SUPER::size_allocate ($w, $h); 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2394 2694
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 2699
2399 $self->reflow; 2700 $self->reflow;
2400}
2401 2701
2402sub text_size { 2702 local $self->{children} = [$empty, $slider];
2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2403 my ($self, $text, $indent) = @_; 2707 my ($self, $ev) = @_;
2708
2709 return 0 unless $ev->{dy}; # only vertical movements
2710
2711 $self->{children}[1]->emit (mouse_wheel => $ev);
2712
2713 1
2714}
2715
2716sub get_layout {
2717 my ($self, $para) = @_;
2404 2718
2405 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2406 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 2726 $layout->set_markup ($para->{markup});
2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2410 2732 );
2733
2411 $layout->size 2734 $layout
2412} 2735}
2413 2736
2414sub reflow { 2737sub reflow {
2415 my ($self) = @_; 2738 my ($self) = @_;
2416 2739
… …
2425 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2426} 2749}
2427 2750
2428sub clear { 2751sub clear {
2429 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2430 2756
2431 $self->{par} = []; 2757 $self->{par} = [];
2432 $self->{height} = 0; 2758 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434} 2760}
2435 2761
2436sub add_paragraph { 2762sub add_paragraph {
2437 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2438 2764
2439 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2440 my ($w, $h) = $self->text_size ($line); 2766
2441 $self->{height} += $h; 2767 $para = {
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2768 w => 1e10,
2769 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2443 } 2774 };
2444 2775
2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2776 $self->add (@w) if @w;
2777 push @{$self->{par}}, $para;
2778
2779 $self->{need_reflow}++;
2780 $self->update;
2781}
2782
2783sub scroll_to_bottom {
2784 my ($self) = @_;
2785
2786 $self->{scroll_to_bottom} = 1;
2787 $self->update;
2446} 2788}
2447 2789
2448sub update { 2790sub update {
2449 my ($self) = @_; 2791 my ($self) = @_;
2450 2792
… …
2452 2794
2453 return unless $self->{h} > 0; 2795 return unless $self->{h} > 0;
2454 2796
2455 delete $self->{texture}; 2797 delete $self->{texture};
2456 2798
2457 $ROOT->on_post_alloc ($self, sub { 2799 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2801
2460 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2803 my $height = 0;
2462 2804
2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2467 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2469 $layout->set_width ($W - $_->[3]); 2807 my $layout = $self->get_layout ($para);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2809
2473 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2474 } 2813 }
2475 2814
2476 $height += $_->[1]; 2815 $height += $para->{h};
2477 } 2816 }
2478 2817
2479 $self->{height} = $height; 2818 $self->{height} = $height;
2480 2819
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2482 2821
2483 delete $self->{texture}; 2822 delete $self->{texture};
2484 } 2823 }
2485 2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2827 }
2828
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2830 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
2489 2832
2490 my $top = int $self->{children}[1]{range}[0]; 2833 my $top = int $self->{children}[1]{range}[0];
2491 2834
2492 my $y0 = $top; 2835 my $y0 = $top;
2493 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2494 2837
2495 my $y = 0; 2838 my $y = 0;
2496 2839
2497 my $layout = $self->{layout};
2498
2499 $layout->set_font ($self->{font}) if $self->{font};
2500
2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2504
2505 for my $par (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2506 my $h = $par->[1]; 2841 my $h = $para->{h};
2507 2842
2508 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2511 $layout->set_markup ($par->[4]);
2512 2844
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2514 2846
2515 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2848
2849 if (my @w = @{ $para->{widget} }) {
2850 my @s = $layout->get_shapes;
2851
2852 for (@w) {
2853 my ($dx, $dy) = splice @s, 0, 2, ();
2854
2855 $_->{x} = $dx + $para->{indent};
2856 $_->{y} = $dy + $y - $y0;
2857
2858 $_->draw;
2859 }
2860 }
2517 } 2861 }
2518 2862
2519 $y += $h; 2863 $y += $h;
2520 } 2864 }
2521
2522 glDisable GL_BLEND;
2523 }; 2865 };
2524 }); 2866 });
2525} 2867}
2526 2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2876}
2877
2527sub _draw { 2878sub _draw {
2528 my ($self) = @_; 2879 my ($self) = @_;
2529 2880
2530 glEnable GL_TEXTURE_2D; 2881 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2883 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2884 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2535 2886
2536 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2537
2538} 2888}
2539 2889
2540############################################################################# 2890#############################################################################
2541 2891
2542package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 2979 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2980 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 2981 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 2982 . "visible $widget->{visible}";
2633 } 2983 }
2984
2985 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//;
2634 2987
2635 $self->add (new CFClient::UI::Label 2988 $self->add (new CFClient::UI::Label
2636 markup => $tooltip, 2989 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 2991 fontsize => 0.8,
… …
2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3001 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2649 3002
2650 ($w + 4, $h + 4) 3003 ($w + 4, $h + 4)
2651} 3004}
2652 3005
2653sub size_allocate { 3006sub invoke_size_allocate {
2654 my ($self, $w, $h) = @_; 3007 my ($self, $w, $h) = @_;
2655 3008
2656 $self->SUPER::size_allocate ($w - 4, $h - 4); 3009 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2657} 3010}
2658 3011
2659sub visibility_change { 3012sub invoke_visibility_change {
2660 my ($self, $visible) = @_; 3013 my ($self, $visible) = @_;
2661 3014
2662 return unless $visible; 3015 return unless $visible;
2663 3016
2664 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2665 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2666 or return; 3019 or return;
2667 3020
3021 if ($widget->{visible}) {
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 3023
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 3025 if $x + $self->{w} > $self->{root}{w};
2672 3026
2673 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2674 }); 3031 });
2675} 3032}
2676 3033
2677sub _draw { 3034sub _draw {
2678 my ($self) = @_; 3035 my ($self) = @_;
… …
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2766 3123
2767 if ($tex) { 3124 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 3125 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 3127 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2773 } 3130 }
2774} 3131}
2775 3132
2776sub DESTROY { 3133sub destroy {
2777 my ($self) = @_; 3134 my ($self) = @_;
2778 3135
2779 $self->{timer}->cancel 3136 $self->{timer}->cancel
2780 if $self->{timer}; 3137 if $self->{timer};
2781 3138
2782 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2783} 3140}
3141
3142#############################################################################
3143
3144package CFClient::UI::Buttonbar;
3145
3146our @ISA = CFClient::UI::HBox::;
3147
3148# TODO: should actualyl wrap buttons and other goodies.
2784 3149
2785############################################################################# 3150#############################################################################
2786 3151
2787package CFClient::UI::Menu; 3152package CFClient::UI::Menu;
2788 3153
… …
2800 ); 3165 );
2801 3166
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2803 3168
2804 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2806 3171
2807 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2808 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 {
2809 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2810 can_hover => 1, 3189 can_hover => 1,
2811 can_events => 1, 3190 can_events => 1,
2812 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2813 } 3194 }
2814 3195
2815 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2816 3197
2817 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2822 3203
2823# 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)
2824sub popup { 3205sub popup {
2825 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2826 3207
2827 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2828 3209
2829 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2830 $GRAB = $self; 3211 $GRAB = $self;
2831 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2832 3213
2833 $self->show; 3214 $self->show;
2834 $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);
2835} 3216}
2836 3217
2837sub mouse_motion { 3218sub invoke_mouse_motion {
2838 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2839 3220
2840 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2843}
2844 3224
3225 0
3226}
3227
2845sub button_up { 3228sub invoke_button_up {
2846 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2847 3230
2848 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2849 undef $GRAB; 3232 undef $GRAB;
2850 $self->hide; 3233 $self->hide;
2851 3234
2852 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
3237 } else {
3238 return 0
3239 }
3240
2854 } 3241 1
2855} 3242}
2856 3243
2857############################################################################# 3244#############################################################################
2858 3245
2859package CFClient::UI::Statusbox; 3246package CFClient::UI::Multiplexer;
2860 3247
2861our @ISA = CFClient::UI::VBox::; 3248our @ISA = CFClient::UI::Container::;
2862 3249
2863sub new { 3250sub new {
2864 my $class = shift; 3251 my $class = shift;
2865 3252
2866 $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::Combobox;
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 (
2867 fontsize => 0.8, 3432 fontsize => 0.8,
2868 @_, 3433 @_,
2869 ) 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
2870} 3441}
2871 3442
2872sub reorder { 3443sub reorder {
2873 my ($self) = @_; 3444 my ($self) = @_;
2874 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} };
2875 3451
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3454 }
2879 3455
… …
2882 my @items = sort { 3458 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
2886 3462
3463 $self->{timer}->interval (1);
3464
2887 my $count = 10 + 1; 3465 my $count = 10 + 1;
2888 for my $item (@items) { 3466 for my $item (@items) {
2889 last unless --$count; 3467 last unless --$count;
2890 3468
2891 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3473 : $item->{text};
2896 3474
… …
2904 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3488 can_events => 1,
2911 can_hover => 1 3489 can_hover => 1
2912 }; 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;
2913 } 3503 }
2914 3504
2915 $self->clear; 3505 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
2917} 3507}
… …
2922 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
2924 3514
2925 return unless $text; 3515 return unless $text;
2926 3516
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3518
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3520
2931 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
2933 $item->{count}++; 3523 $item->{count}++;
2934 } else { 3524 } else {
2935 $item->{count} = 1; 3525 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
2937 } 3527 }
2938 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3530 delete $item->{label};
2941 } else { 3531 } else {
2942 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
2949 count => 1, 3539 count => 1,
2950 %arg, 3540 %arg,
2951 }; 3541 };
2952 } 3542 }
2953 3543
3544 $ROOT->on_refresh (reorder => sub {
2954 $self->reorder; 3545 $self->reorder;
3546 });
2955} 3547}
2956 3548
2957sub reconfigure { 3549sub reconfigure {
2958 my ($self) = @_; 3550 my ($self) = @_;
2959 3551
… …
2962 3554
2963 $self->reorder; 3555 $self->reorder;
2964 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
2965} 3557}
2966 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
2967############################################################################# 3567#############################################################################
2968 3568
2969package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
2970 3570
2971our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
2972 3572
2973sub new { 3573sub new {
2974 my $class = shift; 3574 my $class = shift;
2975 3575
2976 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
2978 @_, 3579 @_,
2979 ); 3580 );
2980 3581
3582 $self->set_sort_order (undef);
3583
2981 $self 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;
2982} 3620}
2983 3621
2984sub set_items { 3622sub set_items {
2985 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
2986 3624
2987 $self->{scrolled}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
2988 return unless $items; 3626 $self->update_items;
2989
2990 my @items = sort {
2991 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name})
2993 } @$items;
2994
2995 $self->{real_items} = \@items;
2996
2997 my $row = 0;
2998 for my $item (@items) {
2999 CFClient::Item::update_widgets $item;
3000
3001 $self->{scrolled}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3004
3005 $row++;
3006 }
3007} 3627}
3008 3628
3009############################################################################# 3629#############################################################################
3010 3630
3011package CFClient::UI::BindEditor; 3631package CFClient::UI::SpellList;
3012 3632
3013our @ISA = CFClient::UI::FancyFrame::; 3633our @ISA = CFClient::UI::Table::;
3014 3634
3015sub new { 3635sub new {
3016 my $class = shift; 3636 my $class = shift;
3017 3637
3018 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3641 @_,
3642 )
3643}
3019 3644
3020 $self->add (my $vb = new CFClient::UI::VBox); 3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3021 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");
3022 3657
3023 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3658sub rebuild_spell_list {
3024 text => "start recording", 3659 my ($self) = @_;
3025 tooltip => "Start/Stops recording of actions." 3660
3026 ."All subsequent actions after the recording started will be captured." 3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3027 ."The actions are displayed after the record was stopped." 3662 $self->clear;
3028 ."To bind the action you have to click on the 'Bind' button", 3663
3029 on_activate => sub { 3664 return unless $::CONN;
3030 unless ($self->{recording}) { 3665
3031 $self->start; 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);
3032 } else { 3693 } else {
3033 $self->stop; 3694 return 0;
3695 }
3696
3697 1
3034 } 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);
3035 }); 3726 }
3036
3037 $vb->add (new CFClient::UI::Label text => "Actions:");
3038 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3039
3040 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3041 $vb->add (my $hb = new CFClient::UI::HBox);
3042 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3043 $hb->add (new CFClient::UI::Button
3044 text => "bind",
3045 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3046 on_activate => sub {
3047 $self->ask_for_bind;
3048 });
3049
3050 $vb->add (my $hb = new CFClient::UI::HBox);
3051 $hb->add (new CFClient::UI::Button
3052 text => "ok",
3053 expand => 1,
3054 tooltip => "This closes the binding editor and saves the binding",
3055 on_activate => sub {
3056 $self->hide;
3057 $self->commit;
3058 });
3059
3060 $hb->add (new CFClient::UI::Button
3061 text => "cancel",
3062 expand => 1,
3063 tooltip => "This closes the binding editor without saving",
3064 on_activate => sub {
3065 $self->hide;
3066 $self->{binding_cancel}->()
3067 if $self->{binding_cancel};
3068 });
3069
3070 $self->update_binding_widgets;
3071
3072 $self
3073}
3074
3075sub commit {
3076 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3080 ."'. Don't forget 'Save Config'!");
3081 $self->{binding_change}->($mod, $sym, $cmds)
3082 if $self->{binding_change};
3083 } else {
3084 $::STATUSBOX->add ("No action bound, no key or action specified!");
3085 $self->{binding_cancel}->()
3086 if $self->{binding_cancel};
3087 }
3088}
3089
3090sub start {
3091 my ($self) = @_;
3092
3093 $self->{rec_btn}->set_text ("stop recording");
3094 $self->{recording} = 1;
3095 $self->clear_command_list;
3096 $::CONN->start_record if $::CONN;
3097}
3098
3099sub stop {
3100 my ($self) = @_;
3101
3102 $self->{rec_btn}->set_text ("start recording");
3103 $self->{recording} = 0;
3104
3105 my $rec;
3106 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec);
3109}
3110
3111# if $commit is true, the binding will be set after the user entered a key combo
3112sub ask_for_bind {
3113 my ($self, $commit) = @_;
3114
3115 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets;
3119 $self->commit if $commit;
3120 }); 3727 });
3121} 3728}
3122 3729
3123# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands)
3125# $cb is the callback that is executed on OK
3126# $ccb is the callback that is executed on CANCEL and
3127# when the binding was unsuccessful on OK
3128sub set_binding {
3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3130
3131 $self->clear_command_list;
3132 $self->{recording} = 0;
3133 $self->{rec_btn}->set_text ("start recording");
3134
3135 $self->{binding} = [$mod, $sym];
3136 $self->{commands} = $cmds;
3137
3138 $self->{binding_change} = $cb;
3139 $self->{binding_cancel} = $ccb;
3140
3141 $self->update_binding_widgets;
3142}
3143
3144# this is a shortcut method that asks for a binding
3145# and then just binds it.
3146sub do_quick_binding {
3147 my ($self, $cmds) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1);
3152}
3153
3154sub update_binding_widgets {
3155 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding;
3157 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3158 $self->set_command_list ($cmds);
3159}
3160
3161sub get_binding {
3162 my ($self) = @_;
3163 return (
3164 $self->{binding}->[0],
3165 $self->{binding}->[1],
3166 [ grep { defined $_ } @{$self->{commands}} ]
3167 );
3168}
3169
3170sub clear_command_list {
3171 my ($self) = @_;
3172 $self->{cmdbox}->clear ();
3173}
3174
3175sub set_command_list {
3176 my ($self, $cmds) = @_;
3177
3178 $self->{cmdbox}->clear ();
3179 $self->{commands} = $cmds;
3180
3181 my $idx = 0;
3182
3183 for (@$cmds) {
3184 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3185
3186 my $i = $idx;
3187 $hb->add (new CFClient::UI::Label text => $_);
3188 $hb->add (new CFClient::UI::Button
3189 text => "delete",
3190 tooltip => "Deletes the action from the record",
3191 on_activate => sub {
3192 $self->{cmdbox}->remove ($hb);
3193 $cmds->[$i] = undef;
3194 });
3195
3196
3197 $idx++
3198 }
3199}
3200
3201#############################################################################
3202
3203package CFClient::UI::SpellList;
3204
3205our @ISA = CFClient::UI::FancyFrame::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3211
3212 $self->add (new CFClient::UI::ScrolledWindow
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3214
3215 $self;
3216}
3217
3218# XXX: Do sorting? Argl...
3219sub add_spell { 3730sub add_spell {
3220 my ($self, $spell) = @_; 3731 my ($self, $spell) = @_;
3732
3221 $self->{spells}->{$spell->{name}} = $spell; 3733 $self->{spell}->{$spell->{name}} = $spell;
3222 3734 $self->rebuild_spell_list;
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250} 3735}
3251 3736
3252sub remove_spell { 3737sub remove_spell {
3253 my ($self, $spell) = @_; 3738 my ($self, $spell) = @_;
3739
3254 delete $self->{spells}->{$spell->{name}}; 3740 delete $self->{spell}->{$spell->{name}};
3255 $self->rebuild_spell_list; 3741 $self->rebuild_spell_list;
3256} 3742}
3257 3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3258############################################################################# 3751#############################################################################
3259 3752
3260package CFClient::UI::Root; 3753package CFClient::UI::Root;
3261 3754
3262our @ISA = CFClient::UI::Container::; 3755our @ISA = CFClient::UI::Container::;
3756
3757use List::Util qw(min max);
3263 3758
3264use CFClient::OpenGL; 3759use CFClient::OpenGL;
3265 3760
3266sub new { 3761sub new {
3267 my $class = shift; 3762 my $class = shift;
… …
3294 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3295 3790
3296 int $coord + 0.5 3791 int $coord + 0.5
3297} 3792}
3298 3793
3299sub size_allocate { 3794sub invoke_size_allocate {
3300 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3301 3796
3302 for my $child ($self->children) { 3797 for my $child ($self->children) {
3303 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)};
3304 3799
… …
3308 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3310 3805
3311 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3312 } 3807 }
3808
3809 1
3313} 3810}
3314 3811
3315sub coord2local { 3812sub coord2local {
3316 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3317 3814
… …
3402 3899
3403 delete $queue{$widget+0}; 3900 delete $queue{$widget+0};
3404 3901
3405 my ($w, $h) = $widget->size_request; 3902 my ($w, $h) = $widget->size_request;
3406 3903
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3904 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $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};
3409 3909
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 3910 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 3911 $h = $widget->{force_h} if exists $widget->{force_h};
3412 3912
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3913 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3439 3939
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3441 3941
3442 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3443 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3444 3950
3445 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3446 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3447 3953
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3954 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3471 glLoadIdentity; 3977 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3978 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 3979 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 3980 glLoadIdentity;
3475 3981
3982 {
3983 package CFClient::UI::Base;
3984
3985 ($draw_x, $draw_y, $draw_w, $draw_h) =
3986 (0, 0, $self->{w}, $self->{h});
3987 }
3988
3476 $self->_draw; 3989 $self->_draw;
3477} 3990}
3478 3991
3479############################################################################# 3992#############################################################################
3480 3993

Diff Legend

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