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.342 by root, Sun Aug 13 14:38:35 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 (
… …
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
1488 ellipsise => 3, # end 1623 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1624 layout => (new CFPlus::Layout),
1490 fontsize => 1, 1625 fontsize => 1,
1491 align => -1, 1626 align => -1,
1492 valign => -1, 1627 valign => -1,
1493 padding_x => 2, 1628 padding_x => 2,
1494 padding_y => 2, 1629 padding_y => 2,
1495 can_events => 0, 1630 can_events => 0,
1496 %arg 1631 %arg
1497 ); 1632 );
1498 1633
1499 if (exists $self->{template}) { 1634 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1635 my $layout = new CFPlus::Layout;
1501 $layout->set_text (delete $self->{template}); 1636 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1637 $self->{template} = $layout;
1503 } 1638 }
1504 1639
1505 if (exists $self->{markup}) { 1640 if (exists $self->{markup}) {
… …
1509 } 1644 }
1510 1645
1511 $self 1646 $self
1512} 1647}
1513 1648
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1649sub update {
1525 my ($self) = @_; 1650 my ($self) = @_;
1526 1651
1527 delete $self->{texture}; 1652 delete $self->{texture};
1528 $self->SUPER::update; 1653 $self->SUPER::update;
1529} 1654}
1530 1655
1656sub realloc {
1657 my ($self) = @_;
1658
1659 delete $self->{ox};
1660 $self->SUPER::realloc;
1661}
1662
1531sub set_text { 1663sub set_text {
1532 my ($self, $text) = @_; 1664 my ($self, $text) = @_;
1533 1665
1534 return if $self->{text} eq "T$text"; 1666 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1667 $self->{text} = "T$text";
1536 1668
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1669 $self->{layout}->set_text ($text);
1539 1670
1671 delete $self->{size_req};
1540 $self->realloc; 1672 $self->realloc;
1541 $self->update; 1673 $self->update;
1542} 1674}
1543 1675
1544sub set_markup { 1676sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1679 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1680 $self->{text} = "M$markup";
1549 1681
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1682 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1683
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1684 $self->{layout}->set_markup ($markup);
1554 1685
1686 delete $self->{size_req};
1555 $self->realloc; 1687 $self->realloc;
1556 $self->update; 1688 $self->update;
1557} 1689}
1558 1690
1559sub size_request { 1691sub size_request {
1560 my ($self) = @_; 1692 my ($self) = @_;
1561 1693
1694 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1695 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1696 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1697 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1698 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1699 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1700
1568 my ($w, $h) = $self->{layout}->size; 1701 my ($w, $h) = $self->{layout}->size;
1569 1702
1570 if (exists $self->{template}) { 1703 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1704 $self->{template}->set_font ($self->{font}) if $self->{font};
1705 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1707
1574 my ($w2, $h2) = $self->{template}->size; 1708 my ($w2, $h2) = $self->{template}->size;
1575 1709
1576 $w = List::Util::max $w, $w2; 1710 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1711 $h = List::Util::max $h, $h2;
1712 }
1713
1714 [$w, $h]
1578 } 1715 };
1579 1716
1580 ($w, $h) 1717 @{ $self->{size_req} }
1581} 1718}
1582 1719
1720sub baseline_shift {
1721 $_[0]{layout}->descent
1722}
1723
1583sub size_allocate { 1724sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1725 my ($self, $w, $h) = @_;
1585 1726
1586 delete $self->{ox}; 1727 delete $self->{ox};
1587 1728
1588 delete $self->{texture} 1729 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1730 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1731
1732 1
1590} 1733}
1591 1734
1592sub set_fontsize { 1735sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1736 my ($self, $fontsize) = @_;
1594 1737
1595 $self->{fontsize} = $fontsize; 1738 $self->{fontsize} = $fontsize;
1739 delete $self->{size_req};
1596 delete $self->{texture}; 1740 delete $self->{texture};
1597 1741
1598 $self->realloc; 1742 $self->realloc;
1599} 1743}
1600 1744
1745sub reconfigure {
1746 my ($self) = @_;
1747
1748 delete $self->{size_req};
1749 delete $self->{texture};
1750
1751 $self->SUPER::reconfigure;
1752}
1753
1601sub _draw { 1754sub _draw {
1602 my ($self) = @_; 1755 my ($self) = @_;
1603 1756
1604 $self->SUPER::_draw; # draw background, if applicable 1757 $self->SUPER::_draw; # draw background, if applicable
1605 1758
1606 my $tex = $self->{texture} ||= do { 1759 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1760 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1761 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1762 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1763 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1764 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1765 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1766
1614 new_from_layout CFClient::Texture $self->{layout} 1767 [$self->{layout}->size]
1615 }; 1768 };
1616 1769
1617 unless (exists $self->{ox}) { 1770 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1771 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1772 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1773 : ($self->{w} - $size->[0]) * 0.5);
1621 1774
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1775 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1776 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1777 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1778 };
1626 1779
1627 glEnable GL_TEXTURE_2D; 1780 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1781 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1782
1630 if ($tex->{format} == GL_ALPHA) { 1783 $self->{layout}->render ($self->{ox}, $self->{oy});
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} 1784}
1639 1785
1640############################################################################# 1786#############################################################################
1641 1787
1642package CFClient::UI::EntryBase; 1788package CFPlus::UI::EntryBase;
1643 1789
1644our @ISA = CFClient::UI::Label::; 1790our @ISA = CFPlus::UI::Label::;
1645 1791
1646use CFClient::OpenGL; 1792use CFPlus::OpenGL;
1647 1793
1648sub new { 1794sub new {
1649 my $class = shift; 1795 my $class = shift;
1650 1796
1651 $class->SUPER::new ( 1797 $class->SUPER::new (
… …
1656 can_hover => 1, 1802 can_hover => 1,
1657 can_focus => 1, 1803 can_focus => 1,
1658 valign => 0, 1804 valign => 0,
1659 can_events => 1, 1805 can_events => 1,
1660 #text => ... 1806 #text => ...
1807 #hidden => "*",
1661 @_ 1808 @_
1662 ) 1809 )
1663} 1810}
1664 1811
1665sub _set_text { 1812sub _set_text {
… …
1667 1814
1668 delete $self->{cur_h}; 1815 delete $self->{cur_h};
1669 1816
1670 return if $self->{text} eq $text; 1817 return if $self->{text} eq $text;
1671 1818
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1820 $self->{text} = $text;
1676 1821
1677 $text =~ s/./*/g if $self->{hidden}; 1822 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1823 $self->{layout}->set_text ("$text ");
1824 delete $self->{size_req};
1679 1825
1680 $self->_emit (changed => $self->{text}); 1826 $self->emit (changed => $self->{text});
1827
1828 $self->realloc;
1829 $self->update;
1681} 1830}
1682 1831
1683sub set_text { 1832sub set_text {
1684 my ($self, $text) = @_; 1833 my ($self, $text) = @_;
1685 1834
1686 $self->{cursor} = length $text; 1835 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1836 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1837}
1691 1838
1692sub get_text { 1839sub get_text {
1693 $_[0]{text} 1840 $_[0]{text}
1694} 1841}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1846 my ($w, $h) = $self->SUPER::size_request;
1700 1847
1701 ($w + 1, $h) # add 1 for cursor 1848 ($w + 1, $h) # add 1 for cursor
1702} 1849}
1703 1850
1704sub key_down { 1851sub invoke_key_down {
1705 my ($self, $ev) = @_; 1852 my ($self, $ev) = @_;
1706 1853
1707 my $mod = $ev->{mod}; 1854 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1856 my $uni = $ev->{unicode};
… …
1712 1859
1713 if ($uni == 8) { 1860 if ($uni == 8) {
1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1715 } elsif ($uni == 127) { 1862 } elsif ($uni == 127) {
1716 substr $text, $self->{cursor}, 1, ""; 1863 substr $text, $self->{cursor}, 1, "";
1717 } elsif ($sym == CFClient::SDLK_LEFT) { 1864 } elsif ($sym == CFPlus::SDLK_LEFT) {
1718 --$self->{cursor} if $self->{cursor}; 1865 --$self->{cursor} if $self->{cursor};
1719 } elsif ($sym == CFClient::SDLK_RIGHT) { 1866 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1720 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1867 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1868 } elsif ($sym == CFPlus::SDLK_HOME) {
1722 $self->{cursor} = 0; 1869 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1870 } elsif ($sym == CFPlus::SDLK_END) {
1724 $self->{cursor} = length $text; 1871 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1872 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1873 $self->emit ('escape');
1727 } elsif ($uni) { 1874 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1875 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1876 } else {
1730 return 0; 1877 return 0;
1731 } 1878 }
… …
1735 $self->realloc; 1882 $self->realloc;
1736 1883
1737 1 1884 1
1738} 1885}
1739 1886
1740sub focus_in { 1887sub invoke_focus_in {
1741 my ($self) = @_; 1888 my ($self) = @_;
1742 1889
1743 $self->{last_activity} = $::NOW; 1890 $self->{last_activity} = $::NOW;
1744 1891
1745 $self->SUPER::focus_in; 1892 $self->SUPER::invoke_focus_in
1746} 1893}
1747 1894
1748sub button_down { 1895sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1896 my ($self, $ev, $x, $y) = @_;
1750 1897
1751 $self->SUPER::button_down ($ev, $x, $y); 1898 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1899
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1900 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1901
1755 # byte-index to char-index 1902 # byte-index to char-index
1756 my $text = $self->{text}; 1903 my $text = $self->{text};
1757 utf8::encode $text; 1904 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1905 $self->{cursor} = length $text;
1759 1906
1760 $self->_set_text ($self->{text}); 1907 $self->_set_text ($self->{text});
1761 $self->update; 1908 $self->update;
1762 1909
1763 1 1910 1
1764} 1911}
1765 1912
1766sub mouse_motion { 1913sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1914 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1915# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1916
1770 0 1917 1
1771} 1918}
1772 1919
1773sub _draw { 1920sub _draw {
1774 my ($self) = @_; 1921 my ($self) = @_;
1775 1922
1776 local $self->{fg} = $self->{fg}; 1923 local $self->{fg} = $self->{fg};
1777 1924
1778 if ($FOCUS == $self) { 1925 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1926 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1927 $self->{fg} = $self->{active_fg};
1781 } else { 1928 } else {
1782 glColor @{$self->{bg}}; 1929 glColor_premultiply @{$self->{bg}};
1783 } 1930 }
1784 1931
1785 glEnable GL_BLEND; 1932 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1933 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1934 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1935 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1936 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1937 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1938 glVertex $self->{w}, 0;
… …
1810 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1811 glEnd; 1958 glEnd;
1812 } 1959 }
1813} 1960}
1814 1961
1815package CFClient::UI::Entry; 1962package CFPlus::UI::Entry;
1816 1963
1817our @ISA = CFClient::UI::EntryBase::; 1964our @ISA = CFPlus::UI::EntryBase::;
1818 1965
1819use CFClient::OpenGL; 1966use CFPlus::OpenGL;
1820 1967
1821sub key_down { 1968sub invoke_key_down {
1822 my ($self, $ev) = @_; 1969 my ($self, $ev) = @_;
1823 1970
1824 my $sym = $ev->{sym}; 1971 my $sym = $ev->{sym};
1825 1972
1826 if ($sym == 13) { 1973 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1974 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1975 my $txt = $self->get_text;
1976
1829 $self->{history_pointer} = -1; 1977 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1978 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1979 $self->emit (activate => $txt);
1832 $self->update; 1980 $self->update;
1833 1981
1834 } elsif ($sym == CFClient::SDLK_UP) { 1982 } elsif ($sym == CFPlus::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1983 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1984 $self->{history_saveback} = $self->get_text;
1837 } 1985 }
1838 if (@{$self->{history} || []} > 0) { 1986 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++; 1987 $self->{history_pointer}++;
… …
1841 $self->{history_pointer} = @{$self->{history} || []} - 1; 1989 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 } 1990 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1991 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 } 1992 }
1845 1993
1846 } elsif ($sym == CFClient::SDLK_DOWN) { 1994 } elsif ($sym == CFPlus::SDLK_DOWN) {
1847 $self->{history_pointer}--; 1995 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1996 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849 1997
1850 if ($self->{history_pointer} >= 0) { 1998 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1999 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else { 2000 } else {
1853 $self->set_text ($self->{history_saveback}); 2001 $self->set_text ($self->{history_saveback});
1854 } 2002 }
1855 2003
1856 } else { 2004 } else {
1857 return $self->SUPER::key_down ($ev) 2005 return $self->SUPER::invoke_key_down ($ev)
1858 } 2006 }
1859 2007
1860 1 2008 1
1861} 2009}
1862 2010
1863############################################################################# 2011#############################################################################
1864 2012
1865package CFClient::UI::Button; 2013package CFPlus::UI::Button;
1866 2014
1867our @ISA = CFClient::UI::Label::; 2015our @ISA = CFPlus::UI::Label::;
1868 2016
1869use CFClient::OpenGL; 2017use CFPlus::OpenGL;
1870 2018
1871my @tex = 2019my @tex =
1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1873 qw(b1_button_active.png); 2021 qw(b1_button_active.png);
1874 2022
1875sub new { 2023sub new {
1876 my $class = shift; 2024 my $class = shift;
1877 2025
… …
1886 can_events => 1, 2034 can_events => 1,
1887 @_ 2035 @_
1888 ) 2036 )
1889} 2037}
1890 2038
1891sub activate { }
1892
1893sub button_up { 2039sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1895 2041
1896 $self->emit ("activate") 2042 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2043 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2044 && $y >= 0 && $y < $self->{h};
… …
1901} 2047}
1902 2048
1903sub _draw { 2049sub _draw {
1904 my ($self) = @_; 2050 my ($self) = @_;
1905 2051
1906 local $self->{fg} = $self->{fg}; 2052 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2053
1912 glEnable GL_TEXTURE_2D; 2054 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2056 glColor 0, 0, 0, 1;
1915 2057
… …
1920 $self->SUPER::_draw; 2062 $self->SUPER::_draw;
1921} 2063}
1922 2064
1923############################################################################# 2065#############################################################################
1924 2066
1925package CFClient::UI::CheckBox; 2067package CFPlus::UI::CheckBox;
1926 2068
1927our @ISA = CFClient::UI::DrawBG::; 2069our @ISA = CFPlus::UI::DrawBG::;
1928 2070
1929my @tex = 2071my @tex =
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2073 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1932 2074
1933use CFClient::OpenGL; 2075use CFPlus::OpenGL;
1934 2076
1935sub new { 2077sub new {
1936 my $class = shift; 2078 my $class = shift;
1937 2079
1938 $class->SUPER::new ( 2080 $class->SUPER::new (
… …
1952 my ($self) = @_; 2094 my ($self) = @_;
1953 2095
1954 (6) x 2 2096 (6) x 2
1955} 2097}
1956 2098
2099sub toggle {
2100 my ($self) = @_;
2101
2102 $self->{state} = !$self->{state};
2103 $self->emit (changed => $self->{state});
2104 $self->update;
2105}
2106
1957sub button_down { 2107sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2108 my ($self, $ev, $x, $y) = @_;
1959 2109
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2110 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2111 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2112 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2113 } else {
1965 return 0 2114 return 0
1966 } 2115 }
1967 2116
1968 1 2117 1
… …
1988 glDisable GL_TEXTURE_2D; 2137 glDisable GL_TEXTURE_2D;
1989} 2138}
1990 2139
1991############################################################################# 2140#############################################################################
1992 2141
1993package CFClient::UI::Image; 2142package CFPlus::UI::Image;
1994 2143
1995our @ISA = CFClient::UI::Base::; 2144our @ISA = CFPlus::UI::Base::;
1996 2145
1997use CFClient::OpenGL; 2146use CFPlus::OpenGL;
1998use Carp qw/confess/;
1999 2147
2000our %loaded_images; 2148our %texture_cache;
2001 2149
2002sub new { 2150sub new {
2003 my $class = shift; 2151 my $class = shift;
2004 2152
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2153 my $self = $class->SUPER::new (
2154 can_events => 0,
2155 @_,
2156 );
2006 2157
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2158 $self->{path} || $self->{tex}
2159 or Carp::croak "'path' or 'tex' attributes required";
2008 2160
2009 $loaded_images{$self->{image}} ||= 2161 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2011 2163
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2164 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2165
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2167
2018 $self 2168 $self
2019} 2169}
2020 2170
2171sub STORABLE_freeze {
2172 my ($self, $cloning) = @_;
2173
2174 $self->{path}
2175 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2176
2177 $self->{path}
2178}
2179
2180sub STORABLE_attach {
2181 my ($self, $cloning, $path) = @_;
2182
2183 $self->new (path => $path)
2184}
2185
2021sub size_request { 2186sub size_request {
2022 my ($self) = @_; 2187 my ($self) = @_;
2023 2188
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2025} 2190}
2026 2191
2027sub _draw { 2192sub _draw {
2028 my ($self) = @_; 2193 my ($self) = @_;
2029 2194
… …
2039 } 2204 }
2040 2205
2041 glEnable GL_TEXTURE_2D; 2206 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2208
2044 $tex->draw_quad_alpha (0, 0, $w, $h); 2209 $tex->draw_quad (0, 0, $w, $h);
2045 2210
2046 glDisable GL_TEXTURE_2D; 2211 glDisable GL_TEXTURE_2D;
2047} 2212}
2048 2213
2049############################################################################# 2214#############################################################################
2050 2215
2216package CFPlus::UI::ImageButton;
2217
2218our @ISA = CFPlus::UI::Image::;
2219
2220use CFPlus::OpenGL;
2221
2222my %textures;
2223
2224sub new {
2225 my $class = shift;
2226
2227 my $self = $class->SUPER::new (
2228 padding_x => 4,
2229 padding_y => 4,
2230 fg => [1, 1, 1],
2231 active_fg => [0, 0, 1],
2232 can_hover => 1,
2233 align => 0,
2234 valign => 0,
2235 can_events => 1,
2236 @_
2237 );
2238}
2239
2240sub invoke_button_up {
2241 my ($self, $ev, $x, $y) = @_;
2242
2243 $self->emit ("activate")
2244 if $x >= 0 && $x < $self->{w}
2245 && $y >= 0 && $y < $self->{h};
2246
2247 1
2248}
2249
2250#############################################################################
2251
2051package CFClient::UI::VGauge; 2252package CFPlus::UI::VGauge;
2052 2253
2053our @ISA = CFClient::UI::Base::; 2254our @ISA = CFPlus::UI::Base::;
2054 2255
2055use List::Util qw(min max); 2256use List::Util qw(min max);
2056 2257
2057use CFClient::OpenGL; 2258use CFPlus::OpenGL;
2058 2259
2059my %tex = ( 2260my %tex = (
2060 food => [ 2261 food => [
2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2262 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2263 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2063 ], 2264 ],
2064 grace => [ 2265 grace => [
2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2266 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/ 2267 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2067 ], 2268 ],
2068 hp => [ 2269 hp => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2270 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2271 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2071 ], 2272 ],
2072 mana => [ 2273 mana => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2274 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/ 2275 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2075 ], 2276 ],
2076); 2277);
2077 2278
2078# eg. VGauge->new (gauge => 'food'), default gauge: food 2279# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2339 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2340 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2341
2141 my $h1 = $self->{h} * (1 - $ycut1); 2342 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2343 my $h2 = $self->{h} * (1 - $ycut2);
2344 my $h3 = $self->{h};
2345
2346 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2347
2144 glEnable GL_BLEND; 2348 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2349 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2350 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2351 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2353
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2354 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2355 glBegin GL_QUADS;
… …
2165 2370
2166 if ($t3) { 2371 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2372 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2373 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2374 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2375 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2376 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2377 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2378 glEnd;
2174 } 2379 }
2175 2380
2176 glDisable GL_BLEND; 2381 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2178} 2383}
2179 2384
2180############################################################################# 2385#############################################################################
2181 2386
2182package CFClient::UI::Gauge; 2387package CFPlus::UI::Gauge;
2183 2388
2184our @ISA = CFClient::UI::VBox::; 2389our @ISA = CFPlus::UI::VBox::;
2185 2390
2186sub new { 2391sub new {
2187 my ($class, %arg) = @_; 2392 my ($class, %arg) = @_;
2188 2393
2189 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
… …
2191 can_hover => 1, 2396 can_hover => 1,
2192 can_events => 1, 2397 can_events => 1,
2193 %arg, 2398 %arg,
2194 ); 2399 );
2195 2400
2196 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2401 $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); 2402 $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"); 2403 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2199 2404
2200 $self 2405 $self
2201} 2406}
2202 2407
2203sub set_fontsize { 2408sub set_fontsize {
… …
2224 $self->{value}->set_text ($val); 2429 $self->{value}->set_text ($val);
2225} 2430}
2226 2431
2227############################################################################# 2432#############################################################################
2228 2433
2229package CFClient::UI::Slider; 2434package CFPlus::UI::Slider;
2230 2435
2231use strict; 2436use strict;
2232 2437
2233use CFClient::OpenGL; 2438use CFPlus::OpenGL;
2234 2439
2235our @ISA = CFClient::UI::DrawBG::; 2440our @ISA = CFPlus::UI::DrawBG::;
2236 2441
2237my @tex = 2442my @tex =
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2239 qw(s1_slider.png s1_slider_bg.png); 2444 qw(s1_slider.png s1_slider_bg.png);
2240 2445
2241sub new { 2446sub new {
2242 my $class = shift; 2447 my $class = shift;
2243 2448
… …
2264 $self->update; 2469 $self->update;
2265 2470
2266 $self 2471 $self
2267} 2472}
2268 2473
2269sub changed { }
2270
2271sub set_range { 2474sub set_range {
2272 my ($self, $range) = @_; 2475 my ($self, $range) = @_;
2273 2476
2274 ($range, $self->{range}) = ($self->{range}, $range); 2477 ($range, $self->{range}) = ($self->{range}, $range);
2275 2478
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2479 if ("@$range" ne "@{$self->{range}}") {
2480 $self->update;
2481 $self->set_value ($self->{range}[0]);
2482 }
2278} 2483}
2279 2484
2280sub set_value { 2485sub set_value {
2281 my ($self, $value) = @_; 2486 my ($self, $value) = @_;
2282 2487
… …
2293 if $unit; 2498 if $unit;
2294 2499
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2500 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2501
2297 if ($value != $old_value) { 2502 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2503 $self->emit (changed => $value);
2299 $self->update; 2504 $self->update;
2300 } 2505 }
2301} 2506}
2302 2507
2303sub size_request { 2508sub size_request {
2304 my ($self) = @_; 2509 my ($self) = @_;
2305 2510
2306 ($self->{req_w}, $self->{req_h}) 2511 ($self->{req_w}, $self->{req_h})
2307} 2512}
2308 2513
2309sub button_down { 2514sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
2311 2516
2312 $self->SUPER::button_down ($ev, $x, $y); 2517 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2518
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2519 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2520
2316 $self->mouse_motion ($ev, $x, $y) 2521 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2522}
2318 2523
2319sub mouse_motion { 2524sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
2321 2526
2322 if ($GRAB == $self) { 2527 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2528 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2529
… …
2332 } 2537 }
2333 2538
2334 1 2539 1
2335} 2540}
2336 2541
2542sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_;
2544
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2548
2549 ! ! $delta
2550}
2551
2337sub update { 2552sub update {
2338 my ($self) = @_; 2553 my ($self) = @_;
2339 2554
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2555 delete $self->{knob_w};
2556 $self->SUPER::update;
2557}
2558
2559sub _draw {
2560 my ($self) = @_;
2561
2562 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2563 $self->set_value ($self->{range}[0]);
2342 2564
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2565 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2566 my $range = ($hi - $page - $lo) || 1e-100;
2345 2567
… …
2351 $value = ($value - $lo) / $range; 2573 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2574 $value = $value * $self->{scale} + $self->{offset};
2353 2575
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2576 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2577 $self->{knob_w} = $knob_w;
2356 }); 2578 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2579
2364 $self->SUPER::_draw (); 2580 $self->SUPER::_draw ();
2365 2581
2366 glScale $self->{w}, $self->{h}; 2582 glScale $self->{w}, $self->{h};
2367 2583
… …
2387 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2388} 2604}
2389 2605
2390############################################################################# 2606#############################################################################
2391 2607
2392package CFClient::UI::ValSlider; 2608package CFPlus::UI::ValSlider;
2393 2609
2394our @ISA = CFClient::UI::HBox::; 2610our @ISA = CFPlus::UI::HBox::;
2395 2611
2396sub new { 2612sub new {
2397 my ($class, %arg) = @_; 2613 my ($class, %arg) = @_;
2398 2614
2399 my $range = delete $arg{range}; 2615 my $range = delete $arg{range};
2400 2616
2401 my $self = $class->SUPER::new ( 2617 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2618 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2619 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift }, 2620 to_value => sub { shift },
2405 from_value => sub { shift }, 2621 from_value => sub { shift },
2406 %arg, 2622 %arg,
2407 ); 2623 );
2408 2624
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2644sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2645sub set_value { shift->{slider}->set_value (@_) }
2430 2646
2431############################################################################# 2647#############################################################################
2432 2648
2433package CFClient::UI::TextView; 2649package CFPlus::UI::TextScroller;
2434 2650
2435our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFPlus::UI::HBox::;
2436 2652
2437use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2438 2654
2439sub new { 2655sub new {
2440 my $class = shift; 2656 my $class = shift;
2441 2657
2442 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2443 fontsize => 1, 2659 fontsize => 1,
2444 can_events => 0, 2660 can_events => 1,
2661 indent => 0,
2445 #font => default_font 2662 #font => default_font
2446 @_, 2663 @_,
2447 2664
2448 layout => (new CFClient::Layout 1), 2665 layout => (new CFPlus::Layout),
2449 par => [], 2666 par => [],
2450 height => 0, 2667 height => 0,
2451 children => [ 2668 children => [
2452 (new CFClient::UI::Empty expand => 1), 2669 (new CFPlus::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2670 (new CFPlus::UI::Slider vertical => 1),
2454 ], 2671 ],
2455 ); 2672 );
2456 2673
2457 $self->{children}[1]->connect (changed => sub { $self->update }); 2674 $self->{children}[1]->connect (changed => sub { $self->update });
2458 2675
… …
2464 2681
2465 $self->{fontsize} = $fontsize; 2682 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2683 $self->reflow;
2467} 2684}
2468 2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 my ($empty, $slider) = @{ $self->{children} };
2690
2691 local $self->{children} = [$empty, $slider];
2692 $self->SUPER::size_request
2693}
2694
2469sub size_allocate { 2695sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2696 my ($self, $w, $h) = @_;
2471 2697
2472 $self->SUPER::size_allocate ($w, $h); 2698 my ($empty, $slider, @other) = @{ $self->{children} };
2699 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2700
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2701 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2702 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2703 $self->{layout}->set_width ($empty->{w});
2704 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2705
2478 $self->reflow; 2706 $self->reflow;
2479}
2480 2707
2481sub text_size { 2708 local $self->{children} = [$empty, $slider];
2709 $self->SUPER::invoke_size_allocate ($w, $h)
2710}
2711
2712sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2713 my ($self, $ev) = @_;
2714
2715 return 0 unless $ev->{dy}; # only vertical movements
2716
2717 $self->{children}[1]->emit (mouse_wheel => $ev);
2718
2719 1
2720}
2721
2722sub get_layout {
2723 my ($self, $para) = @_;
2483 2724
2484 my $layout = $self->{layout}; 2725 my $layout = $self->{layout};
2485 2726
2727 $layout->set_font ($self->{font}) if $self->{font};
2728 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2729 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2730 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2731 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2732 $layout->set_markup ($para->{markup});
2733
2734 $layout->set_shapes (
2735 map
2736 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2737 @{$para->{widget}}
2489 2738 );
2739
2490 $layout->size 2740 $layout
2491} 2741}
2492 2742
2493sub reflow { 2743sub reflow {
2494 my ($self) = @_; 2744 my ($self) = @_;
2495 2745
… …
2504 $self->{children}[1]->set_value ($offset); 2754 $self->{children}[1]->set_value ($offset);
2505} 2755}
2506 2756
2507sub clear { 2757sub clear {
2508 my ($self) = @_; 2758 my ($self) = @_;
2759
2760 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other;
2509 2762
2510 $self->{par} = []; 2763 $self->{par} = [];
2511 $self->{height} = 0; 2764 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2765 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2766}
2514 2767
2515sub add_paragraph { 2768sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2769 my $self = shift;
2517 2770
2518 for my $line (split /\n/, $text) { 2771 for my $para (@_) {
2519 my ($w, $h) = $self->text_size ($line); 2772 $para = {
2520 $self->{height} += $h; 2773 fg => [1, 1, 1, 1],
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2774 indent => 0,
2522 } 2775 markup => "",
2776 widget => [],
2777 ref $para ? %$para : (markup => $para),
2778 w => 1e10,
2779 wrapped => 1,
2780 };
2523 2781
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para;
2784 }
2785
2786 $self->{need_reflow}++;
2787 $self->update;
2788}
2789
2790sub scroll_to_bottom {
2791 my ($self) = @_;
2792
2793 $self->{scroll_to_bottom} = 1;
2794 $self->update;
2525} 2795}
2526 2796
2527sub update { 2797sub update {
2528 my ($self) = @_; 2798 my ($self) = @_;
2529 2799
… …
2531 2801
2532 return unless $self->{h} > 0; 2802 return unless $self->{h} > 0;
2533 2803
2534 delete $self->{texture}; 2804 delete $self->{texture};
2535 2805
2536 $ROOT->on_post_alloc ($self, sub { 2806 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2808
2539 if (delete $self->{need_reflow}) { 2809 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2810 my $height = 0;
2541 2811
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2812 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2814 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2815 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2816
2552 $_->[1] = $h; 2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2553 } 2820 }
2554 2821
2555 $height += $_->[1]; 2822 $height += $para->{h};
2556 } 2823 }
2557 2824
2558 $self->{height} = $height; 2825 $self->{height} = $height;
2559 2826
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2828
2562 delete $self->{texture}; 2829 delete $self->{texture};
2563 } 2830 }
2564 2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2837 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2838 glClear GL_COLOR_BUFFER_BIT;
2568 2839
2569 my $top = int $self->{children}[1]{range}[0]; 2840 my $top = int $self->{children}[1]{range}[0];
2570 2841
2571 my $y0 = $top; 2842 my $y0 = $top;
2572 my $y1 = $top + $H; 2843 my $y1 = $top + $H;
2573 2844
2574 my $y = 0; 2845 my $y = 0;
2575 2846
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}}) { 2847 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2848 my $h = $para->{h};
2586 2849
2587 if ($y0 < $y + $h && $y < $y1) { 2850 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 2851
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2852 my $layout = $self->get_layout ($para);
2593 2853
2594 glRasterPos $par->[3], $y - $y0; 2854 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2855
2856 if (my @w = @{ $para->{widget} }) {
2857 my @s = $layout->get_shapes;
2858
2859 for (@w) {
2860 my ($dx, $dy) = splice @s, 0, 2, ();
2861
2862 $_->{x} = $dx + $para->{indent};
2863 $_->{y} = $dy + $y - $y0;
2864
2865 $_->draw;
2866 }
2867 }
2596 } 2868 }
2597 2869
2598 $y += $h; 2870 $y += $h;
2599 } 2871 }
2600
2601 glDisable GL_BLEND;
2602 }; 2872 };
2603 }); 2873 });
2604} 2874}
2605 2875
2876sub reconfigure {
2877 my ($self) = @_;
2878
2879 $self->SUPER::reconfigure;
2880
2881 $_->{w} = 1e10 for @{ $self->{par} };
2882 $self->reflow;
2883}
2884
2606sub _draw { 2885sub _draw {
2607 my ($self) = @_; 2886 my ($self) = @_;
2608 2887
2609 glEnable GL_TEXTURE_2D; 2888 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2889 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2890 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2891 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2892 glDisable GL_TEXTURE_2D;
2614 2893
2615 $self->{children}[1]->draw; 2894 $self->{children}[1]->draw;
2616
2617} 2895}
2618 2896
2619############################################################################# 2897#############################################################################
2620 2898
2621package CFClient::UI::Animator; 2899package CFPlus::UI::Animator;
2622 2900
2623use CFClient::OpenGL; 2901use CFPlus::OpenGL;
2624 2902
2625our @ISA = CFClient::UI::Bin::; 2903our @ISA = CFPlus::UI::Bin::;
2626 2904
2627sub moveto { 2905sub moveto {
2628 my ($self, $x, $y) = @_; 2906 my ($self, $x, $y) = @_;
2629 2907
2630 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2658 glPopMatrix; 2936 glPopMatrix;
2659} 2937}
2660 2938
2661############################################################################# 2939#############################################################################
2662 2940
2663package CFClient::UI::Flopper; 2941package CFPlus::UI::Flopper;
2664 2942
2665our @ISA = CFClient::UI::Button::; 2943our @ISA = CFPlus::UI::Button::;
2666 2944
2667sub new { 2945sub new {
2668 my $class = shift; 2946 my $class = shift;
2669 2947
2670 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
… …
2682 $self->{other}->toggle_visibility; 2960 $self->{other}->toggle_visibility;
2683} 2961}
2684 2962
2685############################################################################# 2963#############################################################################
2686 2964
2687package CFClient::UI::Tooltip; 2965package CFPlus::UI::Tooltip;
2688 2966
2689our @ISA = CFClient::UI::Bin::; 2967our @ISA = CFPlus::UI::Bin::;
2690 2968
2691use CFClient::OpenGL; 2969use CFPlus::OpenGL;
2692 2970
2693sub new { 2971sub new {
2694 my $class = shift; 2972 my $class = shift;
2695 2973
2696 $class->SUPER::new ( 2974 $class->SUPER::new (
… …
2699 ) 2977 )
2700} 2978}
2701 2979
2702sub set_tooltip_from { 2980sub set_tooltip_from {
2703 my ($self, $widget) = @_; 2981 my ($self, $widget) = @_;
2982
2983 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2704 2985
2705 my $tooltip = $widget->{tooltip}; 2986 my $tooltip = $widget->{tooltip};
2706 2987
2707 if ($ENV{CFPLUS_DEBUG} & 2) { 2988 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2989 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2990 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2991 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2992 . "visible $widget->{visible}";
2712 } 2993 }
2713 2994
2995 $tooltip =~ s/^\n+//;
2996 $tooltip =~ s/\n+$//;
2997
2714 $self->add (new CFClient::UI::Label 2998 $self->add (new CFPlus::UI::Label
2715 markup => $tooltip, 2999 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 3001 fontsize => 0.8,
2718 fg => [0, 0, 0, 1], 3002 fg => [0, 0, 0, 1],
2719 ellipsise => 0, 3003 ellipsise => 0,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3011 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3012
2729 ($w + 4, $h + 4) 3013 ($w + 4, $h + 4)
2730} 3014}
2731 3015
2732sub size_allocate { 3016sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3017 my ($self, $w, $h) = @_;
2734 3018
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3019 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3020}
2737 3021
2738sub visibility_change { 3022sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3023 my ($self, $visible) = @_;
2740 3024
2741 return unless $visible; 3025 return unless $visible;
2742 3026
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3027 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3028 my $widget = $self->{owner}
2745 or return; 3029 or return;
2746 3030
3031 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3032 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3033
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3034 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3035 if $x + $self->{w} > $self->{root}{w};
2751 3036
2752 $self->move_abs ($x, $y); 3037 $self->move_abs ($x, $y);
3038 } else {
3039 $self->hide;
3040 }
2753 }); 3041 });
2754} 3042}
2755 3043
2756sub _draw { 3044sub _draw {
2757 my ($self) = @_; 3045 my ($self) = @_;
… …
2781 $self->SUPER::_draw; 3069 $self->SUPER::_draw;
2782} 3070}
2783 3071
2784############################################################################# 3072#############################################################################
2785 3073
2786package CFClient::UI::Face; 3074package CFPlus::UI::Face;
2787 3075
2788our @ISA = CFClient::UI::Base::; 3076our @ISA = CFPlus::UI::DrawBG::;
2789 3077
2790use CFClient::OpenGL; 3078use CFPlus::OpenGL;
2791 3079
2792sub new { 3080sub new {
2793 my $class = shift; 3081 my $class = shift;
2794 3082
2795 my $self = $class->SUPER::new ( 3083 my $self = $class->SUPER::new (
… …
2830sub _draw { 3118sub _draw {
2831 my ($self) = @_; 3119 my ($self) = @_;
2832 3120
2833 return unless $::CONN; 3121 return unless $::CONN;
2834 3122
3123 $self->SUPER::_draw;
3124
2835 my $face; 3125 my $face;
2836 3126
2837 if ($self->{frame}) { 3127 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}]; 3128 my $anim = $::CONN->{anim}[$self->{anim}];
2839 3129
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3135
2846 if ($tex) { 3136 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3137 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3139 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3140 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2852 } 3142 }
2853} 3143}
2854 3144
2855sub DESTROY { 3145sub destroy {
2856 my ($self) = @_; 3146 my ($self) = @_;
2857 3147
2858 $self->{timer}->cancel 3148 $self->{timer}->cancel
2859 if $self->{timer}; 3149 if $self->{timer};
2860 3150
2861 $self->SUPER::DESTROY; 3151 $self->SUPER::destroy;
2862} 3152}
2863 3153
2864############################################################################# 3154#############################################################################
2865 3155
2866package CFClient::UI::Buttonbar; 3156package CFPlus::UI::Buttonbar;
2867 3157
2868our @ISA = CFClient::UI::HBox::; 3158our @ISA = CFPlus::UI::HBox::;
2869 3159
2870# TODO: should actualyl wrap buttons and other goodies. 3160# TODO: should actualyl wrap buttons and other goodies.
2871 3161
2872############################################################################# 3162#############################################################################
2873 3163
2874package CFClient::UI::Menu; 3164package CFPlus::UI::Menu;
2875 3165
2876our @ISA = CFClient::UI::FancyFrame::; 3166our @ISA = CFPlus::UI::FancyFrame::;
2877 3167
2878use CFClient::OpenGL; 3168use CFPlus::OpenGL;
2879 3169
2880sub new { 3170sub new {
2881 my $class = shift; 3171 my $class = shift;
2882 3172
2883 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2884 items => [], 3174 items => [],
2885 z => 100, 3175 z => 100,
2886 @_, 3176 @_,
2887 ); 3177 );
2888 3178
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3179 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2890 3180
2891 for my $item (@{ $self->{items} }) { 3181 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3182 my ($widget, $cb, $tooltip) = @$item;
2893 3183
2894 # handle various types of items, only text for now 3184 # handle various types of items, only text for now
2895 if (!ref $widget) { 3185 if (!ref $widget) {
3186 if ($widget =~ /\t/) {
3187 my ($left, $right) = split /\t/, $widget, 2;
3188
2896 $widget = new CFClient::UI::Label 3189 $widget = new CFPlus::UI::HBox
2897 can_hover => 1, 3190 can_hover => 1,
2898 can_events => 1, 3191 can_events => 1,
3192 tooltip => $tooltip,
3193 children => [
3194 (new CFPlus::UI::Label markup => $left, expand => 1),
3195 (new CFPlus::UI::Label markup => $right, align => +1),
3196 ],
3197 ;
3198
3199 } else {
3200 $widget = new CFPlus::UI::Label
3201 can_hover => 1,
3202 can_events => 1,
2899 text => $widget; 3203 markup => $widget,
3204 tooltip => $tooltip;
3205 }
2900 } 3206 }
2901 3207
2902 $self->{item}{$widget} = $item; 3208 $self->{item}{$widget} = $item;
2903 3209
2904 $self->{vbox}->add ($widget); 3210 $self->{vbox}->add ($widget);
… …
2909 3215
2910# popup given the event (must be a mouse button down event currently) 3216# popup given the event (must be a mouse button down event currently)
2911sub popup { 3217sub popup {
2912 my ($self, $ev) = @_; 3218 my ($self, $ev) = @_;
2913 3219
2914 $self->_emit ("popdown"); 3220 $self->emit ("popdown");
2915 3221
2916 # maybe save $GRAB? must be careful about events... 3222 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3223 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3224 $self->{button} = $ev->{button};
2919 3225
2920 $self->show; 3226 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3227 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3228}
2923 3229
2924sub mouse_motion { 3230sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3231 my ($self, $ev, $x, $y) = @_;
2926 3232
2927 # TODO: should use vbox->find_widget or so 3233 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3234 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3235 $self->{hover} = $self->{item}{$HOVER};
2930 3236
2931 0 3237 0
2932} 3238}
2933 3239
2934sub button_up { 3240sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3241 my ($self, $ev, $x, $y) = @_;
2936 3242
2937 if ($ev->{button} == $self->{button}) { 3243 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3244 undef $GRAB;
2939 $self->hide; 3245 $self->hide;
2940 3246
2941 $self->_emit ("popdown"); 3247 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3248 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3249 } else {
2944 return 0 3250 return 0
2945 } 3251 }
2946 3252
2947 1 3253 1
2948} 3254}
2949 3255
2950############################################################################# 3256#############################################################################
2951 3257
2952package CFClient::UI::Multiplexer; 3258package CFPlus::UI::Multiplexer;
2953 3259
2954our @ISA = CFClient::UI::Container::; 3260our @ISA = CFPlus::UI::Container::;
2955 3261
2956sub new { 3262sub new {
2957 my $class = shift; 3263 my $class = shift;
2958 3264
2959 my $self = $class->SUPER::new ( 3265 my $self = $class->SUPER::new (
… …
2973 3279
2974 $self->{current} = $self->{children}[0] 3280 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3281 if @{ $self->{children} };
2976} 3282}
2977 3283
3284sub get_current_page {
3285 my ($self) = @_;
3286
3287 $self->{current}
3288}
3289
2978sub set_current_page { 3290sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3291 my ($self, $page_or_widget) = @_;
2980 3292
2981 my $widget = ref $page_or_widget 3293 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3294 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3295 : $self->{children}[$page_or_widget];
2984 3296
2985 $self->{current} = $widget; 3297 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3298 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3299
2988 $self->_emit (page_changed => $self->{current}); 3300 $self->emit (page_changed => $self->{current});
2989 3301
2990 $self->realloc; 3302 $self->realloc;
2991} 3303}
2992 3304
2993sub visible_children { 3305sub visible_children {
… …
2998 my ($self) = @_; 3310 my ($self) = @_;
2999 3311
3000 $self->{current}->size_request 3312 $self->{current}->size_request
3001} 3313}
3002 3314
3003sub size_allocate { 3315sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3316 my ($self, $w, $h) = @_;
3005 3317
3006 $self->{current}->configure (0, 0, $w, $h); 3318 $self->{current}->configure (0, 0, $w, $h);
3319
3320 1
3007} 3321}
3008 3322
3009sub _draw { 3323sub _draw {
3010 my ($self) = @_; 3324 my ($self) = @_;
3011 3325
3012 $self->{current}->draw; 3326 $self->{current}->draw;
3013} 3327}
3014 3328
3015############################################################################# 3329#############################################################################
3016 3330
3017package CFClient::UI::Notebook; 3331package CFPlus::UI::Notebook;
3018 3332
3019our @ISA = CFClient::UI::VBox::; 3333our @ISA = CFPlus::UI::VBox::;
3020 3334
3021sub new { 3335sub new {
3022 my $class = shift; 3336 my $class = shift;
3023 3337
3024 my $self = $class->SUPER::new ( 3338 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3339 buttonbar => (new CFPlus::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3341 # filter => # will be put between multiplexer and $self
3027 @_, 3342 @_,
3028 ); 3343 );
3029 3344
3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3346 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3347
3032 $self 3348 $self
3033} 3349}
3034 3350
3035sub add { 3351sub add {
3036 my ($self, $title, $widget, $tooltip) = @_; 3352 my ($self, $title, $widget, $tooltip) = @_;
3037 3353
3038 Scalar::Util::weaken $self; 3354 Scalar::Util::weaken $self;
3039 3355
3040 $self->{buttonbar}->add (new CFClient::UI::Button 3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3041 markup => $title, 3357 markup => $title,
3042 tooltip => $tooltip, 3358 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) }, 3359 on_activate => sub { $self->set_current_page ($widget) },
3044 ); 3360 );
3045 3361
3046 $self->{multiplexer}->add ($widget); 3362 $self->{multiplexer}->add ($widget);
3047} 3363}
3048 3364
3365sub get_current_page {
3366 my ($self) = @_;
3367
3368 $self->{multiplexer}->get_current_page
3369}
3370
3049sub set_current_page { 3371sub set_current_page {
3050 my ($self, $page) = @_; 3372 my ($self, $page) = @_;
3051 3373
3052 $self->{multiplexer}->set_current_page ($page); 3374 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3375 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3376}
3055 3377
3056############################################################################# 3378#############################################################################
3057 3379
3058package CFClient::UI::Statusbox; 3380package CFPlus::UI::Selector;
3059 3381
3382use utf8;
3383
3060our @ISA = CFClient::UI::VBox::; 3384our @ISA = CFPlus::UI::Button::;
3061 3385
3062sub new { 3386sub new {
3063 my $class = shift; 3387 my $class = shift;
3064 3388
3065 $class->SUPER::new ( 3389 my $self = $class->SUPER::new (
3390 options => [], # [value, title, longdesc], ...
3391 value => undef,
3392 @_,
3393 );
3394
3395 $self->_set_value ($self->{value});
3396
3397 $self
3398}
3399
3400sub invoke_button_down {
3401 my ($self, $ev) = @_;
3402
3403 my @menu_items;
3404
3405 for (@{ $self->{options} }) {
3406 my ($value, $title, $tooltip) = @$_;
3407
3408 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3409 }
3410
3411 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3412}
3413
3414sub _set_value {
3415 my ($self, $value) = @_;
3416
3417 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3418 or return;
3419
3420 $self->{value} = $item->[0];
3421 $self->set_markup ("$item->[1] ⇓");
3422 $self->set_tooltip ($item->[2]);
3423}
3424
3425sub set_value {
3426 my ($self, $value) = @_;
3427
3428 return unless $self->{value} ne $value;
3429
3430 $self->_set_value ($value);
3431 $self->emit (changed => $value);
3432}
3433
3434#############################################################################
3435
3436package CFPlus::UI::Statusbox;
3437
3438our @ISA = CFPlus::UI::VBox::;
3439
3440sub new {
3441 my $class = shift;
3442
3443 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3444 fontsize => 0.8,
3067 @_, 3445 @_,
3068 ) 3446 );
3447
3448 Scalar::Util::weaken (my $this = $self);
3449
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451
3452 $self
3069} 3453}
3070 3454
3071sub reorder { 3455sub reorder {
3072 my ($self) = @_; 3456 my ($self) = @_;
3073 my $NOW = time; 3457 my $NOW = Time::HiRes::time;
3458
3459 # freeze display when hovering over any label
3460 return if $CFPlus::UI::TOOLTIP->{owner}
3461 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3462 values %{ $self->{item} };
3074 3463
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3464 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3465 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3466 }
3078 3467
… …
3081 my @items = sort { 3470 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3471 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3472 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3473 } values %{ $self->{item} };
3085 3474
3475 $self->{timer}->interval (1);
3476
3086 my $count = 10 + 1; 3477 my $count = 10 + 1;
3087 for my $item (@items) { 3478 for my $item (@items) {
3088 last unless --$count; 3479 last unless --$count;
3089 3480
3090 push @widgets, $item->{label} ||= do { 3481 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3482 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3483 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3484 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3485 : $item->{text};
3095 3486
3096 for ($short) { 3487 for ($short) {
3097 s/^\s+//; 3488 s/^\s+//;
3098 s/\s+/ /g; 3489 s/\s+/ /g;
3099 } 3490 }
3100 3491
3101 new CFClient::UI::Label 3492 new CFPlus::UI::Label
3102 markup => $short, 3493 markup => $short,
3103 tooltip => $item->{tooltip}, 3494 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3495 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3496 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3497 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3498 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3499 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3500 can_events => 1,
3110 can_hover => 1 3501 can_hover => 1
3111 }; 3502 };
3503
3504 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3505 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3506 $label->update;
3507 $label->set_max_size (undef, $label->{req_h} * $diff)
3508 if $diff < 1;
3509 $self->{timer}->interval (1/30);
3510 } else {
3511 $label->{fg}[3] = $item->{fg}[3] || 1;
3512 }
3513
3514 push @widgets, $label;
3112 } 3515 }
3113 3516
3114 $self->clear; 3517 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3518 $self->SUPER::add (reverse @widgets);
3116} 3519}
… …
3121 $text =~ s/^\s+//; 3524 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3525 $text =~ s/\s+$//;
3123 3526
3124 return unless $text; 3527 return unless $text;
3125 3528
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3529 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3530
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3531 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3532
3130 if (my $item = $self->{item}{$group}) { 3533 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3534 if ($item->{text} eq $text) {
3132 $item->{count}++; 3535 $item->{count}++;
3133 } else { 3536 } else {
3134 $item->{count} = 1; 3537 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3538 $item->{text} = $item->{tooltip} = $text;
3136 } 3539 }
3137 $item->{id} = ++$self->{id}; 3540 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3541 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3542 delete $item->{label};
3140 } else { 3543 } else {
3141 $self->{item}{$group} = { 3544 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3545 id => ++$self->{id},
… …
3148 count => 1, 3551 count => 1,
3149 %arg, 3552 %arg,
3150 }; 3553 };
3151 } 3554 }
3152 3555
3556 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3557 $self->reorder;
3558 });
3154} 3559}
3155 3560
3156sub reconfigure { 3561sub reconfigure {
3157 my ($self) = @_; 3562 my ($self) = @_;
3158 3563
… …
3161 3566
3162 $self->reorder; 3567 $self->reorder;
3163 $self->SUPER::reconfigure; 3568 $self->SUPER::reconfigure;
3164} 3569}
3165 3570
3571sub destroy {
3572 my ($self) = @_;
3573
3574 $self->{timer}->cancel;
3575
3576 $self->SUPER::destroy;
3577}
3578
3166############################################################################# 3579#############################################################################
3167 3580
3168package CFClient::UI::Inventory; 3581package CFPlus::UI::Inventory;
3169 3582
3170our @ISA = CFClient::UI::ScrolledWindow::; 3583our @ISA = CFPlus::UI::Table::;
3171 3584
3172sub new { 3585sub new {
3173 my $class = shift; 3586 my $class = shift;
3174 3587
3175 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3589 col_expand => [0, 1, 0],
3590 items => [],
3177 @_, 3591 @_,
3178 ); 3592 );
3179 3593
3594 $self->set_sort_order (undef);
3595
3180 $self 3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3181} 3632}
3182 3633
3183sub set_items { 3634sub set_items {
3184 my ($self, $items) = @_; 3635 my ($self, $items) = @_;
3185 3636
3186 $self->{scrolled}->clear; 3637 $self->{items} = [$items ? values %$items : ()];
3187 return unless $items; 3638 $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} 3639}
3207 3640
3208############################################################################# 3641#############################################################################
3209 3642
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; 3643package CFPlus::UI::SpellList;
3408 3644
3409our @ISA = CFClient::UI::ScrolledWindow::; 3645our @ISA = CFPlus::UI::Table::;
3410 3646
3411sub new { 3647sub new {
3412 my $class = shift; 3648 my $class = shift;
3413 3649
3414 my $self = $class->SUPER::new ( 3650 my $self = $class->SUPER::new (
3415 binding => [], 3651 binding => [],
3416 commands => [], 3652 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3653 @_,
3419 ) 3654 )
3420} 3655}
3421 3656
3422# XXX: Do sorting? Argl... 3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3423sub add_spell { 3742sub add_spell {
3424 my ($self, $spell) = @_; 3743 my ($self, $spell) = @_;
3744
3425 $self->{spells}->{$spell->{name}} = $spell; 3745 $self->{spell}->{$spell->{name}} = $spell;
3426 3746 $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} 3747}
3455 3748
3456sub remove_spell { 3749sub remove_spell {
3457 my ($self, $spell) = @_; 3750 my ($self, $spell) = @_;
3751
3458 delete $self->{spells}->{$spell->{name}}; 3752 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3753 $self->rebuild_spell_list;
3460} 3754}
3461 3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3462############################################################################# 3763#############################################################################
3463 3764
3464package CFClient::UI::Root; 3765package CFPlus::UI::Root;
3465 3766
3466our @ISA = CFClient::UI::Container::; 3767our @ISA = CFPlus::UI::Container::;
3467 3768
3769use List::Util qw(min max);
3770
3468use CFClient::OpenGL; 3771use CFPlus::OpenGL;
3469 3772
3470sub new { 3773sub new {
3471 my $class = shift; 3774 my $class = shift;
3472 3775
3473 my $self = $class->SUPER::new ( 3776 my $self = $class->SUPER::new (
… …
3498 $coord = $max - $size if $coord > $max - $size; 3801 $coord = $max - $size if $coord > $max - $size;
3499 3802
3500 int $coord + 0.5 3803 int $coord + 0.5
3501} 3804}
3502 3805
3503sub size_allocate { 3806sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3807 my ($self, $w, $h) = @_;
3505 3808
3506 for my $child ($self->children) { 3809 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3810 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3811
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3815 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3816 $Y = _to_pixel $Y, $H, $self->{h};
3514 3817
3515 $child->configure ($X, $Y, $W, $H); 3818 $child->configure ($X, $Y, $W, $H);
3516 } 3819 }
3820
3821 1
3517} 3822}
3518 3823
3519sub coord2local { 3824sub coord2local {
3520 my ($self, $x, $y) = @_; 3825 my ($self, $x, $y) = @_;
3521 3826
… …
3606 3911
3607 delete $queue{$widget+0}; 3912 delete $queue{$widget+0};
3608 3913
3609 my ($w, $h) = $widget->size_request; 3914 my ($w, $h) = $widget->size_request;
3610 3915
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3916 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3917 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3918
3919 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3920 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3921
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3922 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3923 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3924
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3925 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3951
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3953
3646 $w = 0 if $w < 0; 3954 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3955 $h = 0 if $h < 0;
3956
3957 $w = max $widget->{min_w}, $w;
3958 $h = max $widget->{min_h}, $h;
3959
3960# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962
3963 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3965
3649 $w = int $w + 0.5; 3966 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3967 $h = int $h + 0.5;
3651 3968
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3969 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3993 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3677 glMatrixMode GL_MODELVIEW; 3994 glMatrixMode GL_MODELVIEW;
3678 glLoadIdentity; 3995 glLoadIdentity;
3679 3996
3680 { 3997 {
3681 package CFClient::UI::Base; 3998 package CFPlus::UI::Base;
3682 3999
3683 ($draw_x, $draw_y, $draw_w, $draw_h) = 4000 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h}); 4001 (0, 0, $self->{w}, $self->{h});
3685 } 4002 }
3686 4003
3687 $self->_draw; 4004 $self->_draw;
3688} 4005}
3689 4006
3690############################################################################# 4007#############################################################################
3691 4008
3692package CFClient::UI; 4009package CFPlus::UI;
3693 4010
3694$ROOT = new CFClient::UI::Root; 4011$ROOT = new CFPlus::UI::Root;
3695$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4012$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3696 4013
36971 40141
3698 4015

Diff Legend

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