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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
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 CFPlus;
11use CFPlus::Pod;
10use CFClient::Texture; 12use CFPlus::Texture;
11 13
12our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
13 15
14our $LAYOUT; 16our $LAYOUT;
15our $ROOT; 17our $ROOT;
16our $TOOLTIP; 18our $TOOLTIP;
17our $BUTTON_STATE; 19our $BUTTON_STATE;
18 20
19our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
22
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31
32 return if $ENV{CFPLUS_DEBUG} & 8;
33
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show;
40 }
41
42 return;
43 }
44 }
45 }
46
47 $TOOLTIP->hide;
48 delete $TOOLTIP->{owner};
49});
20 50
21sub get_layout { 51sub get_layout {
22 my $layout; 52 my $layout;
23 53
24 for (grep { $_->{name} } values %WIDGET) { 54 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 69 my ($layout) = @_;
40 70
41 $LAYOUT = $layout; 71 $LAYOUT = $layout;
42} 72}
43 73
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 74# class methods for events
73sub feed_sdl_key_down_event { 75sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 76 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 77 if $FOCUS;
76} 78}
… …
78sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 82 if $FOCUS;
81} 83}
82 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
83sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
84 my ($ev) = @_; 99 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
86 101
87 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
89 106
90 $GRAB = $widget; 107 $GRAB = $widget;
91 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
92 109
93 check_tooltip; 110 $TOOLTIP_WATCHER->cb->();
94 } 111 }
95 112
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
97 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
99 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
100} 123}
101 124
102sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
103 my ($ev) = @_; 126 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 127
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 129
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 131
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
111 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 134
113 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 137 $grab->update if $grab;
116 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
117 139
118 check_tooltip; 140 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->();
119 } 142 }
120} 143}
121 144
122sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
123 my ($ev) = @_; 146 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
125 148
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 150
128 if ($widget != $HOVER) { 151 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 152
131 $hover->update if $hover && $hover->{can_hover}; 153 $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; 154 if $HOVER;
139} 155}
140 156
141# convert position array to integers 157# convert position array to integers
142sub harmonize { 158sub harmonize {
… …
192 reconfigure_widgets; 208 reconfigure_widgets;
193} 209}
194 210
195############################################################################# 211#############################################################################
196 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
197package CFClient::UI::Base; 221package CFPlus::UI::Base;
198 222
199use strict; 223use strict;
200 224
201use CFClient::OpenGL; 225use CFPlus::OpenGL;
202 226
203sub new { 227sub new {
204 my $class = shift; 228 my $class = shift;
205 229
206 my $self = bless { 230 my $self = bless {
… …
211 h => undef, 235 h => undef,
212 can_events => 1, 236 can_events => 1,
213 @_ 237 @_
214 }, $class; 238 }, $class;
215 239
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 241
218 for (keys %$self) { 242 for (keys %$self) {
219 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
221 } 245 }
222 } 246 }
223 247
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 253
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 256
233 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
246sub show { 270sub show {
247 my ($self) = @_; 271 my ($self) = @_;
248 272
249 return if $self->{parent}; 273 return if $self->{parent};
250 274
251 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
252} 276}
253 277
254sub set_visible { 278sub set_visible {
255 my ($self) = @_; 279 my ($self) = @_;
256 280
… …
271 295
272 return unless $self->{visible}; 296 return unless $self->{visible};
273 297
274 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
275 299
300 delete $self->{visible};
276 delete $self->{root}; 301 delete $self->{root};
277 delete $self->{visible};
278 302
279 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
281 305
282 CFClient::UI::check_tooltip 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
284 308
285 $self->focus_out; 309 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
288} 311}
289 312
290sub set_visibility { 313sub set_visibility {
291 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
314} 337}
315 338
316sub move_abs { 339sub move_abs {
317 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
318 341
319 $self->{x} = List::Util::max 0, int $x; 342 $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; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
322 345
323 $self->update; 346 $self->update;
324} 347}
325 348
… …
335sub size_request { 358sub size_request {
336 require Carp; 359 require Carp;
337 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
338} 361}
339 362
363sub baseline_shift {
364 0
365}
366
340sub configure { 367sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
342 369
343 if ($self->{aspect}) { 370 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
345 372
346 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 375
349 # use alignment to adjust x, y 376 # use alignment to adjust x, y
350 377
351 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
366 393
367 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
368 } 395 }
369} 396}
370 397
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 398sub children {
376 # nop 399 # nop
377} 400}
378 401
379sub visible_children { 402sub visible_children {
… …
381} 404}
382 405
383sub set_max_size { 406sub set_max_size {
384 my ($self, $w, $h) = @_; 407 my ($self, $w, $h) = @_;
385 408
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 409 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 410 $self->{max_h} = int $h if defined $h;
411
412 $self->realloc;
388} 413}
389 414
390sub set_tooltip { 415sub set_tooltip {
391 my ($self, $tooltip) = @_; 416 my ($self, $tooltip) = @_;
392 417
… …
395 420
396 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
397 422
398 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
399 424
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 428 }
404} 429}
405 430
406# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
407sub coord2local { 432sub coord2local {
408 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
409 434
435 Carp::confess unless $self->{parent};#d#
436
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 438}
412 439
413# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
414sub coord2global { 441sub coord2global {
415 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
416 443
444 Carp::confess unless $self->{parent};#d#
445
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 447}
419 448
420sub focus_in { 449sub invoke_focus_in {
421 my ($self) = @_; 450 my ($self) = @_;
422 451
423 return if $FOCUS == $self; 452 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
425 454
426 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
427 456
428 $self->_emit (focus_in => $focus); 457 $self->update;
429 458
430 $focus->update if $focus; 459 0
431 $FOCUS->update;
432} 460}
433 461
434sub focus_out { 462sub invoke_focus_out {
435 my ($self) = @_; 463 my ($self) = @_;
436 464
437 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
438 466
439 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
440 468
441 $self->_emit (focus_out => $focus); 469 $self->update;
442 470
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 472 unless $FOCUS;
447}
448 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
449sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 485sub invoke_button_up { 0 }
451sub key_down { 0 } 486sub invoke_key_down { 0 }
452sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
453 489
454sub button_down { 490sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
456 492
457 $self->focus_in; 493 $self->grab_focus;
458 494
459 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, either.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 if ($self->{tooltip} =~ /Apply.*audio/) {
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
530 warn "3 $self->{parent}\n";#d#
531 }
532
533 #d##TODO# stop propagating at first true, do not use sum
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
460} 545}
461 546
462sub find_widget { 547sub find_widget {
463 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
464 549
… …
474sub set_parent { 559sub set_parent {
475 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
476 561
477 Scalar::Util::weaken ($self->{parent} = $parent); 562 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
506 568
… …
539 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
540 602
541 # update screen rectangle 603 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 606
547 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 610
… …
573 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
576 glEnd; 636 glEnd;
577 glPopMatrix; 637 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 } 639 }
580 640
581 $self->_draw; 641 $self->_draw;
582 glPopMatrix; 642 glPopMatrix;
583} 643}
… …
589} 649}
590 650
591sub DESTROY { 651sub DESTROY {
592 my ($self) = @_; 652 my ($self) = @_;
593 653
654 return if CFPlus::in_destruct;
655
594 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
595 #$self->deactivate; 657
658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 660}
597 661
598############################################################################# 662#############################################################################
599 663
600package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
601 665
602our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
603 667
604use strict; 668use strict;
605use CFClient::OpenGL; 669use CFPlus::OpenGL;
606 670
607sub new { 671sub new {
608 my $class = shift; 672 my $class = shift;
609 673
610 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
641 } 705 }
642} 706}
643 707
644############################################################################# 708#############################################################################
645 709
646package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
647 711
648our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
649 713
650sub new { 714sub new {
651 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
653} 717}
… …
660 724
661sub draw { } 725sub draw { }
662 726
663############################################################################# 727#############################################################################
664 728
665package CFClient::UI::Container; 729package CFPlus::UI::Container;
666 730
667our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
668 732
669sub new { 733sub new {
670 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
671 735
672 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
681 if $children; 745 if $children;
682 746
683 $self 747 $self
684} 748}
685 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
686sub add { 758sub add {
687 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
688 760
689 $_->set_parent ($self) 761 $_->set_parent ($self)
690 for @widgets; 762 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
751} 823}
752 824
753############################################################################# 825#############################################################################
754 826
755package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
756 828
757our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
758 830
759sub new { 831sub new {
760 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
761 833
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 835
764 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
765} 837}
766 838
767sub add { 839sub add {
768 my ($self, $child) = @_; 840 my ($self, $child) = @_;
769 841
770 $self->{children} = []; 842 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 843 $self->SUPER::add ($child);
773} 844}
774 845
775sub remove { 846sub remove {
776 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
777 848
778 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
779 850
780 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
781 unless @{$self->{children}}; 852 unless @{$self->{children}};
782} 853}
783 854
784sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
785 856
786sub size_request { 857sub size_request {
787 $_[0]{children}[0]->size_request 858 $_[0]{children}[0]->size_request
788} 859}
789 860
790sub size_allocate { 861sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
792 863
793 $self->{children}[0]->configure (0, 0, $w, $h); 864 $self->{children}[0]->configure (0, 0, $w, $h);
865
866 1
794} 867}
795 868
796############################################################################# 869#############################################################################
797 870
798# back-buffered drawing area 871# back-buffered drawing area
799 872
800package CFClient::UI::Window; 873package CFPlus::UI::Window;
801 874
802our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
803 876
804use CFClient::OpenGL; 877use CFPlus::OpenGL;
805 878
806sub new { 879sub new {
807 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
808 881
809 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
814 887
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 888 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 889 $self->SUPER::update;
817} 890}
818 891
819sub size_allocate { 892sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
821 894
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 895 $self->update;
896
897 $self->SUPER::invoke_size_allocate ($w, $h)
824} 898}
825 899
826sub _render { 900sub _render {
827 my ($self) = @_; 901 my ($self) = @_;
828 902
… …
830} 904}
831 905
832sub render_child { 906sub render_child {
833 my ($self) = @_; 907 my ($self) = @_;
834 908
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
838 912
839 { 913 {
840 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
841 915
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
844 } 920 }
845
846 $self->_render;
847 }; 921 };
848} 922}
849 923
850sub _draw { 924sub _draw {
851 my ($self) = @_; 925 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 926
855 my $tex = $self->{texture} 927 my $tex = $self->{texture}
856 or return; 928 or return;
857 929
858 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 932 glColor 0, 0, 0, 1;
863 933
864 $tex->draw_quad (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
865 935
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
868} 937}
869 938
870############################################################################# 939#############################################################################
871 940
872package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
873 942
874our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
875 944
876sub new { 945sub new {
877 my $class = shift; 946 my $class = shift;
878 947
879 $class->SUPER::new ( 948 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 961 $h = 10 if $self->{scroll_y};
893 962
894 ($w, $h) 963 ($w, $h)
895} 964}
896 965
897sub size_allocate { 966sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
899 968
900 my $child = $self->child; 969 my $child = $self->child;
901 970
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 971 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 972 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 973
905 $self->child->configure (0, 0, $w, $h); 974 $self->child->configure (0, 0, $w, $h);
906 $self->update; 975 $self->update;
976
977 1
907} 978}
908 979
909sub set_offset { 980sub set_offset {
910 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
911 982
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1010 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1012 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1014 }
944} 1015}
945 1016
946sub _render { 1017sub _render {
947 my ($self) = @_; 1018 my ($self) = @_;
948 1019
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1020 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1022
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1024
954 $self->SUPER::_render; 1025 $self->SUPER::_render;
955} 1026}
956 1027
957############################################################################# 1028#############################################################################
958 1029
959package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
960 1031
961our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
962 1033
963sub new { 1034sub new {
964 my ($class, %arg) = @_; 1035 my ($class, %arg) = @_;
965 1036
966 my $child = delete $arg{child}; 1037 my $child = delete $arg{child};
967 1038
968 my $self; 1039 my $self;
969 1040
970 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1042 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1044 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
975 }, 1046 },
976 ; 1047 ;
977 1048
978 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
980 slider => $slider, 1052 slider => $slider,
981 %arg, 1053 %arg,
982 ); 1054 );
983 1055
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1057 $self->add ($child) if $child;
986 1058
987 $self 1059 $self
988} 1060}
989 1061
1062#TODO# update range on size_allocate depending on child
1063
990sub add { 1064sub add {
991 my ($self, $widget) = @_; 1065 my ($self, $widget) = @_;
992 1066
993 $self->{vp}->add ($self->{child} = $widget); 1067 $self->{vp}->add ($self->{child} = $widget);
994} 1068}
995 1069
1070sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_;
1072
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev);
1076
1077 1
1078}
1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1084}
1085
996sub update { 1086sub update {
997 my ($self) = @_; 1087 my ($self) = @_;
998 1088
999 $self->SUPER::update; 1089 $self->SUPER::update;
1000 1090
1001 # todo: overwrite size_allocate of child 1091 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1092}
1005 1093
1006sub size_allocate { 1094sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
1008 1096
1097 $self->update_slider;
1098
1009 $self->SUPER::size_allocate ($w, $h); 1099 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1100}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1101
1018############################################################################# 1102#############################################################################
1019 1103
1020package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1021 1105
1022our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1023 1107
1024use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1025 1109
1026sub new { 1110sub new {
1027 my $class = shift; 1111 my $class = shift;
1028 1112
1029 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1056} 1140}
1057 1141
1058############################################################################# 1142#############################################################################
1059 1143
1060package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1061 1145
1062our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1063 1147
1064use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1149
1074sub new { 1150sub new {
1075 my ($class, %arg) = @_; 1151 my ($class, %arg) = @_;
1076 1152
1077 my $title = delete $arg{title}; 1153 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label
1155 align => 1,
1156 valign => 0,
1157 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75;
1159 }
1160
1161 my $self = $class->SUPER::new (
1162 # label => "",
1163 fg => [0.6, 0.3, 0.1],
1164 border => 0.8,
1165 style => 'single',
1166 %arg,
1167 );
1168
1169 $self
1170}
1171
1172sub add {
1173 my ($self, @widgets) = @_;
1174
1175 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1177}
1178
1179sub border {
1180 int $_[0]{border} * $::FONTSIZE
1181}
1182
1183sub size_request {
1184 my ($self) = @_;
1185
1186 ($self->{label_w}, undef) = $self->{label}->size_request
1187 if $self->{label};
1188
1189 my ($w, $h) = $self->SUPER::size_request;
1190
1191 (
1192 $w + $self->border * 2,
1193 $h + $self->border * 2,
1194 )
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 my $border = $self->border;
1201
1202 $w -= List::Util::max 0, $border * 2;
1203 $h -= List::Util::max 0, $border * 2;
1204
1205 if (my $label = $self->{label}) {
1206 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1207 $label->{h} = List::Util::min $h, $border;
1208 $label->invoke_size_allocate ($label->{w}, $label->{h});
1209 }
1210
1211 $self->child->configure ($border, $border, $w, $h);
1212
1213 1
1214}
1215
1216sub _draw {
1217 my ($self) = @_;
1218
1219 my $child = $self->{children}[0];
1220
1221 my $border = $self->border;
1222 my ($w, $h) = ($self->{w}, $self->{h});
1223
1224 $child->draw;
1225
1226 glColor @{$self->{fg}};
1227 glBegin GL_LINE_STRIP;
1228 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1230 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1232 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1233 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1234 glEnd;
1235
1236 if ($self->{label}) {
1237 glTranslate $border * 2, 0;
1238 $self->{label}->_draw;
1239 }
1240}
1241
1242#############################################################################
1243
1244package CFPlus::UI::Toplevel;
1245
1246our @ISA = CFPlus::UI::Bin::;
1247
1248use CFPlus::OpenGL;
1249
1250my $bg =
1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1252 mipmap => 1, wrap => 1;
1253
1254my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257
1258sub new {
1259 my ($class, %arg) = @_;
1078 1260
1079 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1264 border => 0.6,
1083 can_events => 1, 1265 can_events => 1,
1084 min_w => 16, 1266 min_w => 64,
1085 min_h => 16, 1267 min_h => 32,
1086 %arg, 1268 %arg,
1087 ); 1269 );
1088 1270
1089 $self->{title} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1272 align => 0,
1091 valign => 1, 1273 valign => 1,
1092 text => $title, 1274 text => $self->{title},
1093 fontsize => $self->{border} 1275 fontsize => $self->{border},
1094 if defined $title; 1276 if exists $self->{title};
1277
1278 if ($self->{has_close_button}) {
1279 $self->{close_button} =
1280 new CFPlus::UI::ImageButton
1281 path => 'x1_close.png',
1282 on_activate => sub { $self->emit ("delete") };
1283
1284 $self->CFPlus::UI::Container::add ($self->{close_button});
1285 }
1095 1286
1096 $self 1287 $self
1097} 1288}
1098 1289
1099sub add { 1290sub add {
1100 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1101 1292
1102 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1296}
1105 1297
1106sub border { 1298sub border {
1107 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1108} 1300}
1109 1301
1110sub size_request { 1302sub size_request {
1111 my ($self) = @_; 1303 my ($self) = @_;
1112 1304
1113 $self->{title}->size_request 1305 $self->{title_widget}->size_request
1114 if $self->{title}; 1306 if $self->{title_widget};
1307
1308 $self->{close_button}->size_request
1309 if $self->{close_button};
1115 1310
1116 my ($w, $h) = $self->SUPER::size_request; 1311 my ($w, $h) = $self->SUPER::size_request;
1117 1312
1118 ( 1313 (
1119 $w + $self->border * 2, 1314 $w + $self->border * 2,
1120 $h + $self->border * 2, 1315 $h + $self->border * 2,
1121 ) 1316 )
1122} 1317}
1123 1318
1124sub size_allocate { 1319sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1320 my ($self, $w, $h) = @_;
1126 1321
1127 if ($self->{title}) { 1322 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1323 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1324 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1325 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1326 }
1132 1327
1133 my $border = $self->border; 1328 my $border = $self->border;
1134 1329
1135 $h -= List::Util::max 0, $border * 2; 1330 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1331 $w -= List::Util::max 0, $border * 2;
1332
1333 $self->child->configure ($border, $border, $w, $h);
1334
1335 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1336 if $self->{close_button};
1337
1338 1
1339}
1340
1341sub invoke_delete {
1342 my ($self) = @_;
1343
1344 $self->hide;
1137 1345
1138 $self->child->configure ($border, $border, $w, $h); 1346 1
1139} 1347}
1140 1348
1141sub button_down { 1349sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
1143 1351
1144 my ($w, $h) = @$self{qw(w h)}; 1352 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1353 my $border = $self->border;
1146 1354
… …
1177 1385
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1386 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1387
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1388 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1389 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1390 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1391 };
1184 } else { 1392 } else {
1185 return 0; 1393 return 0;
1186 } 1394 }
1187 1395
1188 1 1396 1
1189} 1397}
1190 1398
1191sub button_up { 1399sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1193 1401
1194 !!delete $self->{motion} 1402 ! ! delete $self->{motion}
1195} 1403}
1196 1404
1197sub mouse_motion { 1405sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1199 1407
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1409
1202 !!$self->{motion} 1410 ! ! $self->{motion}
1411}
1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1203} 1419}
1204 1420
1205sub _draw { 1421sub _draw {
1206 my ($self) = @_; 1422 my ($self) = @_;
1207 1423
… …
1233 1449
1234 glDisable GL_TEXTURE_2D; 1450 glDisable GL_TEXTURE_2D;
1235 1451
1236 $child->draw; 1452 $child->draw;
1237 1453
1238 if ($self->{title}) { 1454 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1455 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1456 $self->{title_widget}->_draw;
1457
1458 glTranslate 0, - ($border - $self->{h});
1241 } 1459 }
1460
1461 $self->{close_button}->draw
1462 if $self->{close_button};
1242} 1463}
1243 1464
1244############################################################################# 1465#############################################################################
1245 1466
1246package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1247 1468
1248our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1249 1470
1250use List::Util qw(max sum); 1471use List::Util qw(max sum);
1251 1472
1252use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1253 1474
1254sub new { 1475sub new {
1255 my $class = shift; 1476 my $class = shift;
1256 1477
1257 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1263sub children { 1484sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1486}
1266 1487
1267sub add { 1488sub add {
1268 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1269 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1493 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1272 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1499 $self->realloc;
1500}
1501
1502sub remove {
1503 my ($self, $child) = @_;
1504
1505 # TODO: not yet implemented
1274} 1506}
1275 1507
1276# TODO: move to container class maybe? send children a signal on removal? 1508# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1509sub clear {
1278 my ($self) = @_; 1510 my ($self) = @_;
… …
1319 (sum @$ws), 1551 (sum @$ws),
1320 (sum @$hs), 1552 (sum @$hs),
1321 ) 1553 )
1322} 1554}
1323 1555
1324sub size_allocate { 1556sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1557 my ($self, $w, $h) = @_;
1326 1558
1327 my ($ws, $hs) = $self->get_wh; 1559 my ($ws, $hs) = $self->get_wh;
1328 1560
1329 my $req_w = (sum @$ws) || 1; 1561 my $req_w = (sum @$ws) || 1;
… …
1336 1568
1337 # linearly scale sizes 1569 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1572
1341 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1343 1575
1344 my $y; 1576 my $y;
1345 1577
1346 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1361 } 1593 }
1362 1594
1363 $y += $row_h; 1595 $y += $row_h;
1364 } 1596 }
1365 1597
1598 1
1366} 1599}
1367 1600
1368sub find_widget { 1601sub find_widget {
1369 my ($self, $x, $y) = @_; 1602 my ($self, $x, $y) = @_;
1370 1603
… …
1389 } 1622 }
1390} 1623}
1391 1624
1392############################################################################# 1625#############################################################################
1393 1626
1394package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1395 1628
1396our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1397 1630
1398sub size_request { 1631sub size_request {
1399 my ($self) = @_; 1632 my ($self) = @_;
1400 1633
1401 $self->{vertical} 1634 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1641 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1642 )
1410} 1643}
1411 1644
1412sub size_allocate { 1645sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1414 1647
1415 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1417 1650
1418 my @req; 1651 my @req;
1419 1652
1420 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1422 } else { 1655 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1425 1658
1426 if ($req > $space) { 1659 if ($req > $space) {
1427 # ah well, not enough space 1660 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1429 } else { 1662 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1664
1432 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1433 1666
1434 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1668 for 0 .. $#children;
1436 } 1669 }
1437 } 1670 }
1438 1671
1439 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1440 1673
1441 my $pos = 0; 1674 my $pos = 0;
1442 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1678
1446 $pos += $alloc; 1679 $pos += $alloc;
1447 } 1680 }
1448 1681
1449 1 1682 1
1450} 1683}
1451 1684
1452############################################################################# 1685#############################################################################
1453 1686
1454package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1455 1688
1456our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1457 1690
1458sub new { 1691sub new {
1459 my $class = shift; 1692 my $class = shift;
1460 1693
1461 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1464 ) 1697 )
1465} 1698}
1466 1699
1467############################################################################# 1700#############################################################################
1468 1701
1469package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1470 1703
1471our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1472 1705
1473sub new { 1706sub new {
1474 my $class = shift; 1707 my $class = shift;
1475 1708
1476 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1479 ) 1712 )
1480} 1713}
1481 1714
1482############################################################################# 1715#############################################################################
1483 1716
1484package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1485 1718
1486our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1487 1720
1488use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1489 1722
1490sub new { 1723sub new {
1491 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1492 1725
1493 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1729 #active_bg => none
1497 #font => default_font 1730 #font => default_font
1498 #text => initial text 1731 #text => initial text
1499 #markup => initial narkup 1732 #markup => initial narkup
1500 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1501 ellipsise => 3, # end 1735 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1737 fontsize => 1,
1504 align => -1, 1738 align => -1,
1505 valign => -1, 1739 valign => -1,
1506 padding_x => 2, 1740 padding_x => 2,
1507 padding_y => 2, 1741 padding_y => 2,
1508 can_events => 0, 1742 can_events => 0,
1509 %arg 1743 %arg
1510 ); 1744 );
1511 1745
1512 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1749 $self->{template} = $layout;
1516 } 1750 }
1517 1751
1518 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1522 } 1756 }
1523 1757
1524 $self 1758 $self
1525} 1759}
1526 1760
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1761sub update {
1538 my ($self) = @_; 1762 my ($self) = @_;
1539 1763
1540 delete $self->{texture}; 1764 delete $self->{texture};
1541 $self->SUPER::update; 1765 $self->SUPER::update;
1542} 1766}
1543 1767
1768sub realloc {
1769 my ($self) = @_;
1770
1771 delete $self->{ox};
1772 $self->SUPER::realloc;
1773}
1774
1544sub set_text { 1775sub set_text {
1545 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1546 1777
1547 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1549 1780
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1552 1782
1783 delete $self->{size_req};
1553 $self->realloc; 1784 $self->realloc;
1554 $self->update; 1785 $self->update;
1555} 1786}
1556 1787
1557sub set_markup { 1788sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1562 1793
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1795
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1567 1797
1798 delete $self->{size_req};
1568 $self->realloc; 1799 $self->realloc;
1569 $self->update; 1800 $self->update;
1570} 1801}
1571 1802
1572sub size_request { 1803sub size_request {
1573 my ($self) = @_; 1804 my ($self) = @_;
1574 1805
1806 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1807 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1808 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1809 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1810 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1811 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1812
1581 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1582 1814
1583 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1816 $self->{template}->set_font ($self->{font}) if $self->{font};
1817 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1819
1587 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1588 1821
1589 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1823 $h = List::Util::max $h, $h2;
1824 }
1825
1826 [$w, $h]
1591 } 1827 };
1592 1828
1593 ($w, $h) 1829 @{ $self->{size_req} }
1594} 1830}
1595 1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1596sub size_allocate { 1836sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1598 1838
1599 delete $self->{ox}; 1839 delete $self->{ox};
1600 1840
1601 delete $self->{texture} 1841 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1842 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1843
1844 1
1603} 1845}
1604 1846
1605sub set_fontsize { 1847sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1607 1849
1608 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1609 delete $self->{texture}; 1852 delete $self->{texture};
1610 1853
1611 $self->realloc; 1854 $self->realloc;
1612} 1855}
1613 1856
1857sub reconfigure {
1858 my ($self) = @_;
1859
1860 delete $self->{size_req};
1861 delete $self->{texture};
1862
1863 $self->SUPER::reconfigure;
1864}
1865
1614sub _draw { 1866sub _draw {
1615 my ($self) = @_; 1867 my ($self) = @_;
1616 1868
1617 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1618 1870
1619 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 1878
1627 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1628 }; 1880 };
1629 1881
1630 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1634 1886
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 1890 };
1639 1891
1640 glEnable GL_TEXTURE_2D; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 1894
1643 if ($tex->{format} == GL_ALPHA) { 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1644 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646 } else {
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648 }
1649
1650 glDisable GL_TEXTURE_2D;
1651} 1896}
1652 1897
1653############################################################################# 1898#############################################################################
1654 1899
1655package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1656 1901
1657our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1658 1903
1659use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1660 1905
1661sub new { 1906sub new {
1662 my $class = shift; 1907 my $class = shift;
1663 1908
1664 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1669 can_hover => 1, 1914 can_hover => 1,
1670 can_focus => 1, 1915 can_focus => 1,
1671 valign => 0, 1916 valign => 0,
1672 can_events => 1, 1917 can_events => 1,
1673 #text => ... 1918 #text => ...
1919 #hidden => "*",
1674 @_ 1920 @_
1675 ) 1921 )
1676} 1922}
1677 1923
1678sub _set_text { 1924sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1932 $self->{text} = $text;
1687 1933
1688 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1690 1937
1691 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1692 $self->update; 1941 $self->update;
1693} 1942}
1694 1943
1695sub set_text { 1944sub set_text {
1696 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1697 1946
1698 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1948 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1949}
1703 1950
1704sub get_text { 1951sub get_text {
1705 $_[0]{text} 1952 $_[0]{text}
1706} 1953}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1712 1959
1713 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1714} 1961}
1715 1962
1716sub key_down { 1963sub invoke_key_down {
1717 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1718 1965
1719 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1724 1971
1725 if ($uni == 8) { 1972 if ($uni == 8) {
1726 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1728 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1729 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1730 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1731 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1732 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1734 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1736 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1737 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1988 $self->emit ('escape');
1739 } elsif ($uni) { 1989 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1991 } else {
1742 return 0; 1992 return 0;
1743 } 1993 }
… …
1747 $self->realloc; 1997 $self->realloc;
1748 1998
1749 1 1999 1
1750} 2000}
1751 2001
1752sub focus_in { 2002sub invoke_focus_in {
1753 my ($self) = @_; 2003 my ($self) = @_;
1754 2004
1755 $self->{last_activity} = $::NOW; 2005 $self->{last_activity} = $::NOW;
1756 2006
1757 $self->SUPER::focus_in; 2007 $self->SUPER::invoke_focus_in
1758} 2008}
1759 2009
1760sub button_down { 2010sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
1762 2012
1763 $self->SUPER::button_down ($ev, $x, $y); 2013 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 2014
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 2016
1767 # byte-index to char-index 2017 # byte-index to char-index
1768 my $text = $self->{text}; 2018 my $text = $self->{text};
1769 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1771 2021
1772 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1773 $self->update; 2023 $self->update;
1774 2024
1775 1 2025 1
1776} 2026}
1777 2027
1778sub mouse_motion { 2028sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 2029 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2030# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 2031
1782 0 2032 1
1783} 2033}
1784 2034
1785sub _draw { 2035sub _draw {
1786 my ($self) = @_; 2036 my ($self) = @_;
1787 2037
… …
1814 utf8::encode $text; 2064 utf8::encode $text;
1815 2065
1816 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1817 } 2067 }
1818 2068
1819 glColor @{$self->{fg}};
1820 glBegin GL_LINES; 2069 glBegin GL_LINES;
1821 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2070 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1822 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1823 glEnd; 2072 glEnd;
1824 } 2073 }
1825} 2074}
1826 2075
1827package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1828 2077
1829our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1830 2079
1831use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1832 2081
1833sub key_down { 2082sub invoke_key_down {
1834 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1835 2084
1836 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
1837 2086
1838 if ($sym == 13) { 2087 if ($sym == 13) {
1839 unshift @{$self->{history}}, 2088 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 2089 my $txt = $self->get_text;
2090
1841 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 2093 $self->emit (activate => $txt);
1844 $self->update; 2094 $self->update;
1845 2095
1846 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1849 } 2099 }
1850 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1851 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1853 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1854 } 2104 }
1855 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1856 } 2106 }
1857 2107
1858 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1859 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1860 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861 2111
1862 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1863 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1864 } else { 2114 } else {
1865 $self->set_text ($self->{history_saveback}); 2115 $self->set_text ($self->{history_saveback});
1866 } 2116 }
1867 2117
1868 } else { 2118 } else {
1869 return $self->SUPER::key_down ($ev) 2119 return $self->SUPER::invoke_key_down ($ev)
1870 } 2120 }
1871 2121
1872 1 2122 1
1873} 2123}
1874 2124
1875############################################################################# 2125#############################################################################
1876 2126
1877package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1878 2128
1879our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1880 2130
1881use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1882 2132
1883my @tex = 2133my @tex =
1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1885 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1886 2136
1887sub new { 2137sub new {
1888 my $class = shift; 2138 my $class = shift;
1889 2139
… …
1898 can_events => 1, 2148 can_events => 1,
1899 @_ 2149 @_
1900 ) 2150 )
1901} 2151}
1902 2152
1903sub activate { }
1904
1905sub button_up { 2153sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2154 my ($self, $ev, $x, $y) = @_;
1907 2155
1908 $self->emit ("activate") 2156 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2157 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2158 && $y >= 0 && $y < $self->{h};
… …
1913} 2161}
1914 2162
1915sub _draw { 2163sub _draw {
1916 my ($self) = @_; 2164 my ($self) = @_;
1917 2165
1918 local $self->{fg} = $self->{fg}; 2166 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 2167
1924 glEnable GL_TEXTURE_2D; 2168 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2170 glColor 0, 0, 0, 1;
1927 2171
… …
1932 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1933} 2177}
1934 2178
1935############################################################################# 2179#############################################################################
1936 2180
1937package CFClient::UI::CheckBox; 2181package CFPlus::UI::CheckBox;
1938 2182
1939our @ISA = CFClient::UI::DrawBG::; 2183our @ISA = CFPlus::UI::DrawBG::;
1940 2184
1941my @tex = 2185my @tex =
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944 2188
1945use CFClient::OpenGL; 2189use CFPlus::OpenGL;
1946 2190
1947sub new { 2191sub new {
1948 my $class = shift; 2192 my $class = shift;
1949 2193
1950 $class->SUPER::new ( 2194 $class->SUPER::new (
… …
1964 my ($self) = @_; 2208 my ($self) = @_;
1965 2209
1966 (6) x 2 2210 (6) x 2
1967} 2211}
1968 2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
1969sub button_down { 2221sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1971 2223
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2226 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2227 } else {
1977 return 0 2228 return 0
1978 } 2229 }
1979 2230
1980 1 2231 1
… …
2000 glDisable GL_TEXTURE_2D; 2251 glDisable GL_TEXTURE_2D;
2001} 2252}
2002 2253
2003############################################################################# 2254#############################################################################
2004 2255
2005package CFClient::UI::Image; 2256package CFPlus::UI::Image;
2006 2257
2007our @ISA = CFClient::UI::Base::; 2258our @ISA = CFPlus::UI::Base::;
2008 2259
2009use CFClient::OpenGL; 2260use CFPlus::OpenGL;
2010use Carp qw/confess/;
2011 2261
2012our %loaded_images; 2262our %texture_cache;
2013 2263
2014sub new { 2264sub new {
2015 my $class = shift; 2265 my $class = shift;
2016 2266
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2018 2271
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2272 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required";
2020 2274
2021 $loaded_images{$self->{image}} ||= 2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2023 2277
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2279
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2281
2030 $self 2282 $self
2031} 2283}
2032 2284
2285sub STORABLE_freeze {
2286 my ($self, $cloning) = @_;
2287
2288 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2290
2291 $self->{path}
2292}
2293
2294sub STORABLE_attach {
2295 my ($self, $cloning, $path) = @_;
2296
2297 $self->new (path => $path)
2298}
2299
2033sub size_request { 2300sub size_request {
2034 my ($self) = @_; 2301 my ($self) = @_;
2035 2302
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2303 ($self->{tex}{w}, $self->{tex}{h})
2037} 2304}
2038 2305
2039sub _draw { 2306sub _draw {
2040 my ($self) = @_; 2307 my ($self) = @_;
2041 2308
… …
2051 } 2318 }
2052 2319
2053 glEnable GL_TEXTURE_2D; 2320 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2322
2056 $tex->draw_quad_alpha (0, 0, $w, $h); 2323 $tex->draw_quad (0, 0, $w, $h);
2057 2324
2058 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2059} 2326}
2060 2327
2061############################################################################# 2328#############################################################################
2062 2329
2330package CFPlus::UI::ImageButton;
2331
2332our @ISA = CFPlus::UI::Image::;
2333
2334use CFPlus::OpenGL;
2335
2336my %textures;
2337
2338sub new {
2339 my $class = shift;
2340
2341 my $self = $class->SUPER::new (
2342 padding_x => 4,
2343 padding_y => 4,
2344 fg => [1, 1, 1],
2345 active_fg => [0, 0, 1],
2346 can_hover => 1,
2347 align => 0,
2348 valign => 0,
2349 can_events => 1,
2350 @_
2351 );
2352}
2353
2354sub invoke_button_up {
2355 my ($self, $ev, $x, $y) = @_;
2356
2357 $self->emit ("activate")
2358 if $x >= 0 && $x < $self->{w}
2359 && $y >= 0 && $y < $self->{h};
2360
2361 1
2362}
2363
2364#############################################################################
2365
2063package CFClient::UI::VGauge; 2366package CFPlus::UI::VGauge;
2064 2367
2065our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2066 2369
2067use List::Util qw(min max); 2370use List::Util qw(min max);
2068 2371
2069use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2070 2373
2071my %tex = ( 2374my %tex = (
2072 food => [ 2375 food => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075 ], 2378 ],
2076 grace => [ 2379 grace => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2079 ], 2382 ],
2080 hp => [ 2383 hp => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083 ], 2386 ],
2084 mana => [ 2387 mana => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2087 ], 2390 ],
2088); 2391);
2089 2392
2090# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2455
2153 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2457 my $h2 = $self->{h} * (1 - $ycut2);
2458 my $h3 = $self->{h};
2459
2460 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2461
2156 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2463 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2464 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
… …
2178 2484
2179 if ($t3) { 2485 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2492 glEnd;
2187 } 2493 }
2188 2494
2189 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2190 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2191} 2497}
2192 2498
2193############################################################################# 2499#############################################################################
2194 2500
2195package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2196 2502
2197our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2198 2504
2199sub new { 2505sub new {
2200 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2201 2507
2202 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2204 can_hover => 1, 2510 can_hover => 1,
2205 can_events => 1, 2511 can_events => 1,
2206 %arg, 2512 %arg,
2207 ); 2513 );
2208 2514
2209 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2210 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2211 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2212 2518
2213 $self 2519 $self
2214} 2520}
2215 2521
2216sub set_fontsize { 2522sub set_fontsize {
… …
2237 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2238} 2544}
2239 2545
2240############################################################################# 2546#############################################################################
2241 2547
2242package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2243 2549
2244use strict; 2550use strict;
2245 2551
2246use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2247 2553
2248our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2249 2555
2250my @tex = 2556my @tex =
2251 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2252 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2253 2559
2254sub new { 2560sub new {
2255 my $class = shift; 2561 my $class = shift;
2256 2562
… …
2277 $self->update; 2583 $self->update;
2278 2584
2279 $self 2585 $self
2280} 2586}
2281 2587
2282sub changed { }
2283
2284sub set_range { 2588sub set_range {
2285 my ($self, $range) = @_; 2589 my ($self, $range) = @_;
2286 2590
2287 ($range, $self->{range}) = ($self->{range}, $range); 2591 ($range, $self->{range}) = ($self->{range}, $range);
2288 2592
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2593 if ("@$range" ne "@{$self->{range}}") {
2594 $self->update;
2595 $self->set_value ($self->{range}[0]);
2596 }
2291} 2597}
2292 2598
2293sub set_value { 2599sub set_value {
2294 my ($self, $value) = @_; 2600 my ($self, $value) = @_;
2295 2601
… …
2306 if $unit; 2612 if $unit;
2307 2613
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2614 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2615
2310 if ($value != $old_value) { 2616 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2617 $self->emit (changed => $value);
2312 $self->update; 2618 $self->update;
2313 } 2619 }
2314} 2620}
2315 2621
2316sub size_request { 2622sub size_request {
2317 my ($self) = @_; 2623 my ($self) = @_;
2318 2624
2319 ($self->{req_w}, $self->{req_h}) 2625 ($self->{req_w}, $self->{req_h})
2320} 2626}
2321 2627
2322sub button_down { 2628sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2629 my ($self, $ev, $x, $y) = @_;
2324 2630
2325 $self->SUPER::button_down ($ev, $x, $y); 2631 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2632
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2634
2329 $self->mouse_motion ($ev, $x, $y) 2635 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2636}
2331 2637
2332sub mouse_motion { 2638sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2639 my ($self, $ev, $x, $y) = @_;
2334 2640
2335 if ($GRAB == $self) { 2641 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2642 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2643
… …
2343 } else { 2649 } else {
2344 return 0; 2650 return 0;
2345 } 2651 }
2346 2652
2347 1 2653 1
2654}
2655
2656sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_;
2658
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2662
2663 ! ! $delta
2348} 2664}
2349 2665
2350sub update { 2666sub update {
2351 my ($self) = @_; 2667 my ($self) = @_;
2352 2668
… …
2401 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2402} 2718}
2403 2719
2404############################################################################# 2720#############################################################################
2405 2721
2406package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2407 2723
2408our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2409 2725
2410sub new { 2726sub new {
2411 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2412 2728
2413 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2414 2730
2415 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2416 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2417 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2418 to_value => sub { shift }, 2734 to_value => sub { shift },
2419 from_value => sub { shift }, 2735 from_value => sub { shift },
2420 %arg, 2736 %arg,
2421 ); 2737 );
2422 2738
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2444 2760
2445############################################################################# 2761#############################################################################
2446 2762
2447package CFClient::UI::TextView; 2763package CFPlus::UI::TextScroller;
2448 2764
2449our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2450 2766
2451use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2452 2768
2453sub new { 2769sub new {
2454 my $class = shift; 2770 my $class = shift;
2455 2771
2456 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2457 fontsize => 1, 2773 fontsize => 1,
2458 can_events => 0, 2774 can_events => 1,
2775 indent => 0,
2459 #font => default_font 2776 #font => default_font
2460 @_, 2777 @_,
2461 2778
2462 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2463 par => [], 2780 par => [],
2464 height => 0, 2781 height => 0,
2465 children => [ 2782 children => [
2466 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2468 ], 2785 ],
2469 ); 2786 );
2470 2787
2471 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2472 2789
… …
2478 2795
2479 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2797 $self->reflow;
2481} 2798}
2482 2799
2800sub size_request {
2801 my ($self) = @_;
2802
2803 my ($empty, $slider) = @{ $self->{children} };
2804
2805 local $self->{children} = [$empty, $slider];
2806 $self->SUPER::size_request
2807}
2808
2483sub size_allocate { 2809sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2485 2811
2486 $self->SUPER::size_allocate ($w, $h); 2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2814
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2817 $self->{layout}->set_width ($empty->{w});
2818 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2819
2492 $self->reflow; 2820 $self->reflow;
2493}
2494 2821
2495sub text_size { 2822 local $self->{children} = [$empty, $slider];
2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 2827 my ($self, $ev) = @_;
2828
2829 return 0 unless $ev->{dy}; # only vertical movements
2830
2831 $self->{children}[1]->emit (mouse_wheel => $ev);
2832
2833 1
2834}
2835
2836sub get_layout {
2837 my ($self, $para) = @_;
2497 2838
2498 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2499 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2844 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2845 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2846 $layout->set_markup ($para->{markup});
2847
2848 $layout->set_shapes (
2849 map
2850 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2851 @{$para->{widget}}
2503 2852 );
2853
2504 $layout->size 2854 $layout
2505} 2855}
2506 2856
2507sub reflow { 2857sub reflow {
2508 my ($self) = @_; 2858 my ($self) = @_;
2509 2859
… …
2516 2866
2517 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2518 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2519} 2869}
2520 2870
2871sub current_paragraph {
2872 my ($self) = @_;
2873
2874 $self->{top_paragraph} - 1
2875}
2876
2877sub scroll_to {
2878 my ($self, $para) = @_;
2879
2880 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2881
2882 $self->{scroll_to} = $para;
2883 $self->update;
2884}
2885
2521sub clear { 2886sub clear {
2522 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2523 2891
2524 $self->{par} = []; 2892 $self->{par} = [];
2525 $self->{height} = 0; 2893 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2895}
2528 2896
2529sub add_paragraph { 2897sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2531 2899
2532 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2533 my ($w, $h) = $self->text_size ($line); 2901 $para = {
2902 fg => [1, 1, 1, 1],
2903 indent => 0,
2904 markup => "",
2905 widget => [],
2906 ref $para ? %$para : (markup => $para),
2907 w => 1e10,
2908 wrapped => 1,
2909 };
2910
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para;
2913 }
2914
2915 $self->{need_reflow}++;
2916 $self->update;
2917}
2918
2919sub scroll_to_bottom {
2920 my ($self) = @_;
2921
2922 $self->{scroll_to} = $#{$self->{par}};
2923 $self->update;
2924}
2925
2926sub force_uptodate {
2927 my ($self) = @_;
2928
2929 if (delete $self->{need_reflow}) {
2930 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2931
2932 my $height = 0;
2933
2934 for my $para (@{$self->{par}}) {
2935 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2936 my $layout = $self->get_layout ($para);
2937 my ($w, $h) = $layout->size;
2938
2939 $para->{w} = $w + $para->{indent};
2940 $para->{h} = $h;
2941 $para->{wrapped} = $layout->has_wrapped;
2942 }
2943
2944 $para->{y} = $height;
2945 $height += $para->{h};
2946 }
2947
2534 $self->{height} += $h; 2948 $self->{height} = $height;
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2536 }
2537 2950
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2951 delete $self->{texture};
2952 }
2953
2954 if (my $paridx = delete $self->{scroll_to}) {
2955 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2956 }
2539} 2957}
2540 2958
2541sub update { 2959sub update {
2542 my ($self) = @_; 2960 my ($self) = @_;
2543 2961
… …
2545 2963
2546 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2547 2965
2548 delete $self->{texture}; 2966 delete $self->{texture};
2549 2967
2550 $ROOT->on_post_alloc ($self, sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2972
2553 if (delete $self->{need_reflow}) {
2554 my $height = 0;
2555
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h;
2567 }
2568
2569 $height += $_->[1];
2570 }
2571
2572 $self->{height} = $height;
2573
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575
2576 delete $self->{texture};
2577 }
2578
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2974 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2582 2976
2977 package CFPlus::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h});
2980
2981 my $top = int $self->{children}[1]{range}[0];
2982
2983 my $paridx = 0;
2984 my $top_paragraph;
2583 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2584 2986
2585 my $y0 = $top; 2987 my $y0 = $top;
2586 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2587 2989
2588 my $y = 0;
2589
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593
2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2600 2993
2601 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2603 $layout->set_width ($W - $par->[3]);
2604 $layout->set_markup ($par->[4]);
2605 2996
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2607 2998
2608 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3000 my @s = $layout->get_shapes;
3001
3002 for (@w) {
3003 my ($dx, $dy) = splice @s, 0, 2, ();
3004
3005 $_->{x} = $dx + $para->{indent};
3006 $_->{y} = $dy + $y - $y0;
3007
3008 $_->draw;
3009 }
3010 }
2610 } 3011 }
2611 3012
2612 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2613 } 3015 }
2614 3016
2615 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2616 }; 3018 };
2617 }); 3019 });
2618} 3020}
2619 3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
3029}
3030
2620sub _draw { 3031sub _draw {
2621 my ($self) = @_; 3032 my ($self) = @_;
2622 3033
2623 glEnable GL_TEXTURE_2D; 3034 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 3036 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3037 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2628 3039
2629 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2630
2631} 3041}
2632 3042
2633############################################################################# 3043#############################################################################
2634 3044
2635package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2636 3046
2637use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2638 3048
2639our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2640 3050
2641sub moveto { 3051sub moveto {
2642 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2643 3053
2644 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2672 glPopMatrix; 3082 glPopMatrix;
2673} 3083}
2674 3084
2675############################################################################# 3085#############################################################################
2676 3086
2677package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2678 3088
2679our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2680 3090
2681sub new { 3091sub new {
2682 my $class = shift; 3092 my $class = shift;
2683 3093
2684 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2696 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2697} 3107}
2698 3108
2699############################################################################# 3109#############################################################################
2700 3110
2701package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2702 3112
2703our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2704 3114
2705use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2706 3116
2707sub new { 3117sub new {
2708 my $class = shift; 3118 my $class = shift;
2709 3119
2710 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2713 ) 3123 )
2714} 3124}
2715 3125
2716sub set_tooltip_from { 3126sub set_tooltip_from {
2717 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2718 3131
2719 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2720 3133
2721 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3136 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 3137 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 3138 . "visible $widget->{visible}";
2726 } 3139 }
2727 3140
3141 $tooltip =~ s/^\n+//;
3142 $tooltip =~ s/\n+$//;
3143
2728 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2729 markup => $tooltip, 3145 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 3147 fontsize => 0.8,
2732 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2733 ellipsise => 0, 3149 ellipsise => 0,
2734 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2735 ); 3151 );
2736} 3152}
2737 3153
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3157 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 3158
2743 ($w + 4, $h + 4) 3159 ($w + 4, $h + 4)
2744} 3160}
2745 3161
2746sub size_allocate { 3162sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 3163 my ($self, $w, $h) = @_;
2748 3164
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 3165 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 3166}
2751 3167
2752sub visibility_change { 3168sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 3169 my ($self, $visible) = @_;
2754 3170
2755 return unless $visible; 3171 return unless $visible;
2756 3172
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2759 or return; 3175 or return;
2760 3176
3177 if ($widget->{visible}) {
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 3179
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 3181 if $x + $self->{w} > $self->{root}{w};
2765 3182
2766 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2767 }); 3187 });
2768} 3188}
2769 3189
2770sub _draw { 3190sub _draw {
2771 my ($self) = @_; 3191 my ($self) = @_;
… …
2795 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2796} 3216}
2797 3217
2798############################################################################# 3218#############################################################################
2799 3219
2800package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2801 3221
2802our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2803 3223
2804use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2805 3225
2806sub new { 3226sub new {
2807 my $class = shift; 3227 my $class = shift;
2808 3228
2809 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2844sub _draw { 3264sub _draw {
2845 my ($self) = @_; 3265 my ($self) = @_;
2846 3266
2847 return unless $::CONN; 3267 return unless $::CONN;
2848 3268
3269 $self->SUPER::_draw;
3270
2849 my $face; 3271 my $face;
2850 3272
2851 if ($self->{frame}) { 3273 if ($self->{frame}) {
2852 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2853 3275
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3281
2860 if ($tex) { 3282 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3283 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3285 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3287 glDisable GL_TEXTURE_2D;
2866 } 3288 }
2867} 3289}
2868 3290
2869sub DESTROY { 3291sub destroy {
2870 my ($self) = @_; 3292 my ($self) = @_;
2871 3293
2872 $self->{timer}->cancel 3294 $self->{timer}->cancel
2873 if $self->{timer}; 3295 if $self->{timer};
2874 3296
2875 $self->SUPER::DESTROY; 3297 $self->SUPER::destroy;
2876} 3298}
2877 3299
2878############################################################################# 3300#############################################################################
2879 3301
2880package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
2881 3303
2882our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
2883 3305
2884# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
2885 3307
2886############################################################################# 3308#############################################################################
2887 3309
2888package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2889 3311
2890our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2891 3313
2892use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2893 3315
2894sub new { 3316sub new {
2895 my $class = shift; 3317 my $class = shift;
2896 3318
2897 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2898 items => [], 3320 items => [],
2899 z => 100, 3321 z => 100,
2900 @_, 3322 @_,
2901 ); 3323 );
2902 3324
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2904 3326
2905 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
2907 3329
2908 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
2909 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
2910 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
2911 can_hover => 1, 3336 can_hover => 1,
2912 can_events => 1, 3337 can_events => 1,
3338 tooltip => $tooltip,
3339 children => [
3340 (new CFPlus::UI::Label markup => $left, expand => 1),
3341 (new CFPlus::UI::Label markup => $right, align => +1),
3342 ],
3343 ;
3344
3345 } else {
3346 $widget = new CFPlus::UI::Label
3347 can_hover => 1,
3348 can_events => 1,
2913 text => $widget; 3349 markup => $widget,
3350 tooltip => $tooltip;
3351 }
2914 } 3352 }
2915 3353
2916 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
2917 3355
2918 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
2923 3361
2924# popup given the event (must be a mouse button down event currently) 3362# popup given the event (must be a mouse button down event currently)
2925sub popup { 3363sub popup {
2926 my ($self, $ev) = @_; 3364 my ($self, $ev) = @_;
2927 3365
2928 $self->_emit ("popdown"); 3366 $self->emit ("popdown");
2929 3367
2930 # maybe save $GRAB? must be careful about events... 3368 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3369 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3370 $self->{button} = $ev->{button};
2933 3371
2934 $self->show; 3372 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3373 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3374}
2937 3375
2938sub mouse_motion { 3376sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3377 my ($self, $ev, $x, $y) = @_;
2940 3378
2941 # TODO: should use vbox->find_widget or so 3379 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3380 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3381 $self->{hover} = $self->{item}{$HOVER};
2944 3382
2945 0 3383 0
2946} 3384}
2947 3385
2948sub button_up { 3386sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3387 my ($self, $ev, $x, $y) = @_;
2950 3388
2951 if ($ev->{button} == $self->{button}) { 3389 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3390 undef $GRAB;
2953 $self->hide; 3391 $self->hide;
2954 3392
2955 $self->_emit ("popdown"); 3393 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3394 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3395 } else {
2958 return 0 3396 return 0
2959 } 3397 }
2960 3398
2961 1 3399 1
2962} 3400}
2963 3401
2964############################################################################# 3402#############################################################################
2965 3403
2966package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
2967 3405
2968our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
2969 3407
2970sub new { 3408sub new {
2971 my $class = shift; 3409 my $class = shift;
2972 3410
2973 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
2987 3425
2988 $self->{current} = $self->{children}[0] 3426 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3427 if @{ $self->{children} };
2990} 3428}
2991 3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
2992sub set_current_page { 3436sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3437 my ($self, $page_or_widget) = @_;
2994 3438
2995 my $widget = ref $page_or_widget 3439 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3440 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3441 : $self->{children}[$page_or_widget];
2998 3442
2999 $self->{current} = $widget; 3443 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3444 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3445
3002 $self->_emit (page_changed => $self->{current}); 3446 $self->emit (page_changed => $self->{current});
3003 3447
3004 $self->realloc; 3448 $self->realloc;
3005} 3449}
3006 3450
3007sub visible_children { 3451sub visible_children {
… …
3012 my ($self) = @_; 3456 my ($self) = @_;
3013 3457
3014 $self->{current}->size_request 3458 $self->{current}->size_request
3015} 3459}
3016 3460
3017sub size_allocate { 3461sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3462 my ($self, $w, $h) = @_;
3019 3463
3020 $self->{current}->configure (0, 0, $w, $h); 3464 $self->{current}->configure (0, 0, $w, $h);
3465
3466 1
3021} 3467}
3022 3468
3023sub _draw { 3469sub _draw {
3024 my ($self) = @_; 3470 my ($self) = @_;
3025 3471
3026 $self->{current}->draw; 3472 $self->{current}->draw;
3027} 3473}
3028 3474
3029############################################################################# 3475#############################################################################
3030 3476
3031package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3032 3478
3033our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3034 3480
3035sub new { 3481sub new {
3036 my $class = shift; 3482 my $class = shift;
3037 3483
3038 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self 3487 # filter => # will be put between multiplexer and $self
3042 @_, 3488 @_,
3043 ); 3489 );
3044 3490
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3051sub add { 3497sub add {
3052 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3053 3499
3054 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3055 3501
3056 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3057 markup => $title, 3503 markup => $title,
3058 tooltip => $tooltip, 3504 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3060 ); 3506 );
3061 3507
3062 $self->{multiplexer}->add ($widget); 3508 $self->{multiplexer}->add ($widget);
3063} 3509}
3064 3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3065sub set_current_page { 3517sub set_current_page {
3066 my ($self, $page) = @_; 3518 my ($self, $page) = @_;
3067 3519
3068 $self->{multiplexer}->set_current_page ($page); 3520 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3522}
3071 3523
3072############################################################################# 3524#############################################################################
3073 3525
3074package CFClient::UI::Statusbox; 3526package CFPlus::UI::Selector;
3075 3527
3528use utf8;
3529
3076our @ISA = CFClient::UI::VBox::; 3530our @ISA = CFPlus::UI::Button::;
3077 3531
3078sub new { 3532sub new {
3079 my $class = shift; 3533 my $class = shift;
3080 3534
3081 $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
3536 options => [], # [value, title, longdesc], ...
3537 value => undef,
3538 @_,
3539 );
3540
3541 $self->_set_value ($self->{value});
3542
3543 $self
3544}
3545
3546sub invoke_button_down {
3547 my ($self, $ev) = @_;
3548
3549 my @menu_items;
3550
3551 for (@{ $self->{options} }) {
3552 my ($value, $title, $tooltip) = @$_;
3553
3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3555 }
3556
3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3558}
3559
3560sub _set_value {
3561 my ($self, $value) = @_;
3562
3563 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3564 or return;
3565
3566 $self->{value} = $item->[0];
3567 $self->set_markup ("$item->[1] ⇓");
3568 $self->set_tooltip ($item->[2]);
3569}
3570
3571sub set_value {
3572 my ($self, $value) = @_;
3573
3574 return unless $self->{value} ne $value;
3575
3576 $self->_set_value ($value);
3577 $self->emit (changed => $value);
3578}
3579
3580#############################################################################
3581
3582package CFPlus::UI::Statusbox;
3583
3584our @ISA = CFPlus::UI::VBox::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3590 fontsize => 0.8,
3083 @_, 3591 @_,
3084 ) 3592 );
3593
3594 Scalar::Util::weaken (my $this = $self);
3595
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597
3598 $self
3085} 3599}
3086 3600
3087sub reorder { 3601sub reorder {
3088 my ($self) = @_; 3602 my ($self) = @_;
3089 my $NOW = time; 3603 my $NOW = Time::HiRes::time;
3604
3605 # freeze display when hovering over any label
3606 return if $CFPlus::UI::TOOLTIP->{owner}
3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3608 values %{ $self->{item} };
3090 3609
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3612 }
3094 3613
… …
3097 my @items = sort { 3616 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3617 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3618 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3619 } values %{ $self->{item} };
3101 3620
3621 $self->{timer}->interval (1);
3622
3102 my $count = 10 + 1; 3623 my $count = 10 + 1;
3103 for my $item (@items) { 3624 for my $item (@items) {
3104 last unless --$count; 3625 last unless --$count;
3105 3626
3106 push @widgets, $item->{label} ||= do { 3627 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3628 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3629 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3630 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3631 : $item->{text};
3111 3632
3112 for ($short) { 3633 for ($short) {
3113 s/^\s+//; 3634 s/^\s+//;
3114 s/\s+/ /g; 3635 s/\s+/ /g;
3115 } 3636 }
3116 3637
3117 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3118 markup => $short, 3639 markup => $short,
3119 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3644 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3645 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3646 can_events => 1,
3126 can_hover => 1 3647 can_hover => 1
3127 }; 3648 };
3649
3650 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3651 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3652 $label->update;
3653 $label->set_max_size (undef, $label->{req_h} * $diff)
3654 if $diff < 1;
3655 $self->{timer}->interval (1/30);
3656 } else {
3657 $label->{fg}[3] = $item->{fg}[3] || 1;
3658 }
3659
3660 push @widgets, $label;
3128 } 3661 }
3129 3662
3130 $self->clear; 3663 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3664 $self->SUPER::add (reverse @widgets);
3132} 3665}
… …
3137 $text =~ s/^\s+//; 3670 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3671 $text =~ s/\s+$//;
3139 3672
3140 return unless $text; 3673 return unless $text;
3141 3674
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3675 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3676
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3677 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3678
3146 if (my $item = $self->{item}{$group}) { 3679 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3680 if ($item->{text} eq $text) {
3148 $item->{count}++; 3681 $item->{count}++;
3149 } else { 3682 } else {
3150 $item->{count} = 1; 3683 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3684 $item->{text} = $item->{tooltip} = $text;
3152 } 3685 }
3153 $item->{id} = ++$self->{id}; 3686 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3687 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3688 delete $item->{label};
3156 } else { 3689 } else {
3157 $self->{item}{$group} = { 3690 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3691 id => ++$self->{id},
… …
3164 count => 1, 3697 count => 1,
3165 %arg, 3698 %arg,
3166 }; 3699 };
3167 } 3700 }
3168 3701
3702 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3703 $self->reorder;
3704 });
3170} 3705}
3171 3706
3172sub reconfigure { 3707sub reconfigure {
3173 my ($self) = @_; 3708 my ($self) = @_;
3174 3709
… …
3177 3712
3178 $self->reorder; 3713 $self->reorder;
3179 $self->SUPER::reconfigure; 3714 $self->SUPER::reconfigure;
3180} 3715}
3181 3716
3717sub destroy {
3718 my ($self) = @_;
3719
3720 $self->{timer}->cancel;
3721
3722 $self->SUPER::destroy;
3723}
3724
3182############################################################################# 3725#############################################################################
3183 3726
3184package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3185 3728
3186our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3187 3730
3188sub new { 3731sub new {
3189 my $class = shift; 3732 my $class = shift;
3190 3733
3191 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3193 @_, 3737 @_,
3194 ); 3738 );
3195 3739
3740 $self->set_sort_order (undef);
3741
3196 $self 3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3197} 3778}
3198 3779
3199sub set_items { 3780sub set_items {
3200 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3201 3782
3202 $self->{child}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3203 return unless $items; 3784 $self->update_items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222} 3785}
3223 3786
3224############################################################################# 3787#############################################################################
3225 3788
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3424 3790
3425our @ISA = CFClient::UI::Table::; 3791our @ISA = CFPlus::UI::Table::;
3426 3792
3427sub new { 3793sub new {
3428 my $class = shift; 3794 my $class = shift;
3429 3795
3430 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
… …
3432 commands => [], 3798 commands => [],
3433 @_, 3799 @_,
3434 ) 3800 )
3435} 3801}
3436 3802
3437# XXX: Do sorting? Argl... 3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3438sub add_spell { 3888sub add_spell {
3439 my ($self, $spell) = @_; 3889 my ($self, $spell) = @_;
3890
3440 $self->{spells}->{$spell->{name}} = $spell; 3891 $self->{spell}->{$spell->{name}} = $spell;
3441 3892 $self->rebuild_spell_list;
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469} 3893}
3470 3894
3471sub remove_spell { 3895sub remove_spell {
3472 my ($self, $spell) = @_; 3896 my ($self, $spell) = @_;
3897
3473 delete $self->{spells}->{$spell->{name}}; 3898 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3899 $self->rebuild_spell_list;
3475} 3900}
3476 3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3477############################################################################# 3909#############################################################################
3478 3910
3479package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3480 3912
3481our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3482 3914
3915use List::Util qw(min max);
3916
3483use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3484 3918
3485sub new { 3919sub new {
3486 my $class = shift; 3920 my $class = shift;
3487 3921
3488 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3513 $coord = $max - $size if $coord > $max - $size; 3947 $coord = $max - $size if $coord > $max - $size;
3514 3948
3515 int $coord + 0.5 3949 int $coord + 0.5
3516} 3950}
3517 3951
3518sub size_allocate { 3952sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3953 my ($self, $w, $h) = @_;
3520 3954
3521 for my $child ($self->children) { 3955 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3957
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3961 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3962 $Y = _to_pixel $Y, $H, $self->{h};
3529 3963
3530 $child->configure ($X, $Y, $W, $H); 3964 $child->configure ($X, $Y, $W, $H);
3531 } 3965 }
3966
3967 1
3532} 3968}
3533 3969
3534sub coord2local { 3970sub coord2local {
3535 my ($self, $x, $y) = @_; 3971 my ($self, $x, $y) = @_;
3536 3972
… …
3621 4057
3622 delete $queue{$widget+0}; 4058 delete $queue{$widget+0};
3623 4059
3624 my ($w, $h) = $widget->size_request; 4060 my ($w, $h) = $widget->size_request;
3625 4061
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4062 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4063 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4064
4065 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4066 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 4067
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 4068 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 4069 $h = $widget->{force_h} if exists $widget->{force_h};
3631 4070
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4071 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3658 4097
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 4099
3661 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
4102
4103 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h;
4105
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3663 4111
3664 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3666 4114
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3693 glLoadIdentity; 4141 glLoadIdentity;
3694 4142
3695 { 4143 {
3696 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3697 4145
3698 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3700 }
3701 4148
3702 $self->_draw; 4149 $self->_draw;
4150 }
3703} 4151}
3704 4152
3705############################################################################# 4153#############################################################################
3706 4154
3707package CFClient::UI; 4155package CFPlus::UI;
3708 4156
3709$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3710$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3711 4159
37121 41601
3713 4161

Diff Legend

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