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

Diff Legend

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