ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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