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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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