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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.338 by root, Mon Jul 24 08:23:28 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 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
… …
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";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
345 371
346 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
348 374
349 # use alignment to adjust x, y 375 # use alignment to adjust x, y
350 376
351 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
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;
493
494 0
495}
496
497sub connect {
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
453} 531}
454 532
455sub find_widget { 533sub find_widget {
456 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
457 535
… …
467sub set_parent { 545sub set_parent {
468 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
469 547
470 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 550}
496 551
497sub realloc { 552sub realloc {
498 my ($self) = @_; 553 my ($self) = @_;
499 554
… …
529sub draw { 584sub draw {
530 my ($self) = @_; 585 my ($self) = @_;
531 586
532 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
533 588
589 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
536 592
537 return if $draw_x + $self->{w} < 0; 593 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 596
542 glPushMatrix; 597 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw;
545 glPopMatrix;
546 599
547 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
548 my ($x, $y) = @$self{qw(x y)};
549
550 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND; 602 glEnable GL_BLEND;
552 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS; 604 glBegin GL_QUADS;
554 glVertex $x , $y; 605 glVertex 0 , 0;
555 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
556 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
557 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
558 glEnd; 609 glEnd;
559 glDisable GL_BLEND; 610 glDisable GL_BLEND;
560 } 611 }
561 612
562 if ($ENV{CFPLUS_DEBUG} & 1) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix; 614 glPushMatrix;
564 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0; 618 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
571 glEnd; 622 glEnd;
572 glPopMatrix; 623 glPopMatrix;
573 #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;
574 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
575} 629}
576 630
577sub _draw { 631sub _draw {
578 my ($self) = @_; 632 my ($self) = @_;
579 633
… …
581} 635}
582 636
583sub DESTROY { 637sub DESTROY {
584 my ($self) = @_; 638 my ($self) = @_;
585 639
640 return if CFClient::in_destruct;
641
586 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
587 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
588} 646}
589 647
590############################################################################# 648#############################################################################
591 649
592package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
617 675
618 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
619 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
620 678
621 glEnable GL_BLEND; 679 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glColor @$color; 681 glColor_premultiply @$color;
624 682
625 glBegin GL_QUADS; 683 glBegin GL_QUADS;
626 glVertex 0 , 0; 684 glVertex 0 , 0;
627 glVertex 0 , $h; 685 glVertex 0 , $h;
628 glVertex $w, $h; 686 glVertex $w, $h;
… …
659our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
660 718
661sub new { 719sub new {
662 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
663 721
664 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
665 723
666 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
667 children => [], 725 children => [],
668 can_events => 0, 726 can_events => 0,
669 %arg, 727 %arg,
670 ); 728 );
729
671 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
672 732
673 $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;
674} 742}
675 743
676sub add { 744sub add {
677 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
678 746
… …
724 $x -= $self->{x}; 792 $x -= $self->{x};
725 $y -= $self->{y}; 793 $y -= $self->{y};
726 794
727 my $res; 795 my $res;
728 796
729 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
731 and return $res; 799 and return $res;
732 } 800 }
733 801
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
755} 823}
756 824
757sub add { 825sub add {
758 my ($self, $child) = @_; 826 my ($self, $child) = @_;
759 827
760 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
761
762 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
763} 830}
764 831
765sub remove { 832sub remove {
766 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
775 842
776sub size_request { 843sub size_request {
777 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
778} 845}
779 846
780sub size_allocate { 847sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
782 849
783 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
784} 853}
785 854
786############################################################################# 855#############################################################################
856
857# back-buffered drawing area
787 858
788package CFClient::UI::Window; 859package CFClient::UI::Window;
789 860
790our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
791 862
… …
802 873
803 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
804 $self->SUPER::update; 875 $self->SUPER::update;
805} 876}
806 877
807sub size_allocate { 878sub invoke_size_allocate {
808 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
809 880
810 $self->SUPER::size_allocate ($w, $h);
811 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
812} 884}
813 885
814sub _render { 886sub _render {
815 my ($self) = @_; 887 my ($self) = @_;
816 888
… …
843 my $tex = $self->{texture} 915 my $tex = $self->{texture}
844 or return; 916 or return;
845 917
846 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
849 921
850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851 923
852 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
853} 925}
… …
877 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
878 950
879 ($w, $h) 951 ($w, $h)
880} 952}
881 953
882sub size_allocate { 954sub invoke_size_allocate {
883 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
884 956
885 my $child = $self->child; 957 my $child = $self->child;
886 958
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889 961
890 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
891 $self->update; 963 $self->update;
964
965 1
892} 966}
893 967
894sub set_offset { 968sub set_offset {
895 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
896 970
… …
944package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
945 1019
946our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
947 1021
948sub new { 1022sub new {
949 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
950 1026
951 my $self; 1027 my $self;
952 1028
953 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
954 vertical => 1, 1030 vertical => 1,
… …
957 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
958 }, 1034 },
959 ; 1035 ;
960 1036
961 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
963 slider => $slider, 1040 slider => $slider,
964 @_, 1041 %arg,
965 ); 1042 );
966 1043
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
970 1046
971 $self 1047 $self
972} 1048}
973 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
974sub update { 1074sub update {
975 my ($self) = @_; 1075 my ($self) = @_;
976 1076
977 $self->SUPER::update; 1077 $self->SUPER::update;
978 1078
979 # todo: overwrite size_allocate of child 1079 $self->update_slider;
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982} 1080}
983 1081
984sub size_allocate { 1082sub invoke_size_allocate {
985 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
986 1084
1085 $self->update_slider;
1086
987 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
991} 1088}
992
993#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll
995 1089
996############################################################################# 1090#############################################################################
997 1091
998package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
999 1093
… …
1015 1109
1016 if ($self->{bg}) { 1110 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1018 1112
1019 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1022 1116
1023 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1118 glVertex 0 , 0;
1025 glVertex 0 , $h; 1119 glVertex 0 , $h;
1026 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1048my @border = 1142my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 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);
1051 1145
1052sub new { 1146sub new {
1053 my $class = shift; 1147 my ($class, %arg) = @_;
1054 1148
1055 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1152 border => 0.6,
1059 can_events => 1, 1153 can_events => 1,
1060 min_w => 16, 1154 min_w => 64,
1061 min_h => 16, 1155 min_h => 32,
1062 @_ 1156 %arg,
1063 ); 1157 );
1064 1158
1065 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1066 align => 0, 1160 align => 0,
1067 valign => 1, 1161 valign => 1,
1068 text => $self->{title}, 1162 text => $self->{title},
1069 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 }
1070 1174
1071 $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};
1072} 1184}
1073 1185
1074sub border { 1186sub border {
1075 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1076} 1188}
1077 1189
1078sub size_request { 1190sub size_request {
1079 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};
1080 1198
1081 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1082 1200
1083 ( 1201 (
1084 $w + $self->border * 2, 1202 $w + $self->border * 2,
1085 $h + $self->border * 2, 1203 $h + $self->border * 2,
1086 ) 1204 )
1087} 1205}
1088 1206
1089sub size_allocate { 1207sub invoke_size_allocate {
1090 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1091 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
1092 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1094 1220
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1099}
1100 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
1101sub button_down { 1237sub invoke_button_down {
1102 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1103 1239
1104 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1105 my $border = $self->border; 1241 my $border = $self->border;
1106 1242
… …
1122 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1123 1259
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1264 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1265 };
1130 1266
1131 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1137 1273
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1275
1140 $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});
1141 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1142 } 1284 1
1143} 1285}
1144 1286
1145sub button_up { 1287sub invoke_button_up {
1146 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1147 1289
1148 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1149} 1291}
1150 1292
1151sub mouse_motion { 1293sub invoke_mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1153 1295
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1155} 1299}
1156 1300
1157sub _draw { 1301sub _draw {
1158 my ($self) = @_; 1302 my ($self) = @_;
1159 1303
1304 my $child = $self->{children}[0];
1305
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1308
1163 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1311
1166 my $border = $self->border; 1312 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1328 }
1183 1329
1184 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1185 1331
1186 $self->{title}->draw if $self->{title};
1187
1188 $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};
1189} 1343}
1190 1344
1191############################################################################# 1345#############################################################################
1192 1346
1193package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1210sub children { 1364sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1212} 1366}
1213 1367
1214sub add { 1368sub add {
1215 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1216 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1217 $child->set_parent ($self); 1373 $child->set_parent ($self);
1218 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1219 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1220 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1221} 1386}
1222 1387
1223# 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?
1224sub clear { 1389sub clear {
1225 my ($self) = @_; 1390 my ($self) = @_;
… …
1266 (sum @$ws), 1431 (sum @$ws),
1267 (sum @$hs), 1432 (sum @$hs),
1268 ) 1433 )
1269} 1434}
1270 1435
1271sub size_allocate { 1436sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1273 1438
1274 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1275 1440
1276 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1308 } 1473 }
1309 1474
1310 $y += $row_h; 1475 $y += $row_h;
1311 } 1476 }
1312 1477
1478 1
1313} 1479}
1314 1480
1315sub find_widget { 1481sub find_widget {
1316 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1317 1483
… …
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 ) 1522 )
1357} 1523}
1358 1524
1359sub size_allocate { 1525sub invoke_size_allocate {
1360 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1361 1527
1362 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1363 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1364 1530
1365 my @req; 1531 my @req;
1366 1532
1367 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1368 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1369 } else { 1535 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1371 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1372 1538
1373 if ($req > $space) { 1539 if ($req > $space) {
1374 # ah well, not enough space 1540 # ah well, not enough space
1375 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1376 } else { 1542 } else {
1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1378 1544
1379 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1380 1546
1381 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1382 for 0 .. $#$children; 1548 for 0 .. $#children;
1383 } 1549 }
1384 } 1550 }
1385 1551
1386 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1387 1553
1388 my $pos = 0; 1554 my $pos = 0;
1389 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1390 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1391 $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));
1392 1558
1393 $pos += $alloc; 1559 $pos += $alloc;
1394 } 1560 }
1395 1561
1396 1 1562 1
… …
1469 } 1635 }
1470 1636
1471 $self 1637 $self
1472} 1638}
1473 1639
1474sub escape($) {
1475 local $_ = $_[0];
1476
1477 s/&/&amp;/g;
1478 s/>/&gt;/g;
1479 s/</&lt;/g;
1480
1481 $_
1482}
1483
1484sub update { 1640sub update {
1485 my ($self) = @_; 1641 my ($self) = @_;
1486 1642
1487 delete $self->{texture}; 1643 delete $self->{texture};
1488 $self->SUPER::update; 1644 $self->SUPER::update;
1489} 1645}
1490 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1491sub set_text { 1654sub set_text {
1492 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1493 1656
1494 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1496 1659
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1499 1661
1662 delete $self->{size_req};
1500 $self->realloc; 1663 $self->realloc;
1501 $self->update; 1664 $self->update;
1502} 1665}
1503 1666
1504sub set_markup { 1667sub set_markup {
… …
1507 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1508 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1509 1672
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1674
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1513 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1514 1676
1677 delete $self->{size_req};
1515 $self->realloc; 1678 $self->realloc;
1516 $self->update; 1679 $self->update;
1517} 1680}
1518 1681
1519sub size_request { 1682sub size_request {
1520 my ($self) = @_; 1683 my ($self) = @_;
1521 1684
1685 $self->{size_req} ||= do {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1691
1528 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1529 1693
1530 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1531 $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);
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1698
1534 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1535 1700
1536 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1538 } 1706 };
1539 1707
1540 ($w, $h) 1708 @{ $self->{size_req} }
1541} 1709}
1542 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1543sub size_allocate { 1715sub invoke_size_allocate {
1544 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1717
1718 delete $self->{ox};
1545 1719
1546 delete $self->{texture} 1720 delete $self->{texture}
1547 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
1548} 1724}
1549 1725
1550sub set_fontsize { 1726sub set_fontsize {
1551 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1552 1728
1553 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1554 delete $self->{texture}; 1731 delete $self->{texture};
1555 1732
1556 $self->realloc; 1733 $self->realloc;
1557} 1734}
1558 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1559sub _draw { 1745sub _draw {
1560 my ($self) = @_; 1746 my ($self) = @_;
1561 1747
1562 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1563 1749
1564 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1565 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1566 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1567 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1757
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$self->{layout}->size]
1759 };
1573 1760
1761 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1577 1765
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1581
1582 $tex
1583 }; 1769 };
1584 1770
1585 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1587 1773
1588 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1589 glColor @{$self->{fg}};
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else {
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 }
1594
1595 glDisable GL_TEXTURE_2D;
1596} 1775}
1597 1776
1598############################################################################# 1777#############################################################################
1599 1778
1600package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1614 can_hover => 1, 1793 can_hover => 1,
1615 can_focus => 1, 1794 can_focus => 1,
1616 valign => 0, 1795 valign => 0,
1617 can_events => 1, 1796 can_events => 1,
1618 #text => ... 1797 #text => ...
1798 #hidden => "*",
1619 @_ 1799 @_
1620 ) 1800 )
1621} 1801}
1622 1802
1623sub _set_text { 1803sub _set_text {
… …
1625 1805
1626 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1627 1807
1628 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1629 1809
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1811 $self->{text} = $text;
1634 1812
1635 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1637 1816
1638 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1639} 1821}
1640 1822
1641sub set_text { 1823sub set_text {
1642 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1643 1825
1644 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1827 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1828}
1649 1829
1650sub get_text { 1830sub get_text {
1651 $_[0]{text} 1831 $_[0]{text}
1652} 1832}
… …
1657 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1658 1838
1659 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1660} 1840}
1661 1841
1662sub key_down { 1842sub invoke_key_down {
1663 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1664 1844
1665 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1666 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1667 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1679 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1680 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1681 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1682 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1864 $self->emit ('escape');
1685 } elsif ($uni) { 1865 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1687 } 1869 }
1688 1870
1689 $self->_set_text ($text); 1871 $self->_set_text ($text);
1690 1872
1691 $self->realloc; 1873 $self->realloc;
1692}
1693 1874
1875 1
1876}
1877
1694sub focus_in { 1878sub invoke_focus_in {
1695 my ($self) = @_; 1879 my ($self) = @_;
1696 1880
1697 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1698 1882
1699 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1700} 1884}
1701 1885
1702sub button_down { 1886sub invoke_button_down {
1703 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1704 1888
1705 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1706 1890
1707 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1708 1892
1709 # byte-index to char-index 1893 # byte-index to char-index
1710 my $text = $self->{text}; 1894 my $text = $self->{text};
1711 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1713 1897
1714 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1715 $self->update; 1899 $self->update;
1900
1901 1
1716} 1902}
1717 1903
1718sub mouse_motion { 1904sub invoke_mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1720# 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
1721} 1909}
1722 1910
1723sub _draw { 1911sub _draw {
1724 my ($self) = @_; 1912 my ($self) = @_;
1725 1913
1726 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1727 1915
1728 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1731 } else { 1919 } else {
1732 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1733 } 1921 }
1734 1922
1735 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1926 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1766 1954
1767our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1768 1956
1769use CFClient::OpenGL; 1957use CFClient::OpenGL;
1770 1958
1771sub key_down { 1959sub invoke_key_down {
1772 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1773 1961
1774 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1775 1963
1776 if ($sym == 13) { 1964 if ($sym == 13) {
1777 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1778 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1779 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1781 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1782 $self->update; 1971 $self->update;
1783 1972
1784 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1802 } else { 1991 } else {
1803 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1804 } 1993 }
1805 1994
1806 } else { 1995 } else {
1807 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1808 } 1999 1
1809
1810} 2000}
1811 2001
1812############################################################################# 2002#############################################################################
1813 2003
1814package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1835 can_events => 1, 2025 can_events => 1,
1836 @_ 2026 @_
1837 ) 2027 )
1838} 2028}
1839 2029
1840sub activate { }
1841
1842sub button_up { 2030sub invoke_button_up {
1843 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1844 2032
1845 $self->emit ("activate") 2033 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1848} 2038}
1849 2039
1850sub _draw { 2040sub _draw {
1851 my ($self) = @_; 2041 my ($self) = @_;
1852 2042
1853 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 2044
1859 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1862 2048
… …
1899 my ($self) = @_; 2085 my ($self) = @_;
1900 2086
1901 (6) x 2 2087 (6) x 2
1902} 2088}
1903 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1904sub button_down { 2098sub invoke_button_down {
1905 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1906 2100
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 2103 $self->toggle;
1910 $self->_emit (changed => $self->{state}); 2104 } else {
2105 return 0
2106 }
2107
1911 } 2108 1
1912} 2109}
1913 2110
1914sub _draw { 2111sub _draw {
1915 my ($self) = @_; 2112 my ($self) = @_;
1916 2113
… …
1936package CFClient::UI::Image; 2133package CFClient::UI::Image;
1937 2134
1938our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
1939 2136
1940use CFClient::OpenGL; 2137use CFClient::OpenGL;
1941use Carp qw/confess/;
1942 2138
1943our %loaded_images; 2139our %texture_cache;
1944 2140
1945sub new { 2141sub new {
1946 my $class = shift; 2142 my $class = shift;
1947 2143
1948 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
1949 2148
1950 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
1951 2151
1952 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1953 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1954 2154
1955 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
1956 2156
1957 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1958
1959 $self->{aspect} = $tex->{w} / $tex->{h};
1960 2158
1961 $self 2159 $self
1962} 2160}
1963 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
1964sub size_request { 2177sub size_request {
1965 my ($self) = @_; 2178 my ($self) = @_;
1966 2179
1967 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1968} 2181}
1969 2182
1970sub _draw { 2183sub _draw {
1971 my ($self) = @_; 2184 my ($self) = @_;
1972 2185
… …
1982 } 2195 }
1983 2196
1984 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2199
1987 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
1988 2201
1989 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
1990} 2239}
1991 2240
1992############################################################################# 2241#############################################################################
1993 2242
1994package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2081 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2082 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2083 2332
2084 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2086 2338
2087 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2344
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
2108 2361
2109 if ($t3) { 2362 if ($t3) {
2110 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2111 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2112 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2113 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2114 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2115 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2116 glEnd; 2369 glEnd;
2117 } 2370 }
2118 2371
2119 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2207 $self->update; 2460 $self->update;
2208 2461
2209 $self 2462 $self
2210} 2463}
2211 2464
2212sub changed { }
2213
2214sub set_range { 2465sub set_range {
2215 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2216 2467
2217 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2218 2469
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2221} 2474}
2222 2475
2223sub set_value { 2476sub set_value {
2224 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2225 2478
… …
2236 if $unit; 2489 if $unit;
2237 2490
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239 2492
2240 if ($value != $old_value) { 2493 if ($value != $old_value) {
2241 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2242 $self->update; 2495 $self->update;
2243 } 2496 }
2244} 2497}
2245 2498
2246sub size_request { 2499sub size_request {
2247 my ($self) = @_; 2500 my ($self) = @_;
2248 2501
2249 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2250} 2503}
2251 2504
2252sub button_down { 2505sub invoke_button_down {
2253 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2254 2507
2255 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2256 2509
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2511
2259 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2260} 2513}
2261 2514
2262sub mouse_motion { 2515sub invoke_mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2264 2517
2265 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267 2520
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2522
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2524
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2525 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2526 } else {
2527 return 0;
2528 }
2529
2273 } 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2274} 2541}
2275 2542
2276sub update { 2543sub update {
2277 my ($self) = @_; 2544 my ($self) = @_;
2278 2545
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2546 delete $self->{knob_w};
2547 $self->SUPER::update;
2548}
2549
2550sub _draw {
2551 my ($self) = @_;
2552
2553 unless ($self->{knob_w}) {
2280 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2281 2555
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2557 my $range = ($hi - $page - $lo) || 1e-100;
2284 2558
… …
2290 $value = ($value - $lo) / $range; 2564 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2565 $value = $value * $self->{scale} + $self->{offset};
2292 2566
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2568 $self->{knob_w} = $knob_w;
2295 }); 2569 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2570
2303 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2304 2572
2305 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2306 2574
… …
2367sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2369 2637
2370############################################################################# 2638#############################################################################
2371 2639
2372package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2373 2641
2374our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2375 2643
2376use CFClient::OpenGL; 2644use CFClient::OpenGL;
2377 2645
2378sub new { 2646sub new {
2379 my $class = shift; 2647 my $class = shift;
2380 2648
2381 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2382 fontsize => 1, 2650 fontsize => 1,
2383 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2384 #font => default_font 2653 #font => default_font
2385 @_, 2654 @_,
2386 2655
2387 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2388 par => [], 2657 par => [],
2389 height => 0, 2658 height => 0,
2390 children => [ 2659 children => [
2391 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2392 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2403 2672
2404 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2405 $self->reflow; 2674 $self->reflow;
2406} 2675}
2407 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2408sub size_allocate { 2686sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2410 2688
2411 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2412 2691
2413 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2415 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2416 2696
2417 $self->reflow; 2697 $self->reflow;
2418}
2419 2698
2420sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2421 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2422 2715
2423 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2424 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2428 2729 );
2730
2429 $layout->size 2731 $layout
2430} 2732}
2431 2733
2432sub reflow { 2734sub reflow {
2433 my ($self) = @_; 2735 my ($self) = @_;
2434 2736
… …
2443 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2444} 2746}
2445 2747
2446sub clear { 2748sub clear {
2447 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2448 2753
2449 $self->{par} = []; 2754 $self->{par} = [];
2450 $self->{height} = 0; 2755 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452} 2757}
2453 2758
2454sub add_paragraph { 2759sub add_paragraph {
2455 my ($self, $color, $text, $indent) = @_; 2760 my $self = shift;
2456 2761
2457 for my $line (split /\n/, $text) { 2762 for my $para (@_) {
2458 my ($w, $h) = $self->text_size ($line); 2763 $para = {
2459 $self->{height} += $h; 2764 fg => [1, 1, 1, 1],
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 indent => 0,
2461 } 2766 markup => "",
2767 widget => [],
2768 ref $para ? %$para : (markup => $para),
2769 w => 1e10,
2770 wrapped => 1,
2771 };
2462 2772
2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para;
2775 }
2776
2777 $self->{need_reflow}++;
2778 $self->update;
2779}
2780
2781sub scroll_to_bottom {
2782 my ($self) = @_;
2783
2784 $self->{scroll_to_bottom} = 1;
2785 $self->update;
2464} 2786}
2465 2787
2466sub update { 2788sub update {
2467 my ($self) = @_; 2789 my ($self) = @_;
2468 2790
… …
2470 2792
2471 return unless $self->{h} > 0; 2793 return unless $self->{h} > 0;
2472 2794
2473 delete $self->{texture}; 2795 delete $self->{texture};
2474 2796
2475 $ROOT->on_post_alloc ($self, sub { 2797 $ROOT->on_post_alloc ($self => sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2798 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477 2799
2478 if (delete $self->{need_reflow}) { 2800 if (delete $self->{need_reflow}) {
2479 my $height = 0; 2801 my $height = 0;
2480 2802
2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2485 for (@{$self->{par}}) { 2803 for my $para (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2804 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2487 $layout->set_width ($W - $_->[3]); 2805 my $layout = $self->get_layout ($para);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size; 2806 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3]; 2807
2491 $_->[1] = $h; 2808 $para->{w} = $w + $para->{indent};
2809 $para->{h} = $h;
2810 $para->{wrapped} = $layout->has_wrapped;
2492 } 2811 }
2493 2812
2494 $height += $_->[1]; 2813 $height += $para->{h};
2495 } 2814 }
2496 2815
2497 $self->{height} = $height; 2816 $self->{height} = $height;
2498 2817
2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2818 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2500 2819
2501 delete $self->{texture}; 2820 delete $self->{texture};
2502 } 2821 }
2503 2822
2823 if (delete $self->{scroll_to_bottom}) {
2824 $self->{children}[1]->set_value (1e10);
2825 }
2826
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2827 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2828 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2829 glClear GL_COLOR_BUFFER_BIT;
2507 2830
2508 my $top = int $self->{children}[1]{range}[0]; 2831 my $top = int $self->{children}[1]{range}[0];
2509 2832
2510 my $y0 = $top; 2833 my $y0 = $top;
2511 my $y1 = $top + $H; 2834 my $y1 = $top + $H;
2512 2835
2513 my $y = 0; 2836 my $y = 0;
2514 2837
2515 my $layout = $self->{layout};
2516
2517 $layout->set_font ($self->{font}) if $self->{font};
2518
2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522
2523 for my $par (@{$self->{par}}) { 2838 for my $para (@{$self->{par}}) {
2524 my $h = $par->[1]; 2839 my $h = $para->{h};
2525 2840
2526 if ($y0 < $y + $h && $y < $y1) { 2841 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2529 $layout->set_markup ($par->[4]);
2530 2842
2531 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2843 my $layout = $self->get_layout ($para);
2532 2844
2533 glRasterPos $par->[3], $y - $y0; 2845 $layout->render ($para->{indent}, $y - $y0);
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2846
2847 if (my @w = @{ $para->{widget} }) {
2848 my @s = $layout->get_shapes;
2849
2850 for (@w) {
2851 my ($dx, $dy) = splice @s, 0, 2, ();
2852
2853 $_->{x} = $dx + $para->{indent};
2854 $_->{y} = $dy + $y - $y0;
2855
2856 $_->draw;
2857 }
2858 }
2535 } 2859 }
2536 2860
2537 $y += $h; 2861 $y += $h;
2538 } 2862 }
2539
2540 glDisable GL_BLEND;
2541 }; 2863 };
2542 }); 2864 });
2543} 2865}
2544 2866
2867sub reconfigure {
2868 my ($self) = @_;
2869
2870 $self->SUPER::reconfigure;
2871
2872 $_->{w} = 1e10 for @{ $self->{par} };
2873 $self->reflow;
2874}
2875
2545sub _draw { 2876sub _draw {
2546 my ($self) = @_; 2877 my ($self) = @_;
2547 2878
2548 glEnable GL_TEXTURE_2D; 2879 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2880 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2881 glColor 0, 0, 0, 1;
2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2882 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552 glDisable GL_TEXTURE_2D; 2883 glDisable GL_TEXTURE_2D;
2553 2884
2554 $self->{children}[1]->draw; 2885 $self->{children}[1]->draw;
2555
2556} 2886}
2557 2887
2558############################################################################# 2888#############################################################################
2559 2889
2560package CFClient::UI::Animator; 2890package CFClient::UI::Animator;
… …
2647 $tooltip .= "\n\n" . (ref $widget) . "\n" 2977 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2978 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n" 2979 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}"; 2980 . "visible $widget->{visible}";
2651 } 2981 }
2982
2983 $tooltip =~ s/^\n+//;
2984 $tooltip =~ s/\n+$//;
2652 2985
2653 $self->add (new CFClient::UI::Label 2986 $self->add (new CFClient::UI::Label
2654 markup => $tooltip, 2987 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2988 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8, 2989 fontsize => 0.8,
… …
2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2999 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2667 3000
2668 ($w + 4, $h + 4) 3001 ($w + 4, $h + 4)
2669} 3002}
2670 3003
2671sub size_allocate { 3004sub invoke_size_allocate {
2672 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2673 3006
2674 $self->SUPER::size_allocate ($w - 4, $h - 4); 3007 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2675} 3008}
2676 3009
2677sub visibility_change { 3010sub invoke_visibility_change {
2678 my ($self, $visible) = @_; 3011 my ($self, $visible) = @_;
2679 3012
2680 return unless $visible; 3013 return unless $visible;
2681 3014
2682 $self->{root}->on_post_alloc ("move_$self" => sub { 3015 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner} 3016 my $widget = $self->{owner}
2684 or return; 3017 or return;
2685 3018
3019 if ($widget->{visible}) {
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3020 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687 3021
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3022 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH; 3023 if $x + $self->{w} > $self->{root}{w};
2690 3024
2691 $self->move_abs ($x, $y); 3025 $self->move_abs ($x, $y);
3026 } else {
3027 $self->hide;
3028 }
2692 }); 3029 });
2693} 3030}
2694 3031
2695sub _draw { 3032sub _draw {
2696 my ($self) = @_; 3033 my ($self) = @_;
… …
2722 3059
2723############################################################################# 3060#############################################################################
2724 3061
2725package CFClient::UI::Face; 3062package CFClient::UI::Face;
2726 3063
2727our @ISA = CFClient::UI::Base::; 3064our @ISA = CFClient::UI::DrawBG::;
2728 3065
2729use CFClient::OpenGL; 3066use CFClient::OpenGL;
2730 3067
2731sub new { 3068sub new {
2732 my $class = shift; 3069 my $class = shift;
… …
2769sub _draw { 3106sub _draw {
2770 my ($self) = @_; 3107 my ($self) = @_;
2771 3108
2772 return unless $::CONN; 3109 return unless $::CONN;
2773 3110
3111 $self->SUPER::_draw;
3112
2774 my $face; 3113 my $face;
2775 3114
2776 if ($self->{frame}) { 3115 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}]; 3116 my $anim = $::CONN->{anim}[$self->{anim}];
2778 3117
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 3123
2785 if ($tex) { 3124 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 3125 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 3127 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2791 } 3130 }
2792} 3131}
2793 3132
2794sub DESTROY { 3133sub destroy {
2795 my ($self) = @_; 3134 my ($self) = @_;
2796 3135
2797 $self->{timer}->cancel 3136 $self->{timer}->cancel
2798 if $self->{timer}; 3137 if $self->{timer};
2799 3138
2800 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2801} 3140}
3141
3142#############################################################################
3143
3144package CFClient::UI::Buttonbar;
3145
3146our @ISA = CFClient::UI::HBox::;
3147
3148# TODO: should actualyl wrap buttons and other goodies.
2802 3149
2803############################################################################# 3150#############################################################################
2804 3151
2805package CFClient::UI::Menu; 3152package CFClient::UI::Menu;
2806 3153
… …
2818 ); 3165 );
2819 3166
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821 3168
2822 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2824 3171
2825 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2826 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 {
2827 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2828 can_hover => 1, 3189 can_hover => 1,
2829 can_events => 1, 3190 can_events => 1,
2830 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2831 } 3194 }
2832 3195
2833 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2834 3197
2835 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2840 3203
2841# 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)
2842sub popup { 3205sub popup {
2843 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2844 3207
2845 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2846 3209
2847 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3211 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2850 3213
2851 $self->show; 3214 $self->show;
2852 $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);
2853} 3216}
2854 3217
2855sub mouse_motion { 3218sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2857 3220
2858 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3224
3225 0
3226}
3227
2863sub button_up { 3228sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2865 3230
2866 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3232 undef $GRAB;
2868 $self->hide; 3233 $self->hide;
2869 3234
2870 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
3237 } else {
3238 return 0
3239 }
3240
2872 } 3241 1
2873} 3242}
2874 3243
2875############################################################################# 3244#############################################################################
2876 3245
2877package CFClient::UI::Statusbox; 3246package CFClient::UI::Multiplexer;
2878 3247
2879our @ISA = CFClient::UI::VBox::; 3248our @ISA = CFClient::UI::Container::;
2880 3249
2881sub new { 3250sub new {
2882 my $class = shift; 3251 my $class = shift;
2883 3252
2884 $class->SUPER::new ( 3253 my $self = $class->SUPER::new (
3254 @_,
3255 );
3256
3257 $self->{current} = $self->{children}[0]
3258 if @{ $self->{children} };
3259
3260 $self
3261}
3262
3263sub add {
3264 my ($self, @widgets) = @_;
3265
3266 $self->SUPER::add (@widgets);
3267
3268 $self->{current} = $self->{children}[0]
3269 if @{ $self->{children} };
3270}
3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
3278sub set_current_page {
3279 my ($self, $page_or_widget) = @_;
3280
3281 my $widget = ref $page_or_widget
3282 ? $page_or_widget
3283 : $self->{children}[$page_or_widget];
3284
3285 $self->{current} = $widget;
3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3287
3288 $self->emit (page_changed => $self->{current});
3289
3290 $self->realloc;
3291}
3292
3293sub visible_children {
3294 $_[0]{current}
3295}
3296
3297sub size_request {
3298 my ($self) = @_;
3299
3300 $self->{current}->size_request
3301}
3302
3303sub invoke_size_allocate {
3304 my ($self, $w, $h) = @_;
3305
3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3309}
3310
3311sub _draw {
3312 my ($self) = @_;
3313
3314 $self->{current}->draw;
3315}
3316
3317#############################################################################
3318
3319package CFClient::UI::Notebook;
3320
3321our @ISA = CFClient::UI::VBox::;
3322
3323sub new {
3324 my $class = shift;
3325
3326 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self
3330 @_,
3331 );
3332
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3334 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3335
3336 $self
3337}
3338
3339sub add {
3340 my ($self, $title, $widget, $tooltip) = @_;
3341
3342 Scalar::Util::weaken $self;
3343
3344 $self->{buttonbar}->add (new CFClient::UI::Button
3345 markup => $title,
3346 tooltip => $tooltip,
3347 on_activate => sub { $self->set_current_page ($widget) },
3348 );
3349
3350 $self->{multiplexer}->add ($widget);
3351}
3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3359sub set_current_page {
3360 my ($self, $page) = @_;
3361
3362 $self->{multiplexer}->set_current_page ($page);
3363 $self->emit (page_changed => $self->{multiplexer}{current});
3364}
3365
3366#############################################################################
3367
3368package CFClient::UI::Selector;
3369
3370use utf8;
3371
3372our @ISA = CFClient::UI::Button::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 options => [], # [value, title, longdesc], ...
3379 value => undef,
3380 @_,
3381 );
3382
3383 $self->_set_value ($self->{value});
3384
3385 $self
3386}
3387
3388sub invoke_button_down {
3389 my ($self, $ev) = @_;
3390
3391 my @menu_items;
3392
3393 for (@{ $self->{options} }) {
3394 my ($value, $title, $tooltip) = @$_;
3395
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 }
3398
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400}
3401
3402sub _set_value {
3403 my ($self, $value) = @_;
3404
3405 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3406 or return;
3407
3408 $self->{value} = $item->[0];
3409 $self->set_markup ("$item->[1] ⇓");
3410 $self->set_tooltip ($item->[2]);
3411}
3412
3413sub set_value {
3414 my ($self, $value) = @_;
3415
3416 return unless $self->{value} ne $value;
3417
3418 $self->_set_value ($value);
3419 $self->emit (changed => $value);
3420}
3421
3422#############################################################################
3423
3424package CFClient::UI::Statusbox;
3425
3426our @ISA = CFClient::UI::VBox::;
3427
3428sub new {
3429 my $class = shift;
3430
3431 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3432 fontsize => 0.8,
2886 @_, 3433 @_,
2887 ) 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
2888} 3441}
2889 3442
2890sub reorder { 3443sub reorder {
2891 my ($self) = @_; 3444 my ($self) = @_;
2892 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} };
2893 3451
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3454 }
2897 3455
… …
2900 my @items = sort { 3458 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
2904 3462
3463 $self->{timer}->interval (1);
3464
2905 my $count = 10 + 1; 3465 my $count = 10 + 1;
2906 for my $item (@items) { 3466 for my $item (@items) {
2907 last unless --$count; 3467 last unless --$count;
2908 3468
2909 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3473 : $item->{text};
2914 3474
… …
2922 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3488 can_events => 1,
2929 can_hover => 1 3489 can_hover => 1
2930 }; 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;
2931 } 3503 }
2932 3504
2933 $self->clear; 3505 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
2935} 3507}
… …
2940 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
2942 3514
2943 return unless $text; 3515 return unless $text;
2944 3516
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3518
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3520
2949 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
2951 $item->{count}++; 3523 $item->{count}++;
2952 } else { 3524 } else {
2953 $item->{count} = 1; 3525 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
2955 } 3527 }
2956 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
2957 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
2958 delete $item->{label}; 3530 delete $item->{label};
2959 } else { 3531 } else {
2960 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
2961 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
2967 count => 1, 3539 count => 1,
2968 %arg, 3540 %arg,
2969 }; 3541 };
2970 } 3542 }
2971 3543
3544 $ROOT->on_refresh (reorder => sub {
2972 $self->reorder; 3545 $self->reorder;
3546 });
2973} 3547}
2974 3548
2975sub reconfigure { 3549sub reconfigure {
2976 my ($self) = @_; 3550 my ($self) = @_;
2977 3551
… …
2980 3554
2981 $self->reorder; 3555 $self->reorder;
2982 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
2983} 3557}
2984 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
2985############################################################################# 3567#############################################################################
2986 3568
2987package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
2988 3570
2989our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
2990 3572
2991sub new { 3573sub new {
2992 my $class = shift; 3574 my $class = shift;
2993 3575
2994 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
2996 @_, 3579 @_,
2997 ); 3580 );
2998 3581
3582 $self->set_sort_order (undef);
3583
2999 $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;
3000} 3620}
3001 3621
3002sub set_items { 3622sub set_items {
3003 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3004 3624
3005 $self->{scrolled}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3006 return unless $items; 3626 $self->update_items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025} 3627}
3026 3628
3027############################################################################# 3629#############################################################################
3028 3630
3029package CFClient::UI::BindEditor; 3631package CFClient::UI::SpellList;
3030 3632
3031our @ISA = CFClient::UI::FancyFrame::; 3633our @ISA = CFClient::UI::Table::;
3032 3634
3033sub new { 3635sub new {
3034 my $class = shift; 3636 my $class = shift;
3035 3637
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3641 @_,
3642 )
3643}
3037 3644
3038 $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>";
3039 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");
3040 3657
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3658sub rebuild_spell_list {
3042 text => "start recording", 3659 my ($self) = @_;
3043 tooltip => "Start/Stops recording of actions." 3660
3044 ."All subsequent actions after the recording started will be captured." 3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3045 ."The actions are displayed after the record was stopped." 3662 $self->clear;
3046 ."To bind the action you have to click on the 'Bind' button", 3663
3047 on_activate => sub { 3664 return unless $::CONN;
3048 unless ($self->{recording}) { 3665
3049 $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);
3050 } else { 3693 } else {
3051 $self->stop; 3694 return 0;
3695 }
3696
3697 1
3052 } 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);
3053 }); 3726 }
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 }); 3727 });
3139} 3728}
3140 3729
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3148
3149 $self->clear_command_list;
3150 $self->{recording} = 0;
3151 $self->{rec_btn}->set_text ("start recording");
3152
3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3171
3172sub update_binding_widgets {
3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell { 3730sub add_spell {
3238 my ($self, $spell) = @_; 3731 my ($self, $spell) = @_;
3732
3239 $self->{spells}->{$spell->{name}} = $spell; 3733 $self->{spell}->{$spell->{name}} = $spell;
3240 3734 $self->rebuild_spell_list;
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268} 3735}
3269 3736
3270sub remove_spell { 3737sub remove_spell {
3271 my ($self, $spell) = @_; 3738 my ($self, $spell) = @_;
3739
3272 delete $self->{spells}->{$spell->{name}}; 3740 delete $self->{spell}->{$spell->{name}};
3273 $self->rebuild_spell_list; 3741 $self->rebuild_spell_list;
3274} 3742}
3275 3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3276############################################################################# 3751#############################################################################
3277 3752
3278package CFClient::UI::Root; 3753package CFClient::UI::Root;
3279 3754
3280our @ISA = CFClient::UI::Container::; 3755our @ISA = CFClient::UI::Container::;
3756
3757use List::Util qw(min max);
3281 3758
3282use CFClient::OpenGL; 3759use CFClient::OpenGL;
3283 3760
3284sub new { 3761sub new {
3285 my $class = shift; 3762 my $class = shift;
… …
3312 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3313 3790
3314 int $coord + 0.5 3791 int $coord + 0.5
3315} 3792}
3316 3793
3317sub size_allocate { 3794sub invoke_size_allocate {
3318 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3319 3796
3320 for my $child ($self->children) { 3797 for my $child ($self->children) {
3321 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)};
3322 3799
… …
3326 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3328 3805
3329 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3330 } 3807 }
3808
3809 1
3331} 3810}
3332 3811
3333sub coord2local { 3812sub coord2local {
3334 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3335 3814
… …
3420 3899
3421 delete $queue{$widget+0}; 3900 delete $queue{$widget+0};
3422 3901
3423 my ($w, $h) = $widget->size_request; 3902 my ($w, $h) = $widget->size_request;
3424 3903
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3904 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $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};
3427 3909
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3910 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3911 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3912
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3913 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3457 3939
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3459 3941
3460 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3461 $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 $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950
3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3462 3953
3463 $w = int $w + 0.5; 3954 $w = int $w + 0.5;
3464 $h = int $h + 0.5; 3955 $h = int $h + 0.5;
3465 3956
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3957 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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