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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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