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

Diff Legend

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