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

Diff Legend

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