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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.364 by root, Sat Dec 23 10:18:27 2006 UTC

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

Diff Legend

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