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

Diff Legend

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