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

Diff Legend

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