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

Diff Legend

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