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.343 by root, Sun Aug 13 15:14:17 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
… …
854 my $tex = $self->{texture} 916 my $tex = $self->{texture}
855 or return; 917 or return;
856 918
857 glEnable GL_TEXTURE_2D; 919 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 921 glColor 0, 0, 0, 1;
860 922
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 924
863 glDisable GL_TEXTURE_2D; 925 glDisable GL_TEXTURE_2D;
864} 926}
865 927
866############################################################################# 928#############################################################################
867 929
868package CFClient::UI::ViewPort; 930package CFPlus::UI::ViewPort;
869 931
870our @ISA = CFClient::UI::Window::; 932our @ISA = CFPlus::UI::Window::;
871 933
872sub new { 934sub new {
873 my $class = shift; 935 my $class = shift;
874 936
875 $class->SUPER::new ( 937 $class->SUPER::new (
… …
888 $h = 10 if $self->{scroll_y}; 950 $h = 10 if $self->{scroll_y};
889 951
890 ($w, $h) 952 ($w, $h)
891} 953}
892 954
893sub size_allocate { 955sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 956 my ($self, $w, $h) = @_;
895 957
896 my $child = $self->child; 958 my $child = $self->child;
897 959
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 960 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 961 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 962
901 $self->child->configure (0, 0, $w, $h); 963 $self->child->configure (0, 0, $w, $h);
902 $self->update; 964 $self->update;
965
966 1
903} 967}
904 968
905sub set_offset { 969sub set_offset {
906 my ($self, $x, $y) = @_; 970 my ($self, $x, $y) = @_;
907 971
… …
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 998 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 999 ) {
936 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
937 } else { 1001 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1002 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 1003 }
940} 1004}
941 1005
942sub _render { 1006sub _render {
943 my ($self) = @_; 1007 my ($self) = @_;
944 1008
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1009 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}; 1010 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
947 1011
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1012 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1013
950 $self->SUPER::_render; 1014 $self->SUPER::_render;
951} 1015}
952 1016
953############################################################################# 1017#############################################################################
954 1018
955package CFClient::UI::ScrolledWindow; 1019package CFPlus::UI::ScrolledWindow;
956 1020
957our @ISA = CFClient::UI::HBox::; 1021our @ISA = CFPlus::UI::HBox::;
958 1022
959sub new { 1023sub new {
960 my $class = shift; 1024 my ($class, %arg) = @_;
1025
1026 my $child = delete $arg{child};
961 1027
962 my $self; 1028 my $self;
963 1029
964 my $slider = new CFClient::UI::Slider 1030 my $slider = new CFPlus::UI::Slider
965 vertical => 1, 1031 vertical => 1,
966 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
967 on_changed => sub { 1033 on_changed => sub {
968 $self->{vp}->set_offset (0, $_[1]); 1034 $self->{vp}->set_offset (0, $_[1]);
969 }, 1035 },
970 ; 1036 ;
971 1037
972 $self = $class->SUPER::new ( 1038 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1039 vp => (new CFPlus::UI::ViewPort expand => 1),
1040 can_events => 1,
974 slider => $slider, 1041 slider => $slider,
975 @_, 1042 %arg,
976 ); 1043 );
977 1044
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1045 $self->SUPER::add ($self->{vp}, $self->{slider});
1046 $self->add ($child) if $child;
981 1047
982 $self 1048 $self
983} 1049}
984 1050
1051#TODO# update range on size_allocate depending on child
1052
1053sub add {
1054 my ($self, $widget) = @_;
1055
1056 $self->{vp}->add ($self->{child} = $widget);
1057}
1058
1059sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_;
1061
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev);
1065
1066 1
1067}
1068
1069sub update_slider {
1070 my ($self) = @_;
1071
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1073}
1074
985sub update { 1075sub update {
986 my ($self) = @_; 1076 my ($self) = @_;
987 1077
988 $self->SUPER::update; 1078 $self->SUPER::update;
989 1079
990 # todo: overwrite size_allocate of child 1080 $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} 1081}
994 1082
995sub size_allocate { 1083sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1084 my ($self, $w, $h) = @_;
997 1085
1086 $self->update_slider;
1087
998 $self->SUPER::size_allocate ($w, $h); 1088 $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} 1089}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1090
1007############################################################################# 1091#############################################################################
1008 1092
1009package CFClient::UI::Frame; 1093package CFPlus::UI::Frame;
1010 1094
1011our @ISA = CFClient::UI::Bin::; 1095our @ISA = CFPlus::UI::Bin::;
1012 1096
1013use CFClient::OpenGL; 1097use CFPlus::OpenGL;
1014 1098
1015sub new { 1099sub new {
1016 my $class = shift; 1100 my $class = shift;
1017 1101
1018 $class->SUPER::new ( 1102 $class->SUPER::new (
… …
1026 1110
1027 if ($self->{bg}) { 1111 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1112 my ($w, $h) = @$self{qw(w h)};
1029 1113
1030 glEnable GL_BLEND; 1114 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1115 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1116 glColor_premultiply @{ $self->{bg} };
1033 1117
1034 glBegin GL_QUADS; 1118 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1119 glVertex 0 , 0;
1036 glVertex 0 , $h; 1120 glVertex 0 , $h;
1037 glVertex $w, $h; 1121 glVertex $w, $h;
… …
1044 $self->SUPER::_draw; 1128 $self->SUPER::_draw;
1045} 1129}
1046 1130
1047############################################################################# 1131#############################################################################
1048 1132
1049package CFClient::UI::FancyFrame; 1133package CFPlus::UI::FancyFrame;
1050 1134
1051our @ISA = CFClient::UI::Bin::; 1135our @ISA = CFPlus::UI::Bin::;
1052 1136
1053use CFClient::OpenGL; 1137use CFPlus::OpenGL;
1054 1138
1055my $bg = 1139my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1; 1141 mipmap => 1, wrap => 1;
1058 1142
1059my @border = 1143my @border =
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1144 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); 1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1146
1063sub new { 1147sub new {
1064 my ($class, %arg) = @_; 1148 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1067 1149
1068 my $self = $class->SUPER::new ( 1150 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1151 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1152 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1153 border => 0.6,
1072 can_events => 1, 1154 can_events => 1,
1073 min_w => 16, 1155 min_w => 64,
1074 min_h => 16, 1156 min_h => 32,
1075 %arg, 1157 %arg,
1076 ); 1158 );
1077 1159
1078 $self->{title} = new CFClient::UI::Label 1160 $self->{title_widget} = new CFPlus::UI::Label
1079 align => 0, 1161 align => 0,
1080 valign => 1, 1162 valign => 1,
1081 text => $title, 1163 text => $self->{title},
1082 fontsize => $self->{border} 1164 fontsize => $self->{border},
1083 if defined $title; 1165 if exists $self->{title};
1166
1167 if ($self->{has_close_button}) {
1168 $self->{close_button} =
1169 new CFPlus::UI::ImageButton
1170 path => 'x1_close.png',
1171 on_activate => sub { $self->emit ("delete") };
1172
1173 $self->CFPlus::UI::Container::add ($self->{close_button});
1174 }
1084 1175
1085 $self 1176 $self
1086} 1177}
1087 1178
1088sub add { 1179sub add {
1089 my ($self, @widgets) = @_; 1180 my ($self, @widgets) = @_;
1090 1181
1091 $self->SUPER::add (@widgets); 1182 $self->SUPER::add (@widgets);
1183 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1184 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1185}
1094 1186
1095sub border { 1187sub border {
1096 int $_[0]{border} * $::FONTSIZE 1188 int $_[0]{border} * $::FONTSIZE
1097} 1189}
1098 1190
1099sub size_request { 1191sub size_request {
1100 my ($self) = @_; 1192 my ($self) = @_;
1101 1193
1102 $self->{title}->size_request 1194 $self->{title_widget}->size_request
1103 if $self->{title}; 1195 if $self->{title_widget};
1196
1197 $self->{close_button}->size_request
1198 if $self->{close_button};
1104 1199
1105 my ($w, $h) = $self->SUPER::size_request; 1200 my ($w, $h) = $self->SUPER::size_request;
1106 1201
1107 ( 1202 (
1108 $w + $self->border * 2, 1203 $w + $self->border * 2,
1109 $h + $self->border * 2, 1204 $h + $self->border * 2,
1110 ) 1205 )
1111} 1206}
1112 1207
1113sub size_allocate { 1208sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1115 1210
1116 if ($self->{title}) { 1211 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1212 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1213 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1214 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1215 }
1121 1216
1122 my $border = $self->border; 1217 my $border = $self->border;
1123 1218
1124 $h -= List::Util::max 0, $border * 2; 1219 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1220 $w -= List::Util::max 0, $border * 2;
1221
1222 $self->child->configure ($border, $border, $w, $h);
1223
1224 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1225 if $self->{close_button};
1226
1227 1
1228}
1229
1230sub invoke_delete {
1231 my ($self) = @_;
1232
1233 $self->hide;
1126 1234
1127 $self->child->configure ($border, $border, $w, $h); 1235 1
1128} 1236}
1129 1237
1130sub button_down { 1238sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1132 1240
1133 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1242 my $border = $self->border;
1135 1243
… …
1151 my $dy = $ev->{y} - $oy; 1259 my $dy = $ev->{y} - $oy;
1152 1260
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1261 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1262 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1263
1264 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1265 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1266 };
1159 1267
1160 } elsif ($lr ^ $td) { 1268 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1269 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1270 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1273 my ($ev, $x, $y) = @_;
1166 1274
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1275 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1276
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1277 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1278 # HACK: the next line is required to enforce placement
1279 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1280 };
1171 } else { 1281 } else {
1172 return 0; 1282 return 0;
1173 } 1283 }
1174 1284
1175 1 1285 1
1176} 1286}
1177 1287
1178sub button_up { 1288sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1289 my ($self, $ev, $x, $y) = @_;
1180 1290
1181 !!delete $self->{motion} 1291 ! ! delete $self->{motion}
1182} 1292}
1183 1293
1184sub mouse_motion { 1294sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1295 my ($self, $ev, $x, $y) = @_;
1186 1296
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1297 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1298
1189 !!$self->{motion} 1299 ! ! $self->{motion}
1300}
1301
1302sub invoke_visibility_change {
1303 my ($self, $visible) = @_;
1304
1305 delete $self->{motion} unless $visible;
1306
1307 0
1190} 1308}
1191 1309
1192sub _draw { 1310sub _draw {
1193 my ($self) = @_; 1311 my ($self) = @_;
1194 1312
… …
1220 1338
1221 glDisable GL_TEXTURE_2D; 1339 glDisable GL_TEXTURE_2D;
1222 1340
1223 $child->draw; 1341 $child->draw;
1224 1342
1225 if ($self->{title}) { 1343 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1344 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1345 $self->{title_widget}->_draw;
1346
1347 glTranslate 0, - ($border - $self->{h});
1228 } 1348 }
1349
1350 $self->{close_button}->draw
1351 if $self->{close_button};
1229} 1352}
1230 1353
1231############################################################################# 1354#############################################################################
1232 1355
1233package CFClient::UI::Table; 1356package CFPlus::UI::Table;
1234 1357
1235our @ISA = CFClient::UI::Base::; 1358our @ISA = CFPlus::UI::Base::;
1236 1359
1237use List::Util qw(max sum); 1360use List::Util qw(max sum);
1238 1361
1239use CFClient::OpenGL; 1362use CFPlus::OpenGL;
1240 1363
1241sub new { 1364sub new {
1242 my $class = shift; 1365 my $class = shift;
1243 1366
1244 $class->SUPER::new ( 1367 $class->SUPER::new (
… …
1250sub children { 1373sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252} 1375}
1253 1376
1254sub add { 1377sub add {
1255 my ($self, $x, $y, $child) = @_; 1378 my ($self) = shift;
1256 1379
1380 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, ();
1257 $child->set_parent ($self); 1382 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1383 $self->{children}[$y][$x] = $child;
1384 }
1259 1385
1386 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1;
1260 $self->realloc; 1388 $self->realloc;
1389}
1390
1391sub remove {
1392 my ($self, $child) = @_;
1393
1394 # TODO: not yet implemented
1261} 1395}
1262 1396
1263# TODO: move to container class maybe? send children a signal on removal? 1397# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1398sub clear {
1265 my ($self) = @_; 1399 my ($self) = @_;
… …
1306 (sum @$ws), 1440 (sum @$ws),
1307 (sum @$hs), 1441 (sum @$hs),
1308 ) 1442 )
1309} 1443}
1310 1444
1311sub size_allocate { 1445sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1446 my ($self, $w, $h) = @_;
1313 1447
1314 my ($ws, $hs) = $self->get_wh; 1448 my ($ws, $hs) = $self->get_wh;
1315 1449
1316 my $req_w = (sum @$ws) || 1; 1450 my $req_w = (sum @$ws) || 1;
… …
1323 1457
1324 # linearly scale sizes 1458 # linearly scale sizes
1325 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1326 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1327 1461
1328 CFClient::UI::harmonize $ws; 1462 CFPlus::UI::harmonize $ws;
1329 CFClient::UI::harmonize $hs; 1463 CFPlus::UI::harmonize $hs;
1330 1464
1331 my $y; 1465 my $y;
1332 1466
1333 for my $r (0 .. $#{$self->{children}}) { 1467 for my $r (0 .. $#{$self->{children}}) {
1334 my $row = $self->{children}[$r] 1468 my $row = $self->{children}[$r]
… …
1348 } 1482 }
1349 1483
1350 $y += $row_h; 1484 $y += $row_h;
1351 } 1485 }
1352 1486
1487 1
1353} 1488}
1354 1489
1355sub find_widget { 1490sub find_widget {
1356 my ($self, $x, $y) = @_; 1491 my ($self, $x, $y) = @_;
1357 1492
… …
1376 } 1511 }
1377} 1512}
1378 1513
1379############################################################################# 1514#############################################################################
1380 1515
1381package CFClient::UI::Box; 1516package CFPlus::UI::Box;
1382 1517
1383our @ISA = CFClient::UI::Container::; 1518our @ISA = CFPlus::UI::Container::;
1384 1519
1385sub size_request { 1520sub size_request {
1386 my ($self) = @_; 1521 my ($self) = @_;
1387 1522
1388 $self->{vertical} 1523 $self->{vertical}
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1529 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1530 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1531 )
1397} 1532}
1398 1533
1399sub size_allocate { 1534sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1535 my ($self, $w, $h) = @_;
1401 1536
1402 my $space = $self->{vertical} ? $h : $w; 1537 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1538 my @children = $self->visible_children;
1404 1539
1405 my @req; 1540 my @req;
1406 1541
1407 if ($self->{homogeneous}) { 1542 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1543 @req = ($space / (@children || 1)) x @children;
1409 } else { 1544 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1545 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1546 my $req = List::Util::sum @req;
1412 1547
1413 if ($req > $space) { 1548 if ($req > $space) {
1414 # ah well, not enough space 1549 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1550 $_ *= $space / $req for @req;
1416 } else { 1551 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1552 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1553
1419 $space = ($space - $req) / $expand; # remaining space to give away 1554 $space = ($space - $req) / $expand; # remaining space to give away
1420 1555
1421 $req[$_] += $space * $children->[$_]{expand} 1556 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1557 for 0 .. $#children;
1423 } 1558 }
1424 } 1559 }
1425 1560
1426 CFClient::UI::harmonize \@req; 1561 CFPlus::UI::harmonize \@req;
1427 1562
1428 my $pos = 0; 1563 my $pos = 0;
1429 for (0 .. $#$children) { 1564 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1565 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1566 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1567
1433 $pos += $alloc; 1568 $pos += $alloc;
1434 } 1569 }
1435 1570
1436 1 1571 1
1437} 1572}
1438 1573
1439############################################################################# 1574#############################################################################
1440 1575
1441package CFClient::UI::HBox; 1576package CFPlus::UI::HBox;
1442 1577
1443our @ISA = CFClient::UI::Box::; 1578our @ISA = CFPlus::UI::Box::;
1444 1579
1445sub new { 1580sub new {
1446 my $class = shift; 1581 my $class = shift;
1447 1582
1448 $class->SUPER::new ( 1583 $class->SUPER::new (
… …
1451 ) 1586 )
1452} 1587}
1453 1588
1454############################################################################# 1589#############################################################################
1455 1590
1456package CFClient::UI::VBox; 1591package CFPlus::UI::VBox;
1457 1592
1458our @ISA = CFClient::UI::Box::; 1593our @ISA = CFPlus::UI::Box::;
1459 1594
1460sub new { 1595sub new {
1461 my $class = shift; 1596 my $class = shift;
1462 1597
1463 $class->SUPER::new ( 1598 $class->SUPER::new (
… …
1466 ) 1601 )
1467} 1602}
1468 1603
1469############################################################################# 1604#############################################################################
1470 1605
1471package CFClient::UI::Label; 1606package CFPlus::UI::Label;
1472 1607
1473our @ISA = CFClient::UI::DrawBG::; 1608our @ISA = CFPlus::UI::DrawBG::;
1474 1609
1475use CFClient::OpenGL; 1610use CFPlus::OpenGL;
1476 1611
1477sub new { 1612sub new {
1478 my ($class, %arg) = @_; 1613 my ($class, %arg) = @_;
1479 1614
1480 my $self = $class->SUPER::new ( 1615 my $self = $class->SUPER::new (
… …
1483 #active_bg => none 1618 #active_bg => none
1484 #font => default_font 1619 #font => default_font
1485 #text => initial text 1620 #text => initial text
1486 #markup => initial narkup 1621 #markup => initial narkup
1487 #max_w => maximum pixel width 1622 #max_w => maximum pixel width
1623 #style => 0, # render flags
1488 ellipsise => 3, # end 1624 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1625 layout => (new CFPlus::Layout),
1490 fontsize => 1, 1626 fontsize => 1,
1491 align => -1, 1627 align => -1,
1492 valign => -1, 1628 valign => -1,
1493 padding_x => 2, 1629 padding_x => 2,
1494 padding_y => 2, 1630 padding_y => 2,
1495 can_events => 0, 1631 can_events => 0,
1496 %arg 1632 %arg
1497 ); 1633 );
1498 1634
1499 if (exists $self->{template}) { 1635 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1636 my $layout = new CFPlus::Layout;
1501 $layout->set_text (delete $self->{template}); 1637 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1638 $self->{template} = $layout;
1503 } 1639 }
1504 1640
1505 if (exists $self->{markup}) { 1641 if (exists $self->{markup}) {
… …
1509 } 1645 }
1510 1646
1511 $self 1647 $self
1512} 1648}
1513 1649
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1650sub update {
1525 my ($self) = @_; 1651 my ($self) = @_;
1526 1652
1527 delete $self->{texture}; 1653 delete $self->{texture};
1528 $self->SUPER::update; 1654 $self->SUPER::update;
1529} 1655}
1530 1656
1657sub realloc {
1658 my ($self) = @_;
1659
1660 delete $self->{ox};
1661 $self->SUPER::realloc;
1662}
1663
1531sub set_text { 1664sub set_text {
1532 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1533 1666
1534 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1536 1669
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1539 1671
1672 delete $self->{size_req};
1540 $self->realloc; 1673 $self->realloc;
1541 $self->update; 1674 $self->update;
1542} 1675}
1543 1676
1544sub set_markup { 1677sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1549 1682
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1684
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1554 1686
1687 delete $self->{size_req};
1555 $self->realloc; 1688 $self->realloc;
1556 $self->update; 1689 $self->update;
1557} 1690}
1558 1691
1559sub size_request { 1692sub size_request {
1560 my ($self) = @_; 1693 my ($self) = @_;
1561 1694
1695 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1696 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1697 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1698 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1701
1568 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1569 1703
1570 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1705 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1708
1574 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1575 1710
1576 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1712 $h = List::Util::max $h, $h2;
1713 }
1714
1715 [$w, $h]
1578 } 1716 };
1579 1717
1580 ($w, $h) 1718 @{ $self->{size_req} }
1581} 1719}
1582 1720
1721sub baseline_shift {
1722 $_[0]{layout}->descent
1723}
1724
1583sub size_allocate { 1725sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1726 my ($self, $w, $h) = @_;
1585 1727
1586 delete $self->{ox}; 1728 delete $self->{ox};
1587 1729
1588 delete $self->{texture} 1730 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1731 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1732
1733 1
1590} 1734}
1591 1735
1592sub set_fontsize { 1736sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1737 my ($self, $fontsize) = @_;
1594 1738
1595 $self->{fontsize} = $fontsize; 1739 $self->{fontsize} = $fontsize;
1740 delete $self->{size_req};
1596 delete $self->{texture}; 1741 delete $self->{texture};
1597 1742
1598 $self->realloc; 1743 $self->realloc;
1599} 1744}
1600 1745
1746sub reconfigure {
1747 my ($self) = @_;
1748
1749 delete $self->{size_req};
1750 delete $self->{texture};
1751
1752 $self->SUPER::reconfigure;
1753}
1754
1601sub _draw { 1755sub _draw {
1602 my ($self) = @_; 1756 my ($self) = @_;
1603 1757
1604 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1605 1759
1606 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1767
1614 new_from_layout CFClient::Texture $self->{layout} 1768 [$self->{layout}->size]
1615 }; 1769 };
1616 1770
1617 unless (exists $self->{ox}) { 1771 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1774 : ($self->{w} - $size->[0]) * 0.5);
1621 1775
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1778 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1779 };
1626 1780
1627 glEnable GL_TEXTURE_2D; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1783
1630 if ($tex->{format} == GL_ALPHA) { 1784 $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} 1785}
1639 1786
1640############################################################################# 1787#############################################################################
1641 1788
1642package CFClient::UI::EntryBase; 1789package CFPlus::UI::EntryBase;
1643 1790
1644our @ISA = CFClient::UI::Label::; 1791our @ISA = CFPlus::UI::Label::;
1645 1792
1646use CFClient::OpenGL; 1793use CFPlus::OpenGL;
1647 1794
1648sub new { 1795sub new {
1649 my $class = shift; 1796 my $class = shift;
1650 1797
1651 $class->SUPER::new ( 1798 $class->SUPER::new (
… …
1656 can_hover => 1, 1803 can_hover => 1,
1657 can_focus => 1, 1804 can_focus => 1,
1658 valign => 0, 1805 valign => 0,
1659 can_events => 1, 1806 can_events => 1,
1660 #text => ... 1807 #text => ...
1808 #hidden => "*",
1661 @_ 1809 @_
1662 ) 1810 )
1663} 1811}
1664 1812
1665sub _set_text { 1813sub _set_text {
… …
1667 1815
1668 delete $self->{cur_h}; 1816 delete $self->{cur_h};
1669 1817
1670 return if $self->{text} eq $text; 1818 return if $self->{text} eq $text;
1671 1819
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1821 $self->{text} = $text;
1676 1822
1677 $text =~ s/./*/g if $self->{hidden}; 1823 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1824 $self->{layout}->set_text ("$text ");
1825 delete $self->{size_req};
1679 1826
1680 $self->_emit (changed => $self->{text}); 1827 $self->emit (changed => $self->{text});
1828
1829 $self->realloc;
1830 $self->update;
1681} 1831}
1682 1832
1683sub set_text { 1833sub set_text {
1684 my ($self, $text) = @_; 1834 my ($self, $text) = @_;
1685 1835
1686 $self->{cursor} = length $text; 1836 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1837 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1838}
1691 1839
1692sub get_text { 1840sub get_text {
1693 $_[0]{text} 1841 $_[0]{text}
1694} 1842}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1847 my ($w, $h) = $self->SUPER::size_request;
1700 1848
1701 ($w + 1, $h) # add 1 for cursor 1849 ($w + 1, $h) # add 1 for cursor
1702} 1850}
1703 1851
1704sub key_down { 1852sub invoke_key_down {
1705 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1706 1854
1707 my $mod = $ev->{mod}; 1855 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1856 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1857 my $uni = $ev->{unicode};
… …
1712 1860
1713 if ($uni == 8) { 1861 if ($uni == 8) {
1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1715 } elsif ($uni == 127) { 1863 } elsif ($uni == 127) {
1716 substr $text, $self->{cursor}, 1, ""; 1864 substr $text, $self->{cursor}, 1, "";
1717 } elsif ($sym == CFClient::SDLK_LEFT) { 1865 } elsif ($sym == CFPlus::SDLK_LEFT) {
1718 --$self->{cursor} if $self->{cursor}; 1866 --$self->{cursor} if $self->{cursor};
1719 } elsif ($sym == CFClient::SDLK_RIGHT) { 1867 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1720 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1868 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1869 } elsif ($sym == CFPlus::SDLK_HOME) {
1722 $self->{cursor} = 0; 1870 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1871 } elsif ($sym == CFPlus::SDLK_END) {
1724 $self->{cursor} = length $text; 1872 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1873 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1874 $self->emit ('escape');
1727 } elsif ($uni) { 1875 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1876 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1877 } else {
1730 return 0; 1878 return 0;
1731 } 1879 }
… …
1735 $self->realloc; 1883 $self->realloc;
1736 1884
1737 1 1885 1
1738} 1886}
1739 1887
1740sub focus_in { 1888sub invoke_focus_in {
1741 my ($self) = @_; 1889 my ($self) = @_;
1742 1890
1743 $self->{last_activity} = $::NOW; 1891 $self->{last_activity} = $::NOW;
1744 1892
1745 $self->SUPER::focus_in; 1893 $self->SUPER::invoke_focus_in
1746} 1894}
1747 1895
1748sub button_down { 1896sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1897 my ($self, $ev, $x, $y) = @_;
1750 1898
1751 $self->SUPER::button_down ($ev, $x, $y); 1899 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1900
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1902
1755 # byte-index to char-index 1903 # byte-index to char-index
1756 my $text = $self->{text}; 1904 my $text = $self->{text};
1757 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1759 1907
1760 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1761 $self->update; 1909 $self->update;
1762 1910
1763 1 1911 1
1764} 1912}
1765 1913
1766sub mouse_motion { 1914sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1916# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1917
1770 0 1918 1
1771} 1919}
1772 1920
1773sub _draw { 1921sub _draw {
1774 my ($self) = @_; 1922 my ($self) = @_;
1775 1923
1776 local $self->{fg} = $self->{fg}; 1924 local $self->{fg} = $self->{fg};
1777 1925
1778 if ($FOCUS == $self) { 1926 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1927 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1928 $self->{fg} = $self->{active_fg};
1781 } else { 1929 } else {
1782 glColor @{$self->{bg}}; 1930 glColor_premultiply @{$self->{bg}};
1783 } 1931 }
1784 1932
1785 glEnable GL_BLEND; 1933 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1935 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1936 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1937 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1938 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1939 glVertex $self->{w}, 0;
… …
1810 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1811 glEnd; 1959 glEnd;
1812 } 1960 }
1813} 1961}
1814 1962
1815package CFClient::UI::Entry; 1963package CFPlus::UI::Entry;
1816 1964
1817our @ISA = CFClient::UI::EntryBase::; 1965our @ISA = CFPlus::UI::EntryBase::;
1818 1966
1819use CFClient::OpenGL; 1967use CFPlus::OpenGL;
1820 1968
1821sub key_down { 1969sub invoke_key_down {
1822 my ($self, $ev) = @_; 1970 my ($self, $ev) = @_;
1823 1971
1824 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
1825 1973
1826 if ($sym == 13) { 1974 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1975 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1976 my $txt = $self->get_text;
1977
1829 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1980 $self->emit (activate => $txt);
1832 $self->update; 1981 $self->update;
1833 1982
1834 } elsif ($sym == CFClient::SDLK_UP) { 1983 } elsif ($sym == CFPlus::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1984 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1985 $self->{history_saveback} = $self->get_text;
1837 } 1986 }
1838 if (@{$self->{history} || []} > 0) { 1987 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++; 1988 $self->{history_pointer}++;
… …
1841 $self->{history_pointer} = @{$self->{history} || []} - 1; 1990 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 } 1991 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1992 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 } 1993 }
1845 1994
1846 } elsif ($sym == CFClient::SDLK_DOWN) { 1995 } elsif ($sym == CFPlus::SDLK_DOWN) {
1847 $self->{history_pointer}--; 1996 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1997 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849 1998
1850 if ($self->{history_pointer} >= 0) { 1999 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2000 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else { 2001 } else {
1853 $self->set_text ($self->{history_saveback}); 2002 $self->set_text ($self->{history_saveback});
1854 } 2003 }
1855 2004
1856 } else { 2005 } else {
1857 return $self->SUPER::key_down ($ev) 2006 return $self->SUPER::invoke_key_down ($ev)
1858 } 2007 }
1859 2008
1860 1 2009 1
1861} 2010}
1862 2011
1863############################################################################# 2012#############################################################################
1864 2013
1865package CFClient::UI::Button; 2014package CFPlus::UI::Button;
1866 2015
1867our @ISA = CFClient::UI::Label::; 2016our @ISA = CFPlus::UI::Label::;
1868 2017
1869use CFClient::OpenGL; 2018use CFPlus::OpenGL;
1870 2019
1871my @tex = 2020my @tex =
1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2021 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1873 qw(b1_button_active.png); 2022 qw(b1_button_active.png);
1874 2023
1875sub new { 2024sub new {
1876 my $class = shift; 2025 my $class = shift;
1877 2026
… …
1886 can_events => 1, 2035 can_events => 1,
1887 @_ 2036 @_
1888 ) 2037 )
1889} 2038}
1890 2039
1891sub activate { }
1892
1893sub button_up { 2040sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2041 my ($self, $ev, $x, $y) = @_;
1895 2042
1896 $self->emit ("activate") 2043 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2044 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2045 && $y >= 0 && $y < $self->{h};
… …
1901} 2048}
1902 2049
1903sub _draw { 2050sub _draw {
1904 my ($self) = @_; 2051 my ($self) = @_;
1905 2052
1906 local $self->{fg} = $self->{fg}; 2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2054
1912 glEnable GL_TEXTURE_2D; 2055 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2057 glColor 0, 0, 0, 1;
1915 2058
… …
1920 $self->SUPER::_draw; 2063 $self->SUPER::_draw;
1921} 2064}
1922 2065
1923############################################################################# 2066#############################################################################
1924 2067
1925package CFClient::UI::CheckBox; 2068package CFPlus::UI::CheckBox;
1926 2069
1927our @ISA = CFClient::UI::DrawBG::; 2070our @ISA = CFPlus::UI::DrawBG::;
1928 2071
1929my @tex = 2072my @tex =
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2073 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2074 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1932 2075
1933use CFClient::OpenGL; 2076use CFPlus::OpenGL;
1934 2077
1935sub new { 2078sub new {
1936 my $class = shift; 2079 my $class = shift;
1937 2080
1938 $class->SUPER::new ( 2081 $class->SUPER::new (
… …
1952 my ($self) = @_; 2095 my ($self) = @_;
1953 2096
1954 (6) x 2 2097 (6) x 2
1955} 2098}
1956 2099
2100sub toggle {
2101 my ($self) = @_;
2102
2103 $self->{state} = !$self->{state};
2104 $self->emit (changed => $self->{state});
2105 $self->update;
2106}
2107
1957sub button_down { 2108sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2109 my ($self, $ev, $x, $y) = @_;
1959 2110
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2111 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2112 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2113 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2114 } else {
1965 return 0 2115 return 0
1966 } 2116 }
1967 2117
1968 1 2118 1
… …
1988 glDisable GL_TEXTURE_2D; 2138 glDisable GL_TEXTURE_2D;
1989} 2139}
1990 2140
1991############################################################################# 2141#############################################################################
1992 2142
1993package CFClient::UI::Image; 2143package CFPlus::UI::Image;
1994 2144
1995our @ISA = CFClient::UI::Base::; 2145our @ISA = CFPlus::UI::Base::;
1996 2146
1997use CFClient::OpenGL; 2147use CFPlus::OpenGL;
1998use Carp qw/confess/;
1999 2148
2000our %loaded_images; 2149our %texture_cache;
2001 2150
2002sub new { 2151sub new {
2003 my $class = shift; 2152 my $class = shift;
2004 2153
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2154 my $self = $class->SUPER::new (
2155 can_events => 0,
2156 @_,
2157 );
2006 2158
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2159 $self->{path} || $self->{tex}
2160 or Carp::croak "'path' or 'tex' attributes required";
2008 2161
2009 $loaded_images{$self->{image}} ||= 2162 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2011 2164
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2165 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2166
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2168
2018 $self 2169 $self
2019} 2170}
2020 2171
2172sub STORABLE_freeze {
2173 my ($self, $cloning) = @_;
2174
2175 $self->{path}
2176 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2177
2178 $self->{path}
2179}
2180
2181sub STORABLE_attach {
2182 my ($self, $cloning, $path) = @_;
2183
2184 $self->new (path => $path)
2185}
2186
2021sub size_request { 2187sub size_request {
2022 my ($self) = @_; 2188 my ($self) = @_;
2023 2189
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2190 ($self->{tex}{w}, $self->{tex}{h})
2025} 2191}
2026 2192
2027sub _draw { 2193sub _draw {
2028 my ($self) = @_; 2194 my ($self) = @_;
2029 2195
… …
2039 } 2205 }
2040 2206
2041 glEnable GL_TEXTURE_2D; 2207 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2209
2044 $tex->draw_quad_alpha (0, 0, $w, $h); 2210 $tex->draw_quad (0, 0, $w, $h);
2045 2211
2046 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
2047} 2213}
2048 2214
2049############################################################################# 2215#############################################################################
2050 2216
2217package CFPlus::UI::ImageButton;
2218
2219our @ISA = CFPlus::UI::Image::;
2220
2221use CFPlus::OpenGL;
2222
2223my %textures;
2224
2225sub new {
2226 my $class = shift;
2227
2228 my $self = $class->SUPER::new (
2229 padding_x => 4,
2230 padding_y => 4,
2231 fg => [1, 1, 1],
2232 active_fg => [0, 0, 1],
2233 can_hover => 1,
2234 align => 0,
2235 valign => 0,
2236 can_events => 1,
2237 @_
2238 );
2239}
2240
2241sub invoke_button_up {
2242 my ($self, $ev, $x, $y) = @_;
2243
2244 $self->emit ("activate")
2245 if $x >= 0 && $x < $self->{w}
2246 && $y >= 0 && $y < $self->{h};
2247
2248 1
2249}
2250
2251#############################################################################
2252
2051package CFClient::UI::VGauge; 2253package CFPlus::UI::VGauge;
2052 2254
2053our @ISA = CFClient::UI::Base::; 2255our @ISA = CFPlus::UI::Base::;
2054 2256
2055use List::Util qw(min max); 2257use List::Util qw(min max);
2056 2258
2057use CFClient::OpenGL; 2259use CFPlus::OpenGL;
2058 2260
2059my %tex = ( 2261my %tex = (
2060 food => [ 2262 food => [
2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2263 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2264 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2063 ], 2265 ],
2064 grace => [ 2266 grace => [
2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2267 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/ 2268 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2067 ], 2269 ],
2068 hp => [ 2270 hp => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2271 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2272 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2071 ], 2273 ],
2072 mana => [ 2274 mana => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 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/ 2276 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2075 ], 2277 ],
2076); 2278);
2077 2279
2078# eg. VGauge->new (gauge => 'food'), default gauge: food 2280# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2340 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2341 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2342
2141 my $h1 = $self->{h} * (1 - $ycut1); 2343 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2344 my $h2 = $self->{h} * (1 - $ycut2);
2345 my $h3 = $self->{h};
2346
2347 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2348
2144 glEnable GL_BLEND; 2349 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2350 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2351 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2352 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2353 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2354
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2355 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2356 glBegin GL_QUADS;
… …
2165 2371
2166 if ($t3) { 2372 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2373 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2374 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2375 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2376 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2377 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2378 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2379 glEnd;
2174 } 2380 }
2175 2381
2176 glDisable GL_BLEND; 2382 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2383 glDisable GL_TEXTURE_2D;
2178} 2384}
2179 2385
2180############################################################################# 2386#############################################################################
2181 2387
2182package CFClient::UI::Gauge; 2388package CFPlus::UI::Gauge;
2183 2389
2184our @ISA = CFClient::UI::VBox::; 2390our @ISA = CFPlus::UI::VBox::;
2185 2391
2186sub new { 2392sub new {
2187 my ($class, %arg) = @_; 2393 my ($class, %arg) = @_;
2188 2394
2189 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
… …
2191 can_hover => 1, 2397 can_hover => 1,
2192 can_events => 1, 2398 can_events => 1,
2193 %arg, 2399 %arg,
2194 ); 2400 );
2195 2401
2196 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2402 $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); 2403 $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"); 2404 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2199 2405
2200 $self 2406 $self
2201} 2407}
2202 2408
2203sub set_fontsize { 2409sub set_fontsize {
… …
2224 $self->{value}->set_text ($val); 2430 $self->{value}->set_text ($val);
2225} 2431}
2226 2432
2227############################################################################# 2433#############################################################################
2228 2434
2229package CFClient::UI::Slider; 2435package CFPlus::UI::Slider;
2230 2436
2231use strict; 2437use strict;
2232 2438
2233use CFClient::OpenGL; 2439use CFPlus::OpenGL;
2234 2440
2235our @ISA = CFClient::UI::DrawBG::; 2441our @ISA = CFPlus::UI::DrawBG::;
2236 2442
2237my @tex = 2443my @tex =
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2444 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2239 qw(s1_slider.png s1_slider_bg.png); 2445 qw(s1_slider.png s1_slider_bg.png);
2240 2446
2241sub new { 2447sub new {
2242 my $class = shift; 2448 my $class = shift;
2243 2449
… …
2264 $self->update; 2470 $self->update;
2265 2471
2266 $self 2472 $self
2267} 2473}
2268 2474
2269sub changed { }
2270
2271sub set_range { 2475sub set_range {
2272 my ($self, $range) = @_; 2476 my ($self, $range) = @_;
2273 2477
2274 ($range, $self->{range}) = ($self->{range}, $range); 2478 ($range, $self->{range}) = ($self->{range}, $range);
2275 2479
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2480 if ("@$range" ne "@{$self->{range}}") {
2481 $self->update;
2482 $self->set_value ($self->{range}[0]);
2483 }
2278} 2484}
2279 2485
2280sub set_value { 2486sub set_value {
2281 my ($self, $value) = @_; 2487 my ($self, $value) = @_;
2282 2488
… …
2293 if $unit; 2499 if $unit;
2294 2500
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2501 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2502
2297 if ($value != $old_value) { 2503 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2504 $self->emit (changed => $value);
2299 $self->update; 2505 $self->update;
2300 } 2506 }
2301} 2507}
2302 2508
2303sub size_request { 2509sub size_request {
2304 my ($self) = @_; 2510 my ($self) = @_;
2305 2511
2306 ($self->{req_w}, $self->{req_h}) 2512 ($self->{req_w}, $self->{req_h})
2307} 2513}
2308 2514
2309sub button_down { 2515sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2311 2517
2312 $self->SUPER::button_down ($ev, $x, $y); 2518 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2519
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2520 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2521
2316 $self->mouse_motion ($ev, $x, $y) 2522 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2523}
2318 2524
2319sub mouse_motion { 2525sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2526 my ($self, $ev, $x, $y) = @_;
2321 2527
2322 if ($GRAB == $self) { 2528 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2529 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2530
… …
2332 } 2538 }
2333 2539
2334 1 2540 1
2335} 2541}
2336 2542
2543sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_;
2545
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2549
2550 ! ! $delta
2551}
2552
2337sub update { 2553sub update {
2338 my ($self) = @_; 2554 my ($self) = @_;
2339 2555
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2556 delete $self->{knob_w};
2557 $self->SUPER::update;
2558}
2559
2560sub _draw {
2561 my ($self) = @_;
2562
2563 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2564 $self->set_value ($self->{range}[0]);
2342 2565
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2566 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2567 my $range = ($hi - $page - $lo) || 1e-100;
2345 2568
… …
2351 $value = ($value - $lo) / $range; 2574 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2575 $value = $value * $self->{scale} + $self->{offset};
2353 2576
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2577 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2578 $self->{knob_w} = $knob_w;
2356 }); 2579 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2580
2364 $self->SUPER::_draw (); 2581 $self->SUPER::_draw ();
2365 2582
2366 glScale $self->{w}, $self->{h}; 2583 glScale $self->{w}, $self->{h};
2367 2584
… …
2387 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2388} 2605}
2389 2606
2390############################################################################# 2607#############################################################################
2391 2608
2392package CFClient::UI::ValSlider; 2609package CFPlus::UI::ValSlider;
2393 2610
2394our @ISA = CFClient::UI::HBox::; 2611our @ISA = CFPlus::UI::HBox::;
2395 2612
2396sub new { 2613sub new {
2397 my ($class, %arg) = @_; 2614 my ($class, %arg) = @_;
2398 2615
2399 my $range = delete $arg{range}; 2616 my $range = delete $arg{range};
2400 2617
2401 my $self = $class->SUPER::new ( 2618 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2619 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2620 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift }, 2621 to_value => sub { shift },
2405 from_value => sub { shift }, 2622 from_value => sub { shift },
2406 %arg, 2623 %arg,
2407 ); 2624 );
2408 2625
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2645sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2646sub set_value { shift->{slider}->set_value (@_) }
2430 2647
2431############################################################################# 2648#############################################################################
2432 2649
2433package CFClient::UI::TextView; 2650package CFPlus::UI::TextScroller;
2434 2651
2435our @ISA = CFClient::UI::HBox::; 2652our @ISA = CFPlus::UI::HBox::;
2436 2653
2437use CFClient::OpenGL; 2654use CFPlus::OpenGL;
2438 2655
2439sub new { 2656sub new {
2440 my $class = shift; 2657 my $class = shift;
2441 2658
2442 my $self = $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2443 fontsize => 1, 2660 fontsize => 1,
2444 can_events => 0, 2661 can_events => 1,
2662 indent => 0,
2445 #font => default_font 2663 #font => default_font
2446 @_, 2664 @_,
2447 2665
2448 layout => (new CFClient::Layout 1), 2666 layout => (new CFPlus::Layout),
2449 par => [], 2667 par => [],
2450 height => 0, 2668 height => 0,
2451 children => [ 2669 children => [
2452 (new CFClient::UI::Empty expand => 1), 2670 (new CFPlus::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2671 (new CFPlus::UI::Slider vertical => 1),
2454 ], 2672 ],
2455 ); 2673 );
2456 2674
2457 $self->{children}[1]->connect (changed => sub { $self->update }); 2675 $self->{children}[1]->connect (changed => sub { $self->update });
2458 2676
… …
2464 2682
2465 $self->{fontsize} = $fontsize; 2683 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2684 $self->reflow;
2467} 2685}
2468 2686
2687sub size_request {
2688 my ($self) = @_;
2689
2690 my ($empty, $slider) = @{ $self->{children} };
2691
2692 local $self->{children} = [$empty, $slider];
2693 $self->SUPER::size_request
2694}
2695
2469sub size_allocate { 2696sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2697 my ($self, $w, $h) = @_;
2471 2698
2472 $self->SUPER::size_allocate ($w, $h); 2699 my ($empty, $slider, @other) = @{ $self->{children} };
2700 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2701
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2702 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2703 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2704 $self->{layout}->set_width ($empty->{w});
2705 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2706
2478 $self->reflow; 2707 $self->reflow;
2479}
2480 2708
2481sub text_size { 2709 local $self->{children} = [$empty, $slider];
2710 $self->SUPER::invoke_size_allocate ($w, $h)
2711}
2712
2713sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2714 my ($self, $ev) = @_;
2715
2716 return 0 unless $ev->{dy}; # only vertical movements
2717
2718 $self->{children}[1]->emit (mouse_wheel => $ev);
2719
2720 1
2721}
2722
2723sub get_layout {
2724 my ($self, $para) = @_;
2483 2725
2484 my $layout = $self->{layout}; 2726 my $layout = $self->{layout};
2485 2727
2728 $layout->set_font ($self->{font}) if $self->{font};
2729 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2730 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2731 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2732 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2733 $layout->set_markup ($para->{markup});
2734
2735 $layout->set_shapes (
2736 map
2737 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2738 @{$para->{widget}}
2489 2739 );
2740
2490 $layout->size 2741 $layout
2491} 2742}
2492 2743
2493sub reflow { 2744sub reflow {
2494 my ($self) = @_; 2745 my ($self) = @_;
2495 2746
… …
2504 $self->{children}[1]->set_value ($offset); 2755 $self->{children}[1]->set_value ($offset);
2505} 2756}
2506 2757
2507sub clear { 2758sub clear {
2508 my ($self) = @_; 2759 my ($self) = @_;
2760
2761 my (undef, undef, @other) = @{ $self->{children} };
2762 $self->remove ($_) for @other;
2509 2763
2510 $self->{par} = []; 2764 $self->{par} = [];
2511 $self->{height} = 0; 2765 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2766 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2767}
2514 2768
2515sub add_paragraph { 2769sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2770 my $self = shift;
2517 2771
2518 for my $line (split /\n/, $text) { 2772 for my $para (@_) {
2519 my ($w, $h) = $self->text_size ($line); 2773 $para = {
2520 $self->{height} += $h; 2774 fg => [1, 1, 1, 1],
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2775 indent => 0,
2522 } 2776 markup => "",
2777 widget => [],
2778 ref $para ? %$para : (markup => $para),
2779 w => 1e10,
2780 wrapped => 1,
2781 };
2523 2782
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para;
2785 }
2786
2787 $self->{need_reflow}++;
2788 $self->update;
2789}
2790
2791sub scroll_to_bottom {
2792 my ($self) = @_;
2793
2794 $self->{scroll_to_bottom} = 1;
2795 $self->update;
2525} 2796}
2526 2797
2527sub update { 2798sub update {
2528 my ($self) = @_; 2799 my ($self) = @_;
2529 2800
… …
2531 2802
2532 return unless $self->{h} > 0; 2803 return unless $self->{h} > 0;
2533 2804
2534 delete $self->{texture}; 2805 delete $self->{texture};
2535 2806
2536 $ROOT->on_post_alloc ($self, sub { 2807 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2809
2539 if (delete $self->{need_reflow}) { 2810 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2811 my $height = 0;
2541 2812
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2813 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2814 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2815 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2816 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2817
2552 $_->[1] = $h; 2818 $para->{w} = $w + $para->{indent};
2819 $para->{h} = $h;
2820 $para->{wrapped} = $layout->has_wrapped;
2553 } 2821 }
2554 2822
2555 $height += $_->[1]; 2823 $height += $para->{h};
2556 } 2824 }
2557 2825
2558 $self->{height} = $height; 2826 $self->{height} = $height;
2559 2827
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2828 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2829
2562 delete $self->{texture}; 2830 delete $self->{texture};
2563 } 2831 }
2564 2832
2833 if (delete $self->{scroll_to_bottom}) {
2834 $self->{children}[1]->set_value (1e10);
2835 }
2836
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2838 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2839 glClear GL_COLOR_BUFFER_BIT;
2568 2840
2569 my $top = int $self->{children}[1]{range}[0]; 2841 my $top = int $self->{children}[1]{range}[0];
2570 2842
2571 my $y0 = $top; 2843 my $y0 = $top;
2572 my $y1 = $top + $H; 2844 my $y1 = $top + $H;
2573 2845
2574 my $y = 0; 2846 my $y = 0;
2575 2847
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}}) { 2848 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2849 my $h = $para->{h};
2586 2850
2587 if ($y0 < $y + $h && $y < $y1) { 2851 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2852
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2853 my $layout = $self->get_layout ($para);
2593 2854
2594 glRasterPos $par->[3], $y - $y0; 2855 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2856
2857 if (my @w = @{ $para->{widget} }) {
2858 my @s = $layout->get_shapes;
2859
2860 for (@w) {
2861 my ($dx, $dy) = splice @s, 0, 2, ();
2862
2863 $_->{x} = $dx + $para->{indent};
2864 $_->{y} = $dy + $y - $y0;
2865
2866 $_->draw;
2867 }
2868 }
2596 } 2869 }
2597 2870
2598 $y += $h; 2871 $y += $h;
2599 } 2872 }
2600
2601 glDisable GL_BLEND;
2602 }; 2873 };
2603 }); 2874 });
2604} 2875}
2605 2876
2877sub reconfigure {
2878 my ($self) = @_;
2879
2880 $self->SUPER::reconfigure;
2881
2882 $_->{w} = 1e10 for @{ $self->{par} };
2883 $self->reflow;
2884}
2885
2606sub _draw { 2886sub _draw {
2607 my ($self) = @_; 2887 my ($self) = @_;
2608 2888
2609 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2892 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2614 2894
2615 $self->{children}[1]->draw; 2895 $self->{children}[1]->draw;
2616
2617} 2896}
2618 2897
2619############################################################################# 2898#############################################################################
2620 2899
2621package CFClient::UI::Animator; 2900package CFPlus::UI::Animator;
2622 2901
2623use CFClient::OpenGL; 2902use CFPlus::OpenGL;
2624 2903
2625our @ISA = CFClient::UI::Bin::; 2904our @ISA = CFPlus::UI::Bin::;
2626 2905
2627sub moveto { 2906sub moveto {
2628 my ($self, $x, $y) = @_; 2907 my ($self, $x, $y) = @_;
2629 2908
2630 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2658 glPopMatrix; 2937 glPopMatrix;
2659} 2938}
2660 2939
2661############################################################################# 2940#############################################################################
2662 2941
2663package CFClient::UI::Flopper; 2942package CFPlus::UI::Flopper;
2664 2943
2665our @ISA = CFClient::UI::Button::; 2944our @ISA = CFPlus::UI::Button::;
2666 2945
2667sub new { 2946sub new {
2668 my $class = shift; 2947 my $class = shift;
2669 2948
2670 my $self = $class->SUPER::new ( 2949 my $self = $class->SUPER::new (
… …
2682 $self->{other}->toggle_visibility; 2961 $self->{other}->toggle_visibility;
2683} 2962}
2684 2963
2685############################################################################# 2964#############################################################################
2686 2965
2687package CFClient::UI::Tooltip; 2966package CFPlus::UI::Tooltip;
2688 2967
2689our @ISA = CFClient::UI::Bin::; 2968our @ISA = CFPlus::UI::Bin::;
2690 2969
2691use CFClient::OpenGL; 2970use CFPlus::OpenGL;
2692 2971
2693sub new { 2972sub new {
2694 my $class = shift; 2973 my $class = shift;
2695 2974
2696 $class->SUPER::new ( 2975 $class->SUPER::new (
… …
2699 ) 2978 )
2700} 2979}
2701 2980
2702sub set_tooltip_from { 2981sub set_tooltip_from {
2703 my ($self, $widget) = @_; 2982 my ($self, $widget) = @_;
2983
2984 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2985 if $widget->{tooltip} =~ /^#(.*)$/;
2704 2986
2705 my $tooltip = $widget->{tooltip}; 2987 my $tooltip = $widget->{tooltip};
2706 2988
2707 if ($ENV{CFPLUS_DEBUG} & 2) { 2989 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2990 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2991 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2992 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2993 . "visible $widget->{visible}";
2712 } 2994 }
2713 2995
2996 $tooltip =~ s/^\n+//;
2997 $tooltip =~ s/\n+$//;
2998
2714 $self->add (new CFClient::UI::Label 2999 $self->add (new CFPlus::UI::Label
2715 markup => $tooltip, 3000 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3001 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 3002 fontsize => 0.8,
2718 fg => [0, 0, 0, 1], 3003 style => 1, # FLAG_INVERSE
2719 ellipsise => 0, 3004 ellipsise => 0,
2720 font => ($widget->{tooltip_font} || $::FONT_PROP), 3005 font => ($widget->{tooltip_font} || $::FONT_PROP),
2721 ); 3006 );
2722} 3007}
2723 3008
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3012 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3013
2729 ($w + 4, $h + 4) 3014 ($w + 4, $h + 4)
2730} 3015}
2731 3016
2732sub size_allocate { 3017sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3018 my ($self, $w, $h) = @_;
2734 3019
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3020 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3021}
2737 3022
2738sub visibility_change { 3023sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3024 my ($self, $visible) = @_;
2740 3025
2741 return unless $visible; 3026 return unless $visible;
2742 3027
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3028 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3029 my $widget = $self->{owner}
2745 or return; 3030 or return;
2746 3031
3032 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3033 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3034
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3035 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3036 if $x + $self->{w} > $self->{root}{w};
2751 3037
2752 $self->move_abs ($x, $y); 3038 $self->move_abs ($x, $y);
3039 } else {
3040 $self->hide;
3041 }
2753 }); 3042 });
2754} 3043}
2755 3044
2756sub _draw { 3045sub _draw {
2757 my ($self) = @_; 3046 my ($self) = @_;
… …
2781 $self->SUPER::_draw; 3070 $self->SUPER::_draw;
2782} 3071}
2783 3072
2784############################################################################# 3073#############################################################################
2785 3074
2786package CFClient::UI::Face; 3075package CFPlus::UI::Face;
2787 3076
2788our @ISA = CFClient::UI::Base::; 3077our @ISA = CFPlus::UI::DrawBG::;
2789 3078
2790use CFClient::OpenGL; 3079use CFPlus::OpenGL;
2791 3080
2792sub new { 3081sub new {
2793 my $class = shift; 3082 my $class = shift;
2794 3083
2795 my $self = $class->SUPER::new ( 3084 my $self = $class->SUPER::new (
… …
2830sub _draw { 3119sub _draw {
2831 my ($self) = @_; 3120 my ($self) = @_;
2832 3121
2833 return unless $::CONN; 3122 return unless $::CONN;
2834 3123
3124 $self->SUPER::_draw;
3125
2835 my $face; 3126 my $face;
2836 3127
2837 if ($self->{frame}) { 3128 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}]; 3129 my $anim = $::CONN->{anim}[$self->{anim}];
2839 3130
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3135 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3136
2846 if ($tex) { 3137 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3138 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3140 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3141 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3142 glDisable GL_TEXTURE_2D;
2852 } 3143 }
2853} 3144}
2854 3145
2855sub DESTROY { 3146sub destroy {
2856 my ($self) = @_; 3147 my ($self) = @_;
2857 3148
2858 $self->{timer}->cancel 3149 $self->{timer}->cancel
2859 if $self->{timer}; 3150 if $self->{timer};
2860 3151
2861 $self->SUPER::DESTROY; 3152 $self->SUPER::destroy;
2862} 3153}
2863 3154
2864############################################################################# 3155#############################################################################
2865 3156
2866package CFClient::UI::Buttonbar; 3157package CFPlus::UI::Buttonbar;
2867 3158
2868our @ISA = CFClient::UI::HBox::; 3159our @ISA = CFPlus::UI::HBox::;
2869 3160
2870# TODO: should actualyl wrap buttons and other goodies. 3161# TODO: should actualyl wrap buttons and other goodies.
2871 3162
2872############################################################################# 3163#############################################################################
2873 3164
2874package CFClient::UI::Menu; 3165package CFPlus::UI::Menu;
2875 3166
2876our @ISA = CFClient::UI::FancyFrame::; 3167our @ISA = CFPlus::UI::FancyFrame::;
2877 3168
2878use CFClient::OpenGL; 3169use CFPlus::OpenGL;
2879 3170
2880sub new { 3171sub new {
2881 my $class = shift; 3172 my $class = shift;
2882 3173
2883 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2884 items => [], 3175 items => [],
2885 z => 100, 3176 z => 100,
2886 @_, 3177 @_,
2887 ); 3178 );
2888 3179
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3180 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2890 3181
2891 for my $item (@{ $self->{items} }) { 3182 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3183 my ($widget, $cb, $tooltip) = @$item;
2893 3184
2894 # handle various types of items, only text for now 3185 # handle various types of items, only text for now
2895 if (!ref $widget) { 3186 if (!ref $widget) {
3187 if ($widget =~ /\t/) {
3188 my ($left, $right) = split /\t/, $widget, 2;
3189
2896 $widget = new CFClient::UI::Label 3190 $widget = new CFPlus::UI::HBox
2897 can_hover => 1, 3191 can_hover => 1,
2898 can_events => 1, 3192 can_events => 1,
3193 tooltip => $tooltip,
3194 children => [
3195 (new CFPlus::UI::Label markup => $left, expand => 1),
3196 (new CFPlus::UI::Label markup => $right, align => +1),
3197 ],
3198 ;
3199
3200 } else {
3201 $widget = new CFPlus::UI::Label
3202 can_hover => 1,
3203 can_events => 1,
2899 text => $widget; 3204 markup => $widget,
3205 tooltip => $tooltip;
3206 }
2900 } 3207 }
2901 3208
2902 $self->{item}{$widget} = $item; 3209 $self->{item}{$widget} = $item;
2903 3210
2904 $self->{vbox}->add ($widget); 3211 $self->{vbox}->add ($widget);
… …
2909 3216
2910# popup given the event (must be a mouse button down event currently) 3217# popup given the event (must be a mouse button down event currently)
2911sub popup { 3218sub popup {
2912 my ($self, $ev) = @_; 3219 my ($self, $ev) = @_;
2913 3220
2914 $self->_emit ("popdown"); 3221 $self->emit ("popdown");
2915 3222
2916 # maybe save $GRAB? must be careful about events... 3223 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3224 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3225 $self->{button} = $ev->{button};
2919 3226
2920 $self->show; 3227 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3228 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3229}
2923 3230
2924sub mouse_motion { 3231sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3232 my ($self, $ev, $x, $y) = @_;
2926 3233
2927 # TODO: should use vbox->find_widget or so 3234 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3235 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3236 $self->{hover} = $self->{item}{$HOVER};
2930 3237
2931 0 3238 0
2932} 3239}
2933 3240
2934sub button_up { 3241sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3242 my ($self, $ev, $x, $y) = @_;
2936 3243
2937 if ($ev->{button} == $self->{button}) { 3244 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3245 undef $GRAB;
2939 $self->hide; 3246 $self->hide;
2940 3247
2941 $self->_emit ("popdown"); 3248 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3249 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3250 } else {
2944 return 0 3251 return 0
2945 } 3252 }
2946 3253
2947 1 3254 1
2948} 3255}
2949 3256
2950############################################################################# 3257#############################################################################
2951 3258
2952package CFClient::UI::Multiplexer; 3259package CFPlus::UI::Multiplexer;
2953 3260
2954our @ISA = CFClient::UI::Container::; 3261our @ISA = CFPlus::UI::Container::;
2955 3262
2956sub new { 3263sub new {
2957 my $class = shift; 3264 my $class = shift;
2958 3265
2959 my $self = $class->SUPER::new ( 3266 my $self = $class->SUPER::new (
… …
2973 3280
2974 $self->{current} = $self->{children}[0] 3281 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3282 if @{ $self->{children} };
2976} 3283}
2977 3284
3285sub get_current_page {
3286 my ($self) = @_;
3287
3288 $self->{current}
3289}
3290
2978sub set_current_page { 3291sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3292 my ($self, $page_or_widget) = @_;
2980 3293
2981 my $widget = ref $page_or_widget 3294 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3295 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3296 : $self->{children}[$page_or_widget];
2984 3297
2985 $self->{current} = $widget; 3298 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3299 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3300
2988 $self->_emit (page_changed => $self->{current}); 3301 $self->emit (page_changed => $self->{current});
2989 3302
2990 $self->realloc; 3303 $self->realloc;
2991} 3304}
2992 3305
2993sub visible_children { 3306sub visible_children {
… …
2998 my ($self) = @_; 3311 my ($self) = @_;
2999 3312
3000 $self->{current}->size_request 3313 $self->{current}->size_request
3001} 3314}
3002 3315
3003sub size_allocate { 3316sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3317 my ($self, $w, $h) = @_;
3005 3318
3006 $self->{current}->configure (0, 0, $w, $h); 3319 $self->{current}->configure (0, 0, $w, $h);
3320
3321 1
3007} 3322}
3008 3323
3009sub _draw { 3324sub _draw {
3010 my ($self) = @_; 3325 my ($self) = @_;
3011 3326
3012 $self->{current}->draw; 3327 $self->{current}->draw;
3013} 3328}
3014 3329
3015############################################################################# 3330#############################################################################
3016 3331
3017package CFClient::UI::Notebook; 3332package CFPlus::UI::Notebook;
3018 3333
3019our @ISA = CFClient::UI::VBox::; 3334our @ISA = CFPlus::UI::VBox::;
3020 3335
3021sub new { 3336sub new {
3022 my $class = shift; 3337 my $class = shift;
3023 3338
3024 my $self = $class->SUPER::new ( 3339 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3340 buttonbar => (new CFPlus::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3341 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3342 # filter => # will be put between multiplexer and $self
3027 @_, 3343 @_,
3028 ); 3344 );
3029 3345
3346 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3347 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3348
3032 $self 3349 $self
3033} 3350}
3034 3351
3035sub add { 3352sub add {
3036 my ($self, $title, $widget, $tooltip) = @_; 3353 my ($self, $title, $widget, $tooltip) = @_;
3037 3354
3038 Scalar::Util::weaken $self; 3355 Scalar::Util::weaken $self;
3039 3356
3040 $self->{buttonbar}->add (new CFClient::UI::Button 3357 $self->{buttonbar}->add (new CFPlus::UI::Button
3041 markup => $title, 3358 markup => $title,
3042 tooltip => $tooltip, 3359 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) }, 3360 on_activate => sub { $self->set_current_page ($widget) },
3044 ); 3361 );
3045 3362
3046 $self->{multiplexer}->add ($widget); 3363 $self->{multiplexer}->add ($widget);
3047} 3364}
3048 3365
3366sub get_current_page {
3367 my ($self) = @_;
3368
3369 $self->{multiplexer}->get_current_page
3370}
3371
3049sub set_current_page { 3372sub set_current_page {
3050 my ($self, $page) = @_; 3373 my ($self, $page) = @_;
3051 3374
3052 $self->{multiplexer}->set_current_page ($page); 3375 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3376 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3377}
3055 3378
3056############################################################################# 3379#############################################################################
3057 3380
3058package CFClient::UI::Statusbox; 3381package CFPlus::UI::Selector;
3059 3382
3383use utf8;
3384
3060our @ISA = CFClient::UI::VBox::; 3385our @ISA = CFPlus::UI::Button::;
3061 3386
3062sub new { 3387sub new {
3063 my $class = shift; 3388 my $class = shift;
3064 3389
3065 $class->SUPER::new ( 3390 my $self = $class->SUPER::new (
3391 options => [], # [value, title, longdesc], ...
3392 value => undef,
3393 @_,
3394 );
3395
3396 $self->_set_value ($self->{value});
3397
3398 $self
3399}
3400
3401sub invoke_button_down {
3402 my ($self, $ev) = @_;
3403
3404 my @menu_items;
3405
3406 for (@{ $self->{options} }) {
3407 my ($value, $title, $tooltip) = @$_;
3408
3409 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3410 }
3411
3412 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3413}
3414
3415sub _set_value {
3416 my ($self, $value) = @_;
3417
3418 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3419 or return;
3420
3421 $self->{value} = $item->[0];
3422 $self->set_markup ("$item->[1] ⇓");
3423 $self->set_tooltip ($item->[2]);
3424}
3425
3426sub set_value {
3427 my ($self, $value) = @_;
3428
3429 return unless $self->{value} ne $value;
3430
3431 $self->_set_value ($value);
3432 $self->emit (changed => $value);
3433}
3434
3435#############################################################################
3436
3437package CFPlus::UI::Statusbox;
3438
3439our @ISA = CFPlus::UI::VBox::;
3440
3441sub new {
3442 my $class = shift;
3443
3444 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3445 fontsize => 0.8,
3067 @_, 3446 @_,
3068 ) 3447 );
3448
3449 Scalar::Util::weaken (my $this = $self);
3450
3451 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3452
3453 $self
3069} 3454}
3070 3455
3071sub reorder { 3456sub reorder {
3072 my ($self) = @_; 3457 my ($self) = @_;
3073 my $NOW = time; 3458 my $NOW = Time::HiRes::time;
3459
3460 # freeze display when hovering over any label
3461 return if $CFPlus::UI::TOOLTIP->{owner}
3462 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3463 values %{ $self->{item} };
3074 3464
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3465 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3466 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3467 }
3078 3468
… …
3081 my @items = sort { 3471 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3472 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3473 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3474 } values %{ $self->{item} };
3085 3475
3476 $self->{timer}->interval (1);
3477
3086 my $count = 10 + 1; 3478 my $count = 10 + 1;
3087 for my $item (@items) { 3479 for my $item (@items) {
3088 last unless --$count; 3480 last unless --$count;
3089 3481
3090 push @widgets, $item->{label} ||= do { 3482 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3483 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3484 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3485 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3486 : $item->{text};
3095 3487
3096 for ($short) { 3488 for ($short) {
3097 s/^\s+//; 3489 s/^\s+//;
3098 s/\s+/ /g; 3490 s/\s+/ /g;
3099 } 3491 }
3100 3492
3101 new CFClient::UI::Label 3493 new CFPlus::UI::Label
3102 markup => $short, 3494 markup => $short,
3103 tooltip => $item->{tooltip}, 3495 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3496 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3497 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3498 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3499 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3500 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3501 can_events => 1,
3110 can_hover => 1 3502 can_hover => 1
3111 }; 3503 };
3504
3505 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3506 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3507 $label->update;
3508 $label->set_max_size (undef, $label->{req_h} * $diff)
3509 if $diff < 1;
3510 $self->{timer}->interval (1/30);
3511 } else {
3512 $label->{fg}[3] = $item->{fg}[3] || 1;
3513 }
3514
3515 push @widgets, $label;
3112 } 3516 }
3113 3517
3114 $self->clear; 3518 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3519 $self->SUPER::add (reverse @widgets);
3116} 3520}
… …
3121 $text =~ s/^\s+//; 3525 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3526 $text =~ s/\s+$//;
3123 3527
3124 return unless $text; 3528 return unless $text;
3125 3529
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3530 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3531
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3532 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3533
3130 if (my $item = $self->{item}{$group}) { 3534 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3535 if ($item->{text} eq $text) {
3132 $item->{count}++; 3536 $item->{count}++;
3133 } else { 3537 } else {
3134 $item->{count} = 1; 3538 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3539 $item->{text} = $item->{tooltip} = $text;
3136 } 3540 }
3137 $item->{id} = ++$self->{id}; 3541 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3542 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3543 delete $item->{label};
3140 } else { 3544 } else {
3141 $self->{item}{$group} = { 3545 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3546 id => ++$self->{id},
… …
3148 count => 1, 3552 count => 1,
3149 %arg, 3553 %arg,
3150 }; 3554 };
3151 } 3555 }
3152 3556
3557 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3558 $self->reorder;
3559 });
3154} 3560}
3155 3561
3156sub reconfigure { 3562sub reconfigure {
3157 my ($self) = @_; 3563 my ($self) = @_;
3158 3564
… …
3161 3567
3162 $self->reorder; 3568 $self->reorder;
3163 $self->SUPER::reconfigure; 3569 $self->SUPER::reconfigure;
3164} 3570}
3165 3571
3572sub destroy {
3573 my ($self) = @_;
3574
3575 $self->{timer}->cancel;
3576
3577 $self->SUPER::destroy;
3578}
3579
3166############################################################################# 3580#############################################################################
3167 3581
3168package CFClient::UI::Inventory; 3582package CFPlus::UI::Inventory;
3169 3583
3170our @ISA = CFClient::UI::ScrolledWindow::; 3584our @ISA = CFPlus::UI::Table::;
3171 3585
3172sub new { 3586sub new {
3173 my $class = shift; 3587 my $class = shift;
3174 3588
3175 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3590 col_expand => [0, 1, 0],
3591 items => [],
3177 @_, 3592 @_,
3178 ); 3593 );
3179 3594
3595 $self->set_sort_order (undef);
3596
3180 $self 3597 $self
3598}
3599
3600sub update_items {
3601 my ($self) = @_;
3602
3603 $self->clear;
3604
3605 my @item = $self->{sort}->(@{ $self->{items} });
3606
3607 my @adds;
3608 my $row = 0;
3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3610 CFPlus::Item::update_widgets $item;
3611
3612 push @adds, 0, $row, $item->{face_widget};
3613 push @adds, 1, $row, $item->{desc_widget};
3614 push @adds, 2, $row, $item->{weight_widget};
3615
3616 $row++;
3617 }
3618
3619 $self->add (@adds);
3620}
3621
3622sub set_sort_order {
3623 my ($self, $order) = @_;
3624
3625 $self->{sort} = $order ||= sub {
3626 sort {
3627 $a->{type} <=> $b->{type}
3628 or $a->{name} cmp $b->{name}
3629 } @_
3630 };
3631
3632 $self->update_items;
3181} 3633}
3182 3634
3183sub set_items { 3635sub set_items {
3184 my ($self, $items) = @_; 3636 my ($self, $items) = @_;
3185 3637
3186 $self->{scrolled}->clear; 3638 $self->{items} = [$items ? values %$items : ()];
3187 return unless $items; 3639 $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} 3640}
3207 3641
3208############################################################################# 3642#############################################################################
3209 3643
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; 3644package CFPlus::UI::SpellList;
3408 3645
3409our @ISA = CFClient::UI::ScrolledWindow::; 3646our @ISA = CFPlus::UI::Table::;
3410 3647
3411sub new { 3648sub new {
3412 my $class = shift; 3649 my $class = shift;
3413 3650
3414 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3415 binding => [], 3652 binding => [],
3416 commands => [], 3653 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3654 @_,
3419 ) 3655 )
3420} 3656}
3421 3657
3422# XXX: Do sorting? Argl... 3658my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3659
3660my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3661 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3662my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3663 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3664my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3665 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3666my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3667 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3668my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3670
3671sub rebuild_spell_list {
3672 my ($self) = @_;
3673
3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3675 $self->clear;
3676
3677 return unless $::CONN;
3678
3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3684
3685 my $row = 0;
3686
3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3688 my $spell = $self->{spell}{$_};
3689
3690 $row++;
3691
3692 my $spell_cb = sub {
3693 my ($widget, $ev) = @_;
3694
3695 if ($ev->{button} == 1) {
3696 $::CONN->user_send ("cast $spell->{name}");
3697 } elsif ($ev->{button} == 2) {
3698 $::CONN->user_send ("invoke $spell->{name}");
3699 } elsif ($ev->{button} == 3) {
3700 (new CFPlus::UI::Menu
3701 items => [
3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3704 ],
3705 )->popup ($ev);
3706 } else {
3707 return 0;
3708 }
3709
3710 1
3711 };
3712
3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3714
3715 #TODO: add path info to tooltip
3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3717
3718 $self->add (0, $row, new CFPlus::UI::Face
3719 face => $spell->{face},
3720 can_hover => 1,
3721 can_events => 1,
3722 tooltip => $tooltip,
3723 on_button_down => $spell_cb,
3724 );
3725
3726 $self->add (1, $row, new CFPlus::UI::Label
3727 expand => 1,
3728 text => $spell->{name},
3729 can_hover => 1,
3730 can_events => 1,
3731 tooltip => $tooltip,
3732 on_button_down => $spell_cb,
3733 );
3734
3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3739 }
3740 });
3741}
3742
3423sub add_spell { 3743sub add_spell {
3424 my ($self, $spell) = @_; 3744 my ($self, $spell) = @_;
3745
3425 $self->{spells}->{$spell->{name}} = $spell; 3746 $self->{spell}->{$spell->{name}} = $spell;
3426 3747 $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} 3748}
3455 3749
3456sub remove_spell { 3750sub remove_spell {
3457 my ($self, $spell) = @_; 3751 my ($self, $spell) = @_;
3752
3458 delete $self->{spells}->{$spell->{name}}; 3753 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3754 $self->rebuild_spell_list;
3460} 3755}
3461 3756
3757sub clear_spells {
3758 my ($self) = @_;
3759
3760 $self->{spell} = {};
3761 $self->rebuild_spell_list;
3762}
3763
3462############################################################################# 3764#############################################################################
3463 3765
3464package CFClient::UI::Root; 3766package CFPlus::UI::Root;
3465 3767
3466our @ISA = CFClient::UI::Container::; 3768our @ISA = CFPlus::UI::Container::;
3467 3769
3770use List::Util qw(min max);
3771
3468use CFClient::OpenGL; 3772use CFPlus::OpenGL;
3469 3773
3470sub new { 3774sub new {
3471 my $class = shift; 3775 my $class = shift;
3472 3776
3473 my $self = $class->SUPER::new ( 3777 my $self = $class->SUPER::new (
… …
3498 $coord = $max - $size if $coord > $max - $size; 3802 $coord = $max - $size if $coord > $max - $size;
3499 3803
3500 int $coord + 0.5 3804 int $coord + 0.5
3501} 3805}
3502 3806
3503sub size_allocate { 3807sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3808 my ($self, $w, $h) = @_;
3505 3809
3506 for my $child ($self->children) { 3810 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3811 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3812
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3816 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3817 $Y = _to_pixel $Y, $H, $self->{h};
3514 3818
3515 $child->configure ($X, $Y, $W, $H); 3819 $child->configure ($X, $Y, $W, $H);
3516 } 3820 }
3821
3822 1
3517} 3823}
3518 3824
3519sub coord2local { 3825sub coord2local {
3520 my ($self, $x, $y) = @_; 3826 my ($self, $x, $y) = @_;
3521 3827
… …
3606 3912
3607 delete $queue{$widget+0}; 3913 delete $queue{$widget+0};
3608 3914
3609 my ($w, $h) = $widget->size_request; 3915 my ($w, $h) = $widget->size_request;
3610 3916
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3917 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3918 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3919
3920 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3921 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3922
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3923 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3924 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3925
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3926 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3952
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3953 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3954
3646 $w = 0 if $w < 0; 3955 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3956 $h = 0 if $h < 0;
3957
3958 $w = max $widget->{min_w}, $w;
3959 $h = max $widget->{min_h}, $h;
3960
3961# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3962# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3963
3964 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3965 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3966
3649 $w = int $w + 0.5; 3967 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3968 $h = int $h + 0.5;
3651 3969
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3970 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3994 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3677 glMatrixMode GL_MODELVIEW; 3995 glMatrixMode GL_MODELVIEW;
3678 glLoadIdentity; 3996 glLoadIdentity;
3679 3997
3680 { 3998 {
3681 package CFClient::UI::Base; 3999 package CFPlus::UI::Base;
3682 4000
3683 ($draw_x, $draw_y, $draw_w, $draw_h) = 4001 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h}); 4002 (0, 0, $self->{w}, $self->{h});
3685 } 4003 }
3686 4004
3687 $self->_draw; 4005 $self->_draw;
3688} 4006}
3689 4007
3690############################################################################# 4008#############################################################################
3691 4009
3692package CFClient::UI; 4010package CFPlus::UI;
3693 4011
3694$ROOT = new CFClient::UI::Root; 4012$ROOT = new CFPlus::UI::Root;
3695$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4013$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3696 4014
36971 40151
3698 4016

Diff Legend

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