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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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