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.432 by root, Tue Aug 21 23:42:02 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) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 120
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
100} 129}
101 130
102sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
103 my ($ev) = @_; 132 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 133
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 135
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 137
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
111 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 140
113 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 143 $grab->update if $grab;
116 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
117 145
118 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
119 } 148 }
120} 149}
121 150
122sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
123 my ($ev) = @_; 152 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
125 154
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 156
128 if ($widget != $HOVER) { 157 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 158
131 $hover->update if $hover && $hover->{can_hover}; 159 $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; 160 if $HOVER;
139} 161}
140 162
141# convert position array to integers 163# convert position array to integers
142sub harmonize { 164sub harmonize {
… …
192 reconfigure_widgets; 214 reconfigure_widgets;
193} 215}
194 216
195############################################################################# 217#############################################################################
196 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
197package CFClient::UI::Base; 227package CFPlus::UI::Base;
198 228
199use strict; 229use strict;
200 230
201use CFClient::OpenGL; 231use CFPlus::OpenGL;
202 232
203sub new { 233sub new {
204 my $class = shift; 234 my $class = shift;
205 235
206 my $self = bless { 236 my $self = bless {
… …
211 h => undef, 241 h => undef,
212 can_events => 1, 242 can_events => 1,
213 @_ 243 @_
214 }, $class; 244 }, $class;
215 245
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 247
218 for (keys %$self) { 248 for (keys %$self) {
219 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
221 } 251 }
222 } 252 }
223 253
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $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}; 256 $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}; 257 $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}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 259
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 262
233 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
238 268
239sub destroy { 269sub destroy {
240 my ($self) = @_; 270 my ($self) = @_;
241 271
242 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
243 %$self = (); 274 %$self = ();
244} 275}
245 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
246sub show { 281sub show {
247 my ($self) = @_; 282 my ($self) = @_;
248 283
249 return if $self->{parent}; 284 return if $self->{parent};
250 285
251 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
252} 287}
253 288
254sub set_visible { 289sub set_visible {
255 my ($self) = @_; 290 my ($self) = @_;
256 291
… …
271 306
272 return unless $self->{visible}; 307 return unless $self->{visible};
273 308
274 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
275 310
311 delete $self->{visible};
276 delete $self->{root}; 312 delete $self->{root};
277 delete $self->{visible};
278 313
279 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
281 316
282 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
284 319
285 $self->focus_out; 320 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
289 323
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
319 $self->{x} = List::Util::max 0, int $x; 353 $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; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
322 356
323 $self->update; 357 $self->update;
324} 358}
325 359
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
366 404
367 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
368 } 406 }
369} 407}
370 408
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
376} 415}
377 416
378sub set_max_size { 417sub set_max_size {
379 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
380 419
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
383} 424}
384 425
385sub set_tooltip { 426sub set_tooltip {
386 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
387 428
… …
390 431
391 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
392 433
393 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
394 435
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
398 } 439 }
399} 440}
400 441
401# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
402sub coord2local { 443sub coord2local {
403 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
404 445
446 Carp::confess unless $self->{parent};#d#
447
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 449}
407 450
408# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
409sub coord2global { 452sub coord2global {
410 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
411 454
455 Carp::confess unless $self->{parent};#d#
456
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 458}
414 459
415sub focus_in { 460sub invoke_focus_in {
416 my ($self) = @_; 461 my ($self) = @_;
417 462
418 return if $FOCUS == $self; 463 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
420 465
421 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
422 467
423 $self->_emit (focus_in => $focus); 468 $self->update;
424 469
425 $focus->update if $focus; 470 0
426 $FOCUS->update;
427} 471}
428 472
429sub focus_out { 473sub invoke_focus_out {
430 my ($self) = @_; 474 my ($self) = @_;
431 475
432 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
433 477
434 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
435 479
436 $self->_emit (focus_out => $focus); 480 $self->update;
437 481
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 483 unless $FOCUS;
442}
443 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
444sub mouse_motion { 0 } 495sub invoke_mouse_motion { 0 }
445sub button_up { 0 } 496sub invoke_button_up { 0 }
446sub key_down { 0 } 497sub invoke_key_down { 0 }
447sub key_up { 0 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
448 500
449sub button_down { 501sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
451 503
452 $self->focus_in; 504 $self->grab_focus;
453 505
454 0 506 0
455} 507}
456 508
509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
457sub find_widget { 556#sub find_widget {
458 my ($self, $x, $y) = @_; 557# in .xs
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468 558
469sub set_parent { 559sub set_parent {
470 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
471 561
472 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 563 $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} 564}
498 565
499sub realloc { 566sub realloc {
500 my ($self) = @_; 567 my ($self) = @_;
501 568
… …
526 593
527# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless. 595# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530 597
531sub draw { 598#sub draw {
532 my ($self) = @_; 599#CFPlus.xs
533
534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545
546 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550
551 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2;
555 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS;
558 glVertex $x , $y;
559 glVertex $x + $self->{w}, $y;
560 glVertex $x + $self->{w}, $y + $self->{h};
561 glVertex $x , $y + $self->{h};
562 glEnd;
563 glDisable GL_BLEND;
564 }
565
566 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix;
568 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
570 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1;
575 glEnd;
576 glPopMatrix;
577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
578 }
579}
580 600
581sub _draw { 601sub _draw {
582 my ($self) = @_; 602 my ($self) = @_;
583 603
584 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
585} 605}
586 606
587sub DESTROY { 607sub DESTROY {
588 my ($self) = @_; 608 my ($self) = @_;
589 609
610 return if CFPlus::in_destruct;
611
612 local $@;
613 eval { $self->destroy };
614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
615
590 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
591 #$self->deactivate;
592} 617}
593 618
594############################################################################# 619#############################################################################
595 620
596package CFClient::UI::DrawBG; 621package CFPlus::UI::DrawBG;
597 622
598our @ISA = CFClient::UI::Base::; 623our @ISA = CFPlus::UI::Base::;
599 624
600use strict; 625use strict;
601use CFClient::OpenGL; 626use CFPlus::OpenGL;
602 627
603sub new { 628sub new {
604 my $class = shift; 629 my $class = shift;
605
606 # range [value, low, high, page]
607 630
608 $class->SUPER::new ( 631 $class->SUPER::new (
609 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
610 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
611 @_ 634 @_
… …
621 644
622 if ($color && (@$color < 4 || $color->[3])) { 645 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
624 647
625 glEnable GL_BLEND; 648 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 650 glColor_premultiply @$color;
628
629 glBegin GL_QUADS;
630 glVertex 0 , 0;
631 glVertex 0 , $h;
632 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
633 glVertex $w, 0;
634 glEnd;
635
636 glDisable GL_BLEND; 652 glDisable GL_BLEND;
637 } 653 }
638} 654}
639 655
640############################################################################# 656#############################################################################
641 657
642package CFClient::UI::Empty; 658package CFPlus::UI::Empty;
643 659
644our @ISA = CFClient::UI::Base::; 660our @ISA = CFPlus::UI::Base::;
645 661
646sub new { 662sub new {
647 my ($class, %arg) = @_; 663 my ($class, %arg) = @_;
648 $class->SUPER::new (can_events => 0, %arg); 664 $class->SUPER::new (can_events => 0, %arg);
649} 665}
… …
656 672
657sub draw { } 673sub draw { }
658 674
659############################################################################# 675#############################################################################
660 676
661package CFClient::UI::Container; 677package CFPlus::UI::Container;
662 678
663our @ISA = CFClient::UI::Base::; 679our @ISA = CFPlus::UI::Base::;
664 680
665sub new { 681sub new {
666 my ($class, %arg) = @_; 682 my ($class, %arg) = @_;
667 683
668 my $children = delete $arg{children} || []; 684 my $children = delete $arg{children};
669 685
670 my $self = $class->SUPER::new ( 686 my $self = $class->SUPER::new (
671 children => [], 687 children => [],
672 can_events => 0, 688 can_events => 0,
673 %arg, 689 %arg,
674 ); 690 );
691
675 $self->add ($_) for @$children; 692 $self->add (@$children)
693 if $children && @$children;
676 694
677 $self 695 $self
696}
697
698sub realloc {
699 my ($self) = @_;
700
701 $self->{force_realloc} = 1;
702 $self->{force_size_alloc} = 1;
703 $self->SUPER::realloc;
678} 704}
679 705
680sub add { 706sub add {
681 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
682 708
683 $_->set_parent ($self) 709 $_->set_parent ($self)
684 for @widgets; 710 for @widgets;
685 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
686 use sort 'stable'; 713 use sort 'stable';
687 714
688 $self->{children} = [ 715 $self->{children} = [
689 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
690 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
691 ]; 718 ];
692 719
693 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
694} 725}
695 726
696sub children { 727sub children {
697 @{ $_[0]{children} } 728 @{ $_[0]{children} }
698} 729}
699 730
700sub remove { 731sub remove {
701 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
702 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
703 delete $child->{parent}; 737 delete $child->{parent};
704 $child->hide; 738 $child->hide;
705
706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
707 741
708 $self->realloc; 742 $self->realloc;
709} 743}
710 744
711sub clear { 745sub clear {
712 my ($self) = @_; 746 my ($self) = @_;
713 747
714 my $children = delete $self->{children}; 748 my $children = $self->{children};
715 $self->{children} = []; 749 $self->{children} = [];
716 750
717 for (@$children) { 751 for (@$children) {
718 delete $_->{parent}; 752 delete $_->{parent};
719 $_->hide; 753 $_->hide;
… …
728 $x -= $self->{x}; 762 $x -= $self->{x};
729 $y -= $self->{y}; 763 $y -= $self->{y};
730 764
731 my $res; 765 my $res;
732 766
733 for (reverse @{ $self->{children} }) { 767 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 768 $res = $_->find_widget ($x, $y)
735 and return $res; 769 and return $res;
736 } 770 }
737 771
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 772 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
739} 773}
740 774
741sub _draw { 775sub _draw {
742 my ($self) = @_; 776 my ($self) = @_;
743 777
744 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
745} 779}
746 780
747############################################################################# 781#############################################################################
748 782
749package CFClient::UI::Bin; 783package CFPlus::UI::Bin;
750 784
751our @ISA = CFClient::UI::Container::; 785our @ISA = CFPlus::UI::Container::;
752 786
753sub new { 787sub new {
754 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
755 789
756 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 790 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
757 791
758 $class->SUPER::new (children => [$child], %arg) 792 $class->SUPER::new (children => [$child], %arg)
759} 793}
760 794
761sub add { 795sub add {
762 my ($self, $child) = @_; 796 my ($self, $child) = @_;
763 797
764 $self->{children} = []; 798 $self->clear;
765
766 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
767} 800}
768 801
769sub remove { 802sub remove {
770 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
771 804
772 $self->SUPER::remove ($widget); 805 $self->SUPER::remove ($widget);
773 806
774 $self->{children} = [new CFClient::UI::Empty] 807 $self->{children} = [new CFPlus::UI::Empty]
775 unless @{$self->{children}}; 808 unless @{$self->{children}};
776} 809}
777 810
778sub child { $_[0]->{children}[0] } 811sub child { $_[0]->{children}[0] }
779 812
780sub size_request { 813sub size_request {
781 $_[0]{children}[0]->size_request 814 $_[0]{children}[0]->size_request
782} 815}
783 816
784sub size_allocate { 817sub invoke_size_allocate {
785 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
786 819
787 $self->{children}[0]->configure (0, 0, $w, $h); 820 $self->{children}[0]->configure (0, 0, $w, $h);
821
822 1
788} 823}
789 824
790############################################################################# 825#############################################################################
791 826
827# back-buffered drawing area
828
792package CFClient::UI::Window; 829package CFPlus::UI::Window;
793 830
794our @ISA = CFClient::UI::Bin::; 831our @ISA = CFPlus::UI::Bin::;
795 832
796use CFClient::OpenGL; 833use CFPlus::OpenGL;
797 834
798sub new { 835sub new {
799 my ($class, %arg) = @_; 836 my ($class, %arg) = @_;
800 837
801 my $self = $class->SUPER::new (%arg); 838 my $self = $class->SUPER::new (%arg);
… …
806 843
807 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 844 $ROOT->on_post_alloc ($self => sub { $self->render_child });
808 $self->SUPER::update; 845 $self->SUPER::update;
809} 846}
810 847
811sub size_allocate { 848sub invoke_size_allocate {
812 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
813 850
814 $self->SUPER::size_allocate ($w, $h);
815 $self->update; 851 $self->update;
852
853 $self->SUPER::invoke_size_allocate ($w, $h)
816} 854}
817 855
818sub _render { 856sub _render {
819 my ($self) = @_; 857 my ($self) = @_;
820 858
… …
822} 860}
823 861
824sub render_child { 862sub render_child {
825 my ($self) = @_; 863 my ($self) = @_;
826 864
827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 865 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
828 glClearColor 0, 0, 0, 0; 866 glClearColor 0, 0, 0, 0;
829 glClear GL_COLOR_BUFFER_BIT; 867 glClear GL_COLOR_BUFFER_BIT;
830 868
831 { 869 {
832 package CFClient::UI::Base; 870 package CFPlus::UI::Base;
833 871
834 ($draw_x, $draw_y, $draw_w, $draw_h) = 872 local ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h}); 873 (0, 0, $self->{w}, $self->{h});
874
875 $self->_render;
836 } 876 }
837
838 $self->_render;
839 }; 877 };
840} 878}
841 879
842sub _draw { 880sub _draw {
843 my ($self) = @_; 881 my ($self) = @_;
844
845 my ($w, $h) = @$self{qw(w h)};
846 882
847 my $tex = $self->{texture} 883 my $tex = $self->{texture}
848 or return; 884 or return;
849 885
850 glEnable GL_TEXTURE_2D; 886 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 888 glColor 0, 0, 0, 1;
853 889
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 890 $tex->draw_quad_alpha_premultiplied (0, 0);
855 891
856 glDisable GL_TEXTURE_2D; 892 glDisable GL_TEXTURE_2D;
857} 893}
858 894
859############################################################################# 895#############################################################################
860 896
861package CFClient::UI::ViewPort; 897package CFPlus::UI::ViewPort;
862 898
899use List::Util qw(min max);
900
863our @ISA = CFClient::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
864 902
865sub new { 903sub new {
866 my $class = shift; 904 my $class = shift;
867 905
868 $class->SUPER::new ( 906 $class->SUPER::new (
… …
875sub size_request { 913sub size_request {
876 my ($self) = @_; 914 my ($self) = @_;
877 915
878 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
879 917
880 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
882 920
883 ($w, $h) 921 ($w, $h)
884} 922}
885 923
886sub size_allocate { 924sub invoke_size_allocate {
887 my ($self, $w, $h) = @_; 925 my ($self, $w, $h) = @_;
888 926
889 my $child = $self->child; 927 my $child = $self->child;
890 928
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 929 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 930 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893 931
894 $self->child->configure (0, 0, $w, $h); 932 $self->child->configure (0, 0, $w, $h);
895 $self->update; 933 $self->update;
934
935 1
896} 936}
897 937
898sub set_offset { 938sub set_offset {
899 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
900 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
901 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
902 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
903 947
948 $self->emit (changed => $x, $y);
904 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
905} 969}
906 970
907# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
908sub coord2local { 972sub coord2local {
909 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
924 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
925 989
926 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
927 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
928 ) { 992 ) {
929 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
930 } else { 994 } else {
931 $self->CFClient::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
932 } 996 }
933} 997}
934 998
935sub _render { 999sub _render {
936 my ($self) = @_; 1000 my ($self) = @_;
937 1001
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1002 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}; 1003 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
940 1004
941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1005 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
942 1006
943 $self->SUPER::_render; 1007 $self->SUPER::_render;
944} 1008}
945 1009
946############################################################################# 1010#############################################################################
947 1011
948package CFClient::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
949 1013
950our @ISA = CFClient::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
951 1015
952sub new { 1016sub new {
953 my $class = shift; 1017 my ($class, %arg) = @_;
1018
1019 my $child = delete $arg{child};
954 1020
955 my $self; 1021 my $self;
956 1022
957 my $slider = new CFClient::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
958 vertical => 1, 1037 vertical => 1,
959 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
960 on_changed => sub { 1039 on_changed => sub {
961 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
962 }, 1042 },
963 ; 1043 ;
964 1044
965 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1048 can_events => 1,
967 slider => $slider, 1049 hslider => $hslider,
968 @_, 1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1053 %arg,
969 ); 1054 );
970 1055
971 $self->{vp}->add ($self->{scrolled}); 1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
972 $self->add ($self->{vp}); 1077 $self->SUPER::add ($self->{vp});
973 $self->add ($self->{slider}); 1078
1079 $self->add ($child) if $child;
974 1080
975 $self 1081 $self
976} 1082}
977 1083
1084sub add {
1085 my ($self, $widget) = @_;
1086
1087 $self->{vp}->add ($self->{child} = $widget);
1088}
1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
978sub update { 1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
979 my ($self) = @_; 1125 my ($self, $ev) = @_;
980 1126
981 $self->SUPER::update; 1127 $self->grab_focus;
982 1128
983 # todo: overwrite size_allocate of child 1129 my $ox = $self->{vp}{view_x};
984 my $child = $self->{vp}->child; 1130 my $oy = $self->{vp}{view_y};
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1131
986} 1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
987 1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1142sub invoke_mouse_wheel {
1143 my ($self, $ev) = @_;
1144
1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1158
1159 0
1160}
1161
1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1164
1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1181}
1182
988sub size_allocate { 1183sub invoke_size_allocate {
989 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
990 1185
1186 $self->update_slider;
991 $self->SUPER::size_allocate ($w, $h); 1187 $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} 1188}
996
997#TODO# update range on size_allocate depending on child
998# update viewport offset on scroll
999 1189
1000############################################################################# 1190#############################################################################
1001 1191
1002package CFClient::UI::Frame; 1192package CFPlus::UI::Frame;
1003 1193
1004our @ISA = CFClient::UI::Bin::; 1194our @ISA = CFPlus::UI::Bin::;
1005 1195
1006use CFClient::OpenGL; 1196use CFPlus::OpenGL;
1007 1197
1008sub new { 1198sub new {
1009 my $class = shift; 1199 my $class = shift;
1010 1200
1011 $class->SUPER::new ( 1201 $class->SUPER::new (
… …
1019 1209
1020 if ($self->{bg}) { 1210 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1022 1212
1023 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1026
1027 glBegin GL_QUADS;
1028 glVertex 0 , 0;
1029 glVertex 0 , $h;
1030 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1031 glVertex $w, 0;
1032 glEnd;
1033
1034 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1035 } 1218 }
1036 1219
1037 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1038} 1221}
1039 1222
1040############################################################################# 1223#############################################################################
1041 1224
1042package CFClient::UI::FancyFrame; 1225package CFPlus::UI::FancyFrame;
1043 1226
1044our @ISA = CFClient::UI::Bin::; 1227our @ISA = CFPlus::UI::Bin::;
1045 1228
1046use CFClient::OpenGL; 1229use 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 1230
1056sub new { 1231sub new {
1057 my ($class, %arg) = @_; 1232 my ($class, %arg) = @_;
1058 1233
1059 my $title = delete $arg{title}; 1234 if ((exists $arg{label}) && !ref $arg{label}) {
1235 $arg{label} = new CFPlus::UI::Label
1236 align => 1,
1237 valign => 0,
1238 text => $arg{label},
1239 fontsize => ($arg{border} || 0.8) * 0.75;
1240 }
1241
1242 my $self = $class->SUPER::new (
1243 # label => "",
1244 fg => [0.6, 0.3, 0.1],
1245 border => 0.8,
1246 style => 'single',
1247 %arg,
1248 );
1249
1250 $self
1251}
1252
1253sub add {
1254 my ($self, @widgets) = @_;
1255
1256 $self->SUPER::add (@widgets);
1257 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1258}
1259
1260sub border {
1261 int $_[0]{border} * $::FONTSIZE
1262}
1263
1264sub size_request {
1265 my ($self) = @_;
1266
1267 ($self->{label_w}, undef) = $self->{label}->size_request
1268 if $self->{label};
1269
1270 my ($w, $h) = $self->SUPER::size_request;
1271
1272 (
1273 $w + $self->border * 2,
1274 $h + $self->border * 2,
1275 )
1276}
1277
1278sub invoke_size_allocate {
1279 my ($self, $w, $h) = @_;
1280
1281 my $border = $self->border;
1282
1283 $w -= List::Util::max 0, $border * 2;
1284 $h -= List::Util::max 0, $border * 2;
1285
1286 if (my $label = $self->{label}) {
1287 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1288 $label->{h} = List::Util::min $h, $border;
1289 $label->invoke_size_allocate ($label->{w}, $label->{h});
1290 }
1291
1292 $self->child->configure ($border, $border, $w, $h);
1293
1294 1
1295}
1296
1297sub _draw {
1298 my ($self) = @_;
1299
1300 my $child = $self->{children}[0];
1301
1302 my $border = $self->border;
1303 my ($w, $h) = ($self->{w}, $self->{h});
1304
1305 $child->draw;
1306
1307 glColor @{$self->{fg}};
1308 glBegin GL_LINE_STRIP;
1309 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1310 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1311 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1312 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1313 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1314 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1315 glEnd;
1316
1317 if ($self->{label}) {
1318 glTranslate $border * 2, 0;
1319 $self->{label}->_draw;
1320 }
1321}
1322
1323#############################################################################
1324
1325package CFPlus::UI::Toplevel;
1326
1327our @ISA = CFPlus::UI::Bin::;
1328
1329use CFPlus::OpenGL;
1330
1331my $bg =
1332 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1333 mipmap => 1, wrap => 1;
1334
1335my @border =
1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1342
1343sub new {
1344 my ($class, %arg) = @_;
1060 1345
1061 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1062 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
1063 border_bg => [1, 1, 1, 1], 1348 border_bg => [1, 1, 1, 1],
1064 border => 0.6, 1349 border => 0.6,
1065 can_events => 1, 1350 can_events => 1,
1066 min_w => 16, 1351 min_w => 64,
1067 min_h => 16, 1352 min_h => 32,
1068 %arg, 1353 %arg,
1069 ); 1354 );
1070 1355
1071 $self->{title} = new CFClient::UI::Label 1356 $self->{title_widget} = new CFPlus::UI::Label
1072 align => 0, 1357 align => 0,
1073 valign => 1, 1358 valign => 1,
1074 text => $title, 1359 text => $self->{title},
1075 fontsize => $self->{border} 1360 fontsize => $self->{border},
1076 if defined $title; 1361 if exists $self->{title};
1362
1363 if ($self->{has_close_button}) {
1364 $self->{close_button} =
1365 new CFPlus::UI::ImageButton
1366 path => 'x1_close.png',
1367 on_activate => sub { $self->emit ("delete") };
1368
1369 $self->CFPlus::UI::Container::add ($self->{close_button});
1370 }
1077 1371
1078 $self 1372 $self
1079} 1373}
1080 1374
1081sub add { 1375sub add {
1082 my ($self, @widgets) = @_; 1376 my ($self, @widgets) = @_;
1083 1377
1084 $self->SUPER::add (@widgets); 1378 $self->SUPER::add (@widgets);
1379 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1380 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1086} 1381}
1087 1382
1088sub border { 1383sub border {
1089 int $_[0]{border} * $::FONTSIZE 1384 int $_[0]{border} * $::FONTSIZE
1090} 1385}
1091 1386
1092sub size_request { 1387sub size_request {
1093 my ($self) = @_; 1388 my ($self) = @_;
1094 1389
1095 $self->{title}->size_request 1390 $self->{title_widget}->size_request
1096 if $self->{title}; 1391 if $self->{title_widget};
1392
1393 $self->{close_button}->size_request
1394 if $self->{close_button};
1097 1395
1098 my ($w, $h) = $self->SUPER::size_request; 1396 my ($w, $h) = $self->SUPER::size_request;
1099 1397
1100 ( 1398 (
1101 $w + $self->border * 2, 1399 $w + $self->border * 2,
1102 $h + $self->border * 2, 1400 $h + $self->border * 2,
1103 ) 1401 )
1104} 1402}
1105 1403
1106sub size_allocate { 1404sub invoke_size_allocate {
1107 my ($self, $w, $h) = @_; 1405 my ($self, $w, $h) = @_;
1108 1406
1109 if ($self->{title}) { 1407 if ($self->{title_widget}) {
1110 $self->{title}{w} = $w; 1408 $self->{title_widget}{w} = $w;
1111 $self->{title}{h} = $h; 1409 $self->{title_widget}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h); 1410 $self->{title_widget}->invoke_size_allocate ($w, $h);
1113 } 1411 }
1114 1412
1115 my $border = $self->border; 1413 my $border = $self->border;
1116 1414
1117 $h -= List::Util::max 0, $border * 2; 1415 $h -= List::Util::max 0, $border * 2;
1118 $w -= List::Util::max 0, $border * 2; 1416 $w -= List::Util::max 0, $border * 2;
1417
1418 $self->child->configure ($border, $border, $w, $h);
1419
1420 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1421 if $self->{close_button};
1422
1423 1
1424}
1425
1426sub invoke_delete {
1427 my ($self) = @_;
1428
1429 $self->hide;
1119 1430
1120 $self->child->configure ($border, $border, $w, $h); 1431 1
1121} 1432}
1122 1433
1123sub button_down { 1434sub invoke_button_down {
1124 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1125 1436
1126 my ($w, $h) = @$self{qw(w h)}; 1437 my ($w, $h) = @$self{qw(w h)};
1127 my $border = $self->border; 1438 my $border = $self->border;
1128 1439
… …
1144 my $dy = $ev->{y} - $oy; 1455 my $dy = $ev->{y} - $oy;
1145 1456
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1457 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1458 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1459
1460 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1461 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1462 };
1152 1463
1153 } elsif ($lr ^ $td) { 1464 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1465 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1466 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1469 my ($ev, $x, $y) = @_;
1159 1470
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1471 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1472
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1473 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1474 # HACK: the next line is required to enforce placement
1475 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1476 };
1164 } else { 1477 } else {
1165 return 0; 1478 return 0;
1166 } 1479 }
1167 1480
1168 1 1481 1
1169} 1482}
1170 1483
1171sub button_up { 1484sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_; 1485 my ($self, $ev, $x, $y) = @_;
1173 1486
1174 !!delete $self->{motion} 1487 ! ! delete $self->{motion}
1175} 1488}
1176 1489
1177sub mouse_motion { 1490sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_; 1491 my ($self, $ev, $x, $y) = @_;
1179 1492
1180 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1493 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181 1494
1182 !!$self->{motion} 1495 ! ! $self->{motion}
1496}
1497
1498sub invoke_visibility_change {
1499 my ($self, $visible) = @_;
1500
1501 delete $self->{motion} unless $visible;
1502
1503 0
1183} 1504}
1184 1505
1185sub _draw { 1506sub _draw {
1186 my ($self) = @_; 1507 my ($self) = @_;
1187 1508
… …
1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1195 1516
1196 my $border = $self->border; 1517 my $border = $self->border;
1197 1518
1198 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1199 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1203 1538
1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1205 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1206 1541
1207 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1213 1548
1214 glDisable GL_TEXTURE_2D; 1549 glDisable GL_TEXTURE_2D;
1215 1550
1216 $child->draw; 1551 $child->draw;
1217 1552
1218 if ($self->{title}) { 1553 if ($self->{title_widget}) {
1219 glTranslate 0, $border - $self->{h}; 1554 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw; 1555 $self->{title_widget}->_draw;
1556
1557 glTranslate 0, - ($border - $self->{h});
1221 } 1558 }
1559
1560 $self->{close_button}->draw
1561 if $self->{close_button};
1222} 1562}
1223 1563
1224############################################################################# 1564#############################################################################
1225 1565
1226package CFClient::UI::Table; 1566package CFPlus::UI::Table;
1227 1567
1228our @ISA = CFClient::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1229 1569
1230use List::Util qw(max sum); 1570use List::Util qw(max sum);
1231 1571
1232use CFClient::OpenGL; 1572use CFPlus::OpenGL;
1233 1573
1234sub new { 1574sub new {
1235 my $class = shift; 1575 my $class = shift;
1236 1576
1237 $class->SUPER::new ( 1577 $class->SUPER::new (
1238 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1239 @_, 1580 @_,
1240 ) 1581 )
1241} 1582}
1242 1583
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1245}
1246
1247sub add { 1584sub add {
1248 my ($self, $x, $y, $child) = @_;
1249
1250 $child->set_parent ($self);
1251 $self->{children}[$y][$x] = $child;
1252
1253 $self->realloc;
1254}
1255
1256# TODO: move to container class maybe? send children a signal on removal?
1257sub clear {
1258 my ($self) = @_; 1585 my ($self, @widgets) = @_;
1586
1587 for my $child (@widgets) {
1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1593}
1594
1595sub add_at {
1596 my $self = shift;
1597
1598 my @widgets;
1599
1600 while (@_) {
1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1602
1603 $child->{c_row} = $row;
1604 $child->{c_col} = $col;
1605
1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1613 my ($self) = @_;
1614
1615 my (@w, @h);
1259 1616
1260 my @children = $self->children; 1617 my @children = $self->children;
1261 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1262 1628 }
1263 for (@children) {
1264 delete $_->{parent};
1265 $_->hide;
1266 }
1267 1629
1268 $self->realloc; 1630 # second pass, rows
1269} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1270
1271sub get_wh {
1272 my ($self) = @_;
1273
1274 my (@w, @h);
1275
1276 for my $y (0 .. $#{$self->{children}}) {
1277 my $row = $self->{children}[$y]
1278 or next;
1279
1280 for my $x (0 .. $#$row) {
1281 my $widget = $row->[$x]
1282 or next;
1283 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1284 1633
1285 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1286 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1287 } 1638 }
1288 } 1639 }
1289 1640
1290 (\@w, \@h) 1641 (\@w, \@h)
1291} 1642}
… …
1299 (sum @$ws), 1650 (sum @$ws),
1300 (sum @$hs), 1651 (sum @$hs),
1301 ) 1652 )
1302} 1653}
1303 1654
1304sub size_allocate { 1655sub invoke_size_allocate {
1305 my ($self, $w, $h) = @_; 1656 my ($self, $w, $h) = @_;
1306 1657
1307 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1308 1659
1309 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1310 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1311 1662
1312 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1313 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1314 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1315 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1316 1667
1317 # linearly scale sizes
1318 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1319 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1320 1669
1321 CFClient::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1322 CFClient::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1323 1679
1324 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1325 1682
1326 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1327 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1328 or next;
1329 1685
1330 my $x = 0; 1686 $widget->configure (
1331 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1332 1689 );
1333 for my $c (0 .. $#$row) { 1690 }
1334 my $col_w = $ws->[$c];
1335 1691
1336 if (my $widget = $row->[$c]) { 1692 1
1337 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1338 }
1339 1694
1340 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1341 } 1722 }
1342
1343 $y += $row_h;
1344 } 1723 }
1345 1724
1346} 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1347 1727
1348sub find_widget { 1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1349 my ($self, $x, $y) = @_; 1746 my ($self, $W, $H) = @_;
1350 1747
1351 $x -= $self->{x}; 1748 for my $child ($self->visible_children) {
1352 $y -= $self->{y}; 1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1353 1751
1354 my $res; 1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1355 1754
1356 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1357 $res = $_->find_widget ($x, $y) 1756 }
1358 and return $res; 1757
1359 } 1758 1
1360
1361 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1362}
1363
1364sub _draw {
1365 my ($self) = @_;
1366
1367 for (grep $_, @{$self->{children}}) {
1368 $_->draw for grep $_, @$_;
1369 }
1370} 1759}
1371 1760
1372############################################################################# 1761#############################################################################
1373 1762
1374package CFClient::UI::Box; 1763package CFPlus::UI::Box;
1375 1764
1376our @ISA = CFClient::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1377 1766
1378sub size_request { 1767sub size_request {
1379 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1380 1771
1381 $self->{vertical} 1772 $self->{vertical}
1382 ? ( 1773 ? (
1383 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1385 ) 1776 )
1386 : ( 1777 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1389 ) 1780 )
1390} 1781}
1391 1782
1392sub size_allocate { 1783sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
1394 1785
1395 my $space = $self->{vertical} ? $h : $w; 1786 my $space = $self->{vertical} ? $h : $w;
1396 my $children = $self->{children}; 1787 my @children = $self->visible_children;
1397 1788
1398 my @req; 1789 my @req;
1399 1790
1400 if ($self->{homogeneous}) { 1791 if ($self->{homogeneous}) {
1401 @req = ($space / (@$children || 1)) x @$children; 1792 @req = ($space / (@children || 1)) x @children;
1402 } else { 1793 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1794 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1404 my $req = List::Util::sum @req; 1795 my $req = List::Util::sum @req;
1405 1796
1406 if ($req > $space) { 1797 if ($req > $space) {
1407 # ah well, not enough space 1798 # ah well, not enough space
1408 $_ *= $space / $req for @req; 1799 $_ *= $space / $req for @req;
1409 } else { 1800 } else {
1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1801 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1411 1802
1412 $space = ($space - $req) / $expand; # remaining space to give away 1803 $space = ($space - $req) / $expand; # remaining space to give away
1413 1804
1414 $req[$_] += $space * $children->[$_]{expand} 1805 $req[$_] += $space * $children[$_]{expand}
1415 for 0 .. $#$children; 1806 for 0 .. $#children;
1416 } 1807 }
1417 } 1808 }
1418 1809
1419 CFClient::UI::harmonize \@req; 1810 CFPlus::UI::harmonize \@req;
1420 1811
1421 my $pos = 0; 1812 my $pos = 0;
1422 for (0 .. $#$children) { 1813 for (0 .. $#children) {
1423 my $alloc = $req[$_]; 1814 my $alloc = $req[$_];
1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1815 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1425 1816
1426 $pos += $alloc; 1817 $pos += $alloc;
1427 } 1818 }
1428 1819
1429 1 1820 1
1430} 1821}
1431 1822
1432############################################################################# 1823#############################################################################
1433 1824
1434package CFClient::UI::HBox; 1825package CFPlus::UI::HBox;
1435 1826
1436our @ISA = CFClient::UI::Box::; 1827our @ISA = CFPlus::UI::Box::;
1437 1828
1438sub new { 1829sub new {
1439 my $class = shift; 1830 my $class = shift;
1440 1831
1441 $class->SUPER::new ( 1832 $class->SUPER::new (
… …
1444 ) 1835 )
1445} 1836}
1446 1837
1447############################################################################# 1838#############################################################################
1448 1839
1449package CFClient::UI::VBox; 1840package CFPlus::UI::VBox;
1450 1841
1451our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1452 1843
1453sub new { 1844sub new {
1454 my $class = shift; 1845 my $class = shift;
1455 1846
1456 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1459 ) 1850 )
1460} 1851}
1461 1852
1462############################################################################# 1853#############################################################################
1463 1854
1464package CFClient::UI::Label; 1855package CFPlus::UI::Label;
1465 1856
1466our @ISA = CFClient::UI::DrawBG::; 1857our @ISA = CFPlus::UI::DrawBG::;
1467 1858
1468use CFClient::OpenGL; 1859use CFPlus::OpenGL;
1469 1860
1470sub new { 1861sub new {
1471 my ($class, %arg) = @_; 1862 my ($class, %arg) = @_;
1472 1863
1473 my $self = $class->SUPER::new ( 1864 my $self = $class->SUPER::new (
… …
1476 #active_bg => none 1867 #active_bg => none
1477 #font => default_font 1868 #font => default_font
1478 #text => initial text 1869 #text => initial text
1479 #markup => initial narkup 1870 #markup => initial narkup
1480 #max_w => maximum pixel width 1871 #max_w => maximum pixel width
1872 #style => 0, # render flags
1481 ellipsise => 3, # end 1873 ellipsise => 3, # end
1482 layout => (new CFClient::Layout), 1874 layout => (new CFPlus::Layout),
1483 fontsize => 1, 1875 fontsize => 1,
1484 align => -1, 1876 align => -1,
1485 valign => -1, 1877 valign => -1,
1486 padding_x => 2, 1878 padding_x => 2,
1487 padding_y => 2, 1879 padding_y => 2,
1488 can_events => 0, 1880 can_events => 0,
1489 %arg 1881 %arg
1490 ); 1882 );
1491 1883
1492 if (exists $self->{template}) { 1884 if (exists $self->{template}) {
1493 my $layout = new CFClient::Layout; 1885 my $layout = new CFPlus::Layout;
1494 $layout->set_text (delete $self->{template}); 1886 $layout->set_text (delete $self->{template});
1495 $self->{template} = $layout; 1887 $self->{template} = $layout;
1496 } 1888 }
1497 1889
1498 if (exists $self->{markup}) { 1890 if (exists $self->{markup}) {
… …
1502 } 1894 }
1503 1895
1504 $self 1896 $self
1505} 1897}
1506 1898
1507sub escape($) {
1508 local $_ = $_[0];
1509
1510 s/&/&amp;/g;
1511 s/>/&gt;/g;
1512 s/</&lt;/g;
1513
1514 $_
1515}
1516
1517sub update { 1899sub update {
1518 my ($self) = @_; 1900 my ($self) = @_;
1519 1901
1520 delete $self->{texture}; 1902 delete $self->{texture};
1521 $self->SUPER::update; 1903 $self->SUPER::update;
1522} 1904}
1523 1905
1906sub realloc {
1907 my ($self) = @_;
1908
1909 delete $self->{ox};
1910 $self->SUPER::realloc;
1911}
1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1524sub set_text { 1919sub set_text {
1525 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1526 1921
1527 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
1529 1924
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1925 $self->{layout}->set_text ($text);
1532 1926
1927 delete $self->{size_req};
1533 $self->realloc; 1928 $self->realloc;
1534 $self->update; 1929 $self->update;
1535} 1930}
1536 1931
1537sub set_markup { 1932sub set_markup {
… …
1540 return if $self->{text} eq "M$markup"; 1935 return if $self->{text} eq "M$markup";
1541 $self->{text} = "M$markup"; 1936 $self->{text} = "M$markup";
1542 1937
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1938 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1939
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1940 $self->{layout}->set_markup ($markup);
1547 1941
1942 delete $self->{size_req};
1548 $self->realloc; 1943 $self->realloc;
1549 $self->update; 1944 $self->update;
1550} 1945}
1551 1946
1552sub size_request { 1947sub size_request {
1553 my ($self) = @_; 1948 my ($self) = @_;
1554 1949
1950 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1951 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1952 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1953 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1954 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1956
1561 my ($w, $h) = $self->{layout}->size; 1957 my ($w, $h) = $self->{layout}->size;
1562 1958
1563 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1960 $self->{template}->set_font ($self->{font}) if $self->{font};
1961 $self->{template}->set_width ($self->{max_w} || -1);
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1962 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1963
1567 my ($w2, $h2) = $self->{template}->size; 1964 my ($w2, $h2) = $self->{template}->size;
1568 1965
1569 $w = List::Util::max $w, $w2; 1966 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1967 $h = List::Util::max $h, $h2;
1968 }
1969
1970 [$w, $h]
1571 } 1971 };
1572 1972
1573 ($w, $h) 1973 @{ $self->{size_req} }
1574} 1974}
1575 1975
1976sub baseline_shift {
1977 $_[0]{layout}->descent
1978}
1979
1576sub size_allocate { 1980sub invoke_size_allocate {
1577 my ($self, $w, $h) = @_; 1981 my ($self, $w, $h) = @_;
1578 1982
1579 delete $self->{ox}; 1983 delete $self->{ox};
1580 1984
1581 delete $self->{texture} 1985 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1986 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1987
1988 1
1583} 1989}
1584 1990
1585sub set_fontsize { 1991sub set_fontsize {
1586 my ($self, $fontsize) = @_; 1992 my ($self, $fontsize) = @_;
1587 1993
1588 $self->{fontsize} = $fontsize; 1994 $self->{fontsize} = $fontsize;
1995 delete $self->{size_req};
1589 delete $self->{texture}; 1996 delete $self->{texture};
1590 1997
1591 $self->realloc; 1998 $self->realloc;
1592} 1999}
1593 2000
2001sub reconfigure {
2002 my ($self) = @_;
2003
2004 delete $self->{size_req};
2005 delete $self->{texture};
2006
2007 $self->SUPER::reconfigure;
2008}
2009
1594sub _draw { 2010sub _draw {
1595 my ($self) = @_; 2011 my ($self) = @_;
1596 2012
1597 $self->SUPER::_draw; # draw background, if applicable 2013 $self->SUPER::_draw; # draw background, if applicable
1598 2014
1599 my $tex = $self->{texture} ||= do { 2015 my $size = $self->{texture} ||= do {
1600 $self->{layout}->set_foreground (@{$self->{fg}}); 2016 $self->{layout}->set_foreground (@{$self->{fg}});
1601 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2017 $self->{layout}->set_font ($self->{font}) if $self->{font};
1602 $self->{layout}->set_width ($self->{w}); 2018 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2019 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2020 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2021 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1606 2022
1607 new_from_layout CFClient::Texture $self->{layout} 2023 [$self->{layout}->size]
1608 }; 2024 };
1609 2025
1610 unless (exists $self->{ox}) { 2026 unless (exists $self->{ox}) {
1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2027 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2028 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1613 : ($self->{w} - $tex->{w}) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1614 2030
1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1618 }; 2036 };
1619 2037
1620 glEnable GL_TEXTURE_2D; 2038# unless ($self->{list}) {
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1622 2040# CFPlus::OpenGL::glNewList $self->{list};
1623 if ($tex->{format} == GL_ALPHA) { 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1624 glColor @{$self->{fg}}; 2042# CFPlus::OpenGL::glEndList;
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626 } else {
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628 } 2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
1629 2046
1630 glDisable GL_TEXTURE_2D; 2047 $self->{layout}->draw;
1631} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1632 2057
1633############################################################################# 2058#############################################################################
1634 2059
1635package CFClient::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1636 2061
1637our @ISA = CFClient::UI::Label::; 2062our @ISA = CFPlus::UI::Label::;
1638 2063
1639use CFClient::OpenGL; 2064use CFPlus::OpenGL;
1640 2065
1641sub new { 2066sub new {
1642 my $class = shift; 2067 my $class = shift;
1643 2068
1644 $class->SUPER::new ( 2069 $class->SUPER::new (
1645 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1646 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1647 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1648 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1649 can_hover => 1, 2076 can_hover => 1,
1650 can_focus => 1, 2077 can_focus => 1,
1651 valign => 0, 2078 valign => 0,
1652 can_events => 1, 2079 can_events => 1,
2080 ellipsise => 0,
1653 #text => ... 2081 #text => ...
2082 #hidden => "*",
1654 @_ 2083 @_
1655 ) 2084 )
1656} 2085}
1657 2086
1658sub _set_text { 2087sub _set_text {
… …
1660 2089
1661 delete $self->{cur_h}; 2090 delete $self->{cur_h};
1662 2091
1663 return if $self->{text} eq $text; 2092 return if $self->{text} eq $text;
1664 2093
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 2094 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 2095 $self->{text} = $text;
1669 2096
1670 $text =~ s/./*/g if $self->{hidden}; 2097 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 2098 $self->{layout}->set_text ("$text ");
2099 delete $self->{size_req};
1672 2100
1673 $self->_emit (changed => $self->{text}); 2101 $self->emit (changed => $self->{text});
2102
2103 $self->realloc;
2104 $self->update;
1674} 2105}
1675 2106
1676sub set_text { 2107sub set_text {
1677 my ($self, $text) = @_; 2108 my ($self, $text) = @_;
1678 2109
1679 $self->{cursor} = length $text; 2110 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 2111 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 2112}
1684 2113
1685sub get_text { 2114sub get_text {
1686 $_[0]{text} 2115 $_[0]{text}
1687} 2116}
… …
1692 my ($w, $h) = $self->SUPER::size_request; 2121 my ($w, $h) = $self->SUPER::size_request;
1693 2122
1694 ($w + 1, $h) # add 1 for cursor 2123 ($w + 1, $h) # add 1 for cursor
1695} 2124}
1696 2125
1697sub key_down { 2126sub invoke_key_down {
1698 my ($self, $ev) = @_; 2127 my ($self, $ev) = @_;
1699 2128
1700 my $mod = $ev->{mod}; 2129 my $mod = $ev->{mod};
1701 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1702 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1703 2132
1704 my $text = $self->get_text; 2133 my $text = $self->get_text;
2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1705 2136
1706 if ($uni == 8) { 2137 if ($uni == 8) {
1707 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1708 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1709 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1710 } elsif ($sym == CFClient::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1711 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1712 } elsif ($sym == CFClient::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1713 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1714 } elsif ($sym == CFClient::SDLK_HOME) { 2145 } elsif ($sym == CFPlus::SDLK_HOME) {
2146 # what a hack
2147 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1
2150 : 0;
2151 } elsif ($sym == CFPlus::SDLK_END) {
2152 # uh, again
2153 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2155 ? $self->{cursor} + length $1
2156 : length $self->{text};
2157 } elsif ($uni == 21) { # ctrl-u
2158 $text = "";
1715 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1716 } elsif ($sym == CFClient::SDLK_END) {
1717 $self->{cursor} = length $text;
1718 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1719 $self->_emit ('escape'); 2161 $self->emit ('escape');
1720 } elsif ($uni) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1721 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else { 2166 } else {
1723 return 0; 2167 return 0;
1724 } 2168 }
1725 2169
1726 $self->_set_text ($text); 2170 $self->_set_text ($text);
1727 2171
1728 $self->realloc; 2172 $self->realloc;
2173 $self->update;
1729 2174
1730 1 2175 1
1731} 2176}
1732 2177
1733sub focus_in { 2178sub invoke_focus_in {
1734 my ($self) = @_; 2179 my ($self) = @_;
1735 2180
1736 $self->{last_activity} = $::NOW; 2181 $self->{last_activity} = $::NOW;
1737 2182
1738 $self->SUPER::focus_in; 2183 $self->SUPER::invoke_focus_in
1739} 2184}
1740 2185
1741sub button_down { 2186sub invoke_button_down {
1742 my ($self, $ev, $x, $y) = @_; 2187 my ($self, $ev, $x, $y) = @_;
1743 2188
1744 $self->SUPER::button_down ($ev, $x, $y); 2189 $self->SUPER::invoke_button_down ($ev, $x, $y);
1745 2190
1746 my $idx = $self->{layout}->xy_to_index ($x, $y); 2191 my $idx = $self->{layout}->xy_to_index ($x, $y);
1747 2192
1748 # byte-index to char-index 2193 # byte-index to char-index
1749 my $text = $self->{text}; 2194 my $text = $self->{text};
1750 utf8::encode $text; 2195 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1751 $self->{cursor} = length substr $text, 0, $idx; 2196 $self->{cursor} = length $text;
1752 2197
1753 $self->_set_text ($self->{text}); 2198 $self->_set_text ($self->{text});
1754 $self->update; 2199 $self->update;
1755 2200
1756 1 2201 1
1757} 2202}
1758 2203
1759sub mouse_motion { 2204sub invoke_mouse_motion {
1760 my ($self, $ev, $x, $y) = @_; 2205 my ($self, $ev, $x, $y) = @_;
1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2206# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762 2207
1763 0 2208 1
1764} 2209}
1765 2210
1766sub _draw { 2211sub _draw {
1767 my ($self) = @_; 2212 my ($self) = @_;
1768 2213
1769 local $self->{fg} = $self->{fg}; 2214 local $self->{fg} = $self->{fg};
1770 2215
1771 if ($FOCUS == $self) { 2216 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 2217 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 2218 $self->{fg} = $self->{active_fg};
1774 } else { 2219 } else {
1775 glColor @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
1776 } 2221 }
1777 2222
1778 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS;
1781 glVertex 0 , 0;
1782 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0;
1785 glEnd;
1786 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
1787 2227
1788 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1789 2229
1790 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
1792 2232
1793 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
1794 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
1795 utf8::encode $text; 2235 utf8::encode $text;
1796 2236
1797 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1798 } 2238 }
1799 2239
1800 glColor @{$self->{fg}}; 2240 glColor_premultiply @{$self->{active_fg}};
1801 glBegin GL_LINES; 2241 glBegin GL_LINES;
1802 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 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}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1804 glEnd; 2244 glEnd;
1805 }
1806}
1807 2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2259 glEnd;
2260 }
2261}
2262
2263#############################################################################
2264
1808package CFClient::UI::Entry; 2265package CFPlus::UI::Entry;
1809 2266
1810our @ISA = CFClient::UI::EntryBase::; 2267our @ISA = CFPlus::UI::EntryBase::;
1811 2268
1812use CFClient::OpenGL; 2269use CFPlus::OpenGL;
1813 2270
1814sub key_down { 2271sub invoke_key_down {
1815 my ($self, $ev) = @_; 2272 my ($self, $ev) = @_;
1816 2273
1817 my $sym = $ev->{sym}; 2274 my $sym = $ev->{sym};
1818 2275
1819 if ($sym == 13) { 2276 if ($ev->{uni} == 0x0d || $sym == 13) {
1820 unshift @{$self->{history}}, 2277 unshift @{$self->{history}},
1821 my $txt = $self->get_text; 2278 my $txt = $self->get_text;
2279
1822 $self->{history_pointer} = -1; 2280 $self->{history_pointer} = -1;
1823 $self->{history_saveback} = ''; 2281 $self->{history_saveback} = '';
1824 $self->_emit (activate => $txt); 2282 $self->emit (activate => $txt);
1825 $self->update; 2283 $self->update;
1826 2284
1827 } elsif ($sym == CFClient::SDLK_UP) { 2285 } elsif ($sym == CFPlus::SDLK_UP) {
1828 if ($self->{history_pointer} < 0) { 2286 if ($self->{history_pointer} < 0) {
1829 $self->{history_saveback} = $self->get_text; 2287 $self->{history_saveback} = $self->get_text;
1830 } 2288 }
1831 if (@{$self->{history} || []} > 0) { 2289 if (@{$self->{history} || []} > 0) {
1832 $self->{history_pointer}++; 2290 $self->{history_pointer}++;
… …
1834 $self->{history_pointer} = @{$self->{history} || []} - 1; 2292 $self->{history_pointer} = @{$self->{history} || []} - 1;
1835 } 2293 }
1836 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2294 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1837 } 2295 }
1838 2296
1839 } elsif ($sym == CFClient::SDLK_DOWN) { 2297 } elsif ($sym == CFPlus::SDLK_DOWN) {
1840 $self->{history_pointer}--; 2298 $self->{history_pointer}--;
1841 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2299 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1842 2300
1843 if ($self->{history_pointer} >= 0) { 2301 if ($self->{history_pointer} >= 0) {
1844 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1845 } else { 2303 } else {
1846 $self->set_text ($self->{history_saveback}); 2304 $self->set_text ($self->{history_saveback});
1847 } 2305 }
1848 2306
1849 } else { 2307 } else {
1850 return $self->SUPER::key_down ($ev) 2308 return $self->SUPER::invoke_key_down ($ev)
1851 } 2309 }
1852 2310
1853 1 2311 1
1854} 2312}
1855 2313
1856############################################################################# 2314#############################################################################
1857 2315
2316package CFPlus::UI::TextEdit;
2317
2318our @ISA = CFPlus::UI::EntryBase::;
2319
2320use CFPlus::OpenGL;
2321
2322sub move_cursor_ver {
2323 my ($self, $dy) = @_;
2324
2325 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2326
2327 $y += $dy;
2328
2329 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2330 $self->{cursor} = $index;
2331 delete $self->{cur_h};
2332 $self->update;
2333 return;
2334 }
2335}
2336
2337sub invoke_key_down {
2338 my ($self, $ev) = @_;
2339
2340 my $sym = $ev->{sym};
2341
2342 if ($sym == CFPlus::SDLK_UP) {
2343 $self->move_cursor_ver (-1);
2344 } elsif ($sym == CFPlus::SDLK_DOWN) {
2345 $self->move_cursor_ver (+1);
2346 } else {
2347 return $self->SUPER::invoke_key_down ($ev)
2348 }
2349
2350 1
2351}
2352
2353#############################################################################
2354
1858package CFClient::UI::Button; 2355package CFPlus::UI::ButtonBin;
1859 2356
1860our @ISA = CFClient::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
1861 2358
1862use CFClient::OpenGL; 2359use CFPlus::OpenGL;
1863 2360
1864my @tex = 2361my @tex =
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
1867 2364
1868sub new { 2365sub new {
1869 my $class = shift; 2366 my $class = shift;
1870 2367
1871 $class->SUPER::new ( 2368 $class->SUPER::new (
1872 padding_x => 4,
1873 padding_y => 4,
1874 fg => [1, 1, 1],
1875 active_fg => [0, 0, 1],
1876 can_hover => 1, 2369 can_hover => 1,
1877 align => 0, 2370 align => 0,
1878 valign => 0, 2371 valign => 0,
1879 can_events => 1, 2372 can_events => 1,
1880 @_ 2373 @_
1881 ) 2374 )
1882} 2375}
1883 2376
1884sub activate { }
1885
1886sub button_up { 2377sub invoke_button_up {
1887 my ($self, $ev, $x, $y) = @_; 2378 my ($self, $ev, $x, $y) = @_;
1888 2379
1889 $self->emit ("activate") 2380 $self->emit ("activate")
1890 if $x >= 0 && $x < $self->{w} 2381 if $x >= 0 && $x < $self->{w}
1891 && $y >= 0 && $y < $self->{h}; 2382 && $y >= 0 && $y < $self->{h};
… …
1894} 2385}
1895 2386
1896sub _draw { 2387sub _draw {
1897 my ($self) = @_; 2388 my ($self) = @_;
1898 2389
1899 local $self->{fg} = $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904
1905 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1908 2393
2394 my $tex = $tex[$GRAB == $self];
1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1910 2396
1911 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
1912 2398
1913 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
1914} 2400}
1915 2401
1916############################################################################# 2402#############################################################################
1917 2403
1918package CFClient::UI::CheckBox; 2404package CFPlus::UI::Button;
1919 2405
1920our @ISA = CFClient::UI::DrawBG::; 2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
1921 2409
1922my @tex = 2410my @tex =
1923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2451
2452 glDisable GL_TEXTURE_2D;
2453
2454 $self->SUPER::_draw;
2455}
2456
2457#############################################################################
2458
2459package CFPlus::UI::CheckBox;
2460
2461our @ISA = CFPlus::UI::DrawBG::;
2462
2463my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1924 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1925 2466
1926use CFClient::OpenGL; 2467use CFPlus::OpenGL;
1927 2468
1928sub new { 2469sub new {
1929 my $class = shift; 2470 my $class = shift;
1930 2471
1931 $class->SUPER::new ( 2472 $class->SUPER::new (
… …
1945 my ($self) = @_; 2486 my ($self) = @_;
1946 2487
1947 (6) x 2 2488 (6) x 2
1948} 2489}
1949 2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
1950sub button_down { 2499sub invoke_button_down {
1951 my ($self, $ev, $x, $y) = @_; 2500 my ($self, $ev, $x, $y) = @_;
1952 2501
1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1955 $self->{state} = !$self->{state}; 2504 $self->toggle;
1956 $self->_emit (changed => $self->{state});
1957 } else { 2505 } else {
1958 return 0 2506 return 0
1959 } 2507 }
1960 2508
1961 1 2509 1
… …
1981 glDisable GL_TEXTURE_2D; 2529 glDisable GL_TEXTURE_2D;
1982} 2530}
1983 2531
1984############################################################################# 2532#############################################################################
1985 2533
1986package CFClient::UI::Image; 2534package CFPlus::UI::Image;
1987 2535
1988our @ISA = CFClient::UI::Base::; 2536our @ISA = CFPlus::UI::Base::;
1989 2537
1990use CFClient::OpenGL; 2538use CFPlus::OpenGL;
1991use Carp qw/confess/;
1992 2539
1993our %loaded_images; 2540our %texture_cache;
1994 2541
1995sub new { 2542sub new {
1996 my $class = shift; 2543 my $class = shift;
1997 2544
1998 my $self = $class->SUPER::new (can_events => 0, @_); 2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 scale => 1,
2548 @_,
2549 );
1999 2550
2000 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2551 $self->{path} || $self->{tex}
2552 or Carp::croak "'path' or 'tex' attributes required";
2001 2553
2002 $loaded_images{$self->{image}} ||= 2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2003 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2004 2556
2005 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2557 CFPlus::weaken $texture_cache{$self->{path}};
2006 2558
2007 Scalar::Util::weaken $loaded_images{$self->{image}}; 2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2008
2009 $self->{aspect} = $tex->{w} / $tex->{h};
2010 2560
2011 $self 2561 $self
2012} 2562}
2013 2563
2564sub STORABLE_freeze {
2565 my ($self, $cloning) = @_;
2566
2567 $self->{path}
2568 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2569
2570 $self->{path}
2571}
2572
2573sub STORABLE_attach {
2574 my ($self, $cloning, $path) = @_;
2575
2576 $self->new (path => $path)
2577}
2578
2014sub size_request { 2579sub size_request {
2015 my ($self) = @_; 2580 my ($self) = @_;
2016 2581
2017 ($self->{tex}->{w}, $self->{tex}->{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2018} 2583}
2019 2584
2020sub _draw { 2585sub _draw {
2021 my ($self) = @_; 2586 my ($self) = @_;
2022 2587
… …
2039 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2040} 2605}
2041 2606
2042############################################################################# 2607#############################################################################
2043 2608
2609package CFPlus::UI::ImageButton;
2610
2611our @ISA = CFPlus::UI::Image::;
2612
2613use CFPlus::OpenGL;
2614
2615my %textures;
2616
2617sub new {
2618 my $class = shift;
2619
2620 my $self = $class->SUPER::new (
2621 padding_x => 4,
2622 padding_y => 4,
2623 fg => [1, 1, 1],
2624 active_fg => [0, 0, 1],
2625 can_hover => 1,
2626 align => 0,
2627 valign => 0,
2628 can_events => 1,
2629 @_
2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2637}
2638
2639sub invoke_button_up {
2640 my ($self, $ev, $x, $y) = @_;
2641
2642 $self->emit ("activate")
2643 if $x >= 0 && $x < $self->{w}
2644 && $y >= 0 && $y < $self->{h};
2645
2646 1
2647}
2648
2649#############################################################################
2650
2044package CFClient::UI::VGauge; 2651package CFPlus::UI::VGauge;
2045 2652
2046our @ISA = CFClient::UI::Base::; 2653our @ISA = CFPlus::UI::Base::;
2047 2654
2048use List::Util qw(min max); 2655use List::Util qw(min max);
2049 2656
2050use CFClient::OpenGL; 2657use CFPlus::OpenGL;
2051 2658
2052my %tex = ( 2659my %tex = (
2053 food => [ 2660 food => [
2054 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2055 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2662 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2056 ], 2663 ],
2057 grace => [ 2664 grace => [
2058 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 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/ 2666 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2060 ], 2667 ],
2061 hp => [ 2668 hp => [
2062 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2063 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2670 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2064 ], 2671 ],
2065 mana => [ 2672 mana => [
2066 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2673 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/ 2674 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2068 ], 2675 ],
2069); 2676);
2070 2677
2071# eg. VGauge->new (gauge => 'food'), default gauge: food 2678# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2131 my $ycut1 = max 0, min 1, $ycut; 2738 my $ycut1 = max 0, min 1, $ycut;
2132 my $ycut2 = max 0, min 1, $ycut - 1; 2739 my $ycut2 = max 0, min 1, $ycut - 1;
2133 2740
2134 my $h1 = $self->{h} * (1 - $ycut1); 2741 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2742 my $h2 = $self->{h} * (1 - $ycut2);
2743 my $h3 = $self->{h};
2744
2745 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2136 2746
2137 glEnable GL_BLEND; 2747 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2748 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2749 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2752
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2753 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2754 glBegin GL_QUADS;
… …
2158 2769
2159 if ($t3) { 2770 if ($t3) {
2160 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2771 glBindTexture GL_TEXTURE_2D, $t3->{name};
2161 glBegin GL_QUADS; 2772 glBegin GL_QUADS;
2162 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2773 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2163 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2774 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2164 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2775 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2165 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2776 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2166 glEnd; 2777 glEnd;
2167 } 2778 }
2168 2779
2169 glDisable GL_BLEND; 2780 glDisable GL_BLEND;
2170 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2171} 2782}
2172 2783
2173############################################################################# 2784#############################################################################
2174 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 %arg,
2806 );
2807
2808 $self->set_value ($arg{value} || -1);
2809
2810 $self
2811}
2812
2813sub set_value {
2814 my ($self, $value) = @_;
2815
2816 if ($self->{value} != $value) {
2817 $self->{value} = $value;
2818
2819 if ($value < 0) {
2820 $self->set_text ("-");
2821 } else {
2822 $self->set_text (sprintf "%d%%", $value * 100);
2823 }
2824 $self->update;
2825 }
2826}
2827
2828sub _draw {
2829 my ($self) = @_;
2830
2831 glEnable GL_BLEND;
2832 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2833
2834 if ($self->{value} >= 0) {
2835 my $s = 3 + ($self->{w} - 6) * $self->{value};
2836
2837 glColor_premultiply @{$self->{bar}};
2838 glRect 2, 2, $s, $self->{h} - 2;
2839 glColor_premultiply @{$self->{bg}};
2840 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2841 }
2842
2843 glColor_premultiply @{$self->{outline}};
2844 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2845
2846 glDisable GL_BLEND;
2847
2848 {
2849 local $self->{bg}; # do not draw background
2850 $self->SUPER::_draw;
2851 }
2852}
2853
2854#############################################################################
2855
2856package CFPlus::UI::ExperienceProgress;
2857
2858our @ISA = CFPlus::UI::Progress::;
2859
2860sub new {
2861 my ($class, %arg) = @_;
2862
2863 my $self = $class->SUPER::new (
2864 %arg
2865 );
2866
2867 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2868 if $::CONN;
2869
2870 $self
2871}
2872
2873sub DESTROY {
2874 my ($self) = @_;
2875
2876 delete $::CONN->{on_exp_update}{$self+0}
2877 if $::CONN;
2878
2879 $self->SUPER::DESTROY;
2880}
2881
2882sub set_value {
2883 my ($self, $lvl, $exp) = @_;
2884
2885 my $v = -1;
2886
2887 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2888 my $l0 = $table->[$lvl - 1];
2889 my $l1 = $table->[$lvl];
2890
2891 $v = ($exp - $l0) / ($l1 - $l0);
2892 }
2893
2894 $self->SUPER::set_value ($v);
2895}
2896
2897#############################################################################
2898
2175package CFClient::UI::Gauge; 2899package CFPlus::UI::Gauge;
2176 2900
2177our @ISA = CFClient::UI::VBox::; 2901our @ISA = CFPlus::UI::VBox::;
2178 2902
2179sub new { 2903sub new {
2180 my ($class, %arg) = @_; 2904 my ($class, %arg) = @_;
2181 2905
2182 my $self = $class->SUPER::new ( 2906 my $self = $class->SUPER::new (
… …
2184 can_hover => 1, 2908 can_hover => 1,
2185 can_events => 1, 2909 can_events => 1,
2186 %arg, 2910 %arg,
2187 ); 2911 );
2188 2912
2189 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2913 $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); 2914 $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"); 2915 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2192 2916
2193 $self 2917 $self
2194} 2918}
2195 2919
2196sub set_fontsize { 2920sub set_fontsize {
… …
2217 $self->{value}->set_text ($val); 2941 $self->{value}->set_text ($val);
2218} 2942}
2219 2943
2220############################################################################# 2944#############################################################################
2221 2945
2222package CFClient::UI::Slider; 2946package CFPlus::UI::Slider;
2223 2947
2224use strict; 2948use strict;
2225 2949
2226use CFClient::OpenGL; 2950use CFPlus::OpenGL;
2227 2951
2228our @ISA = CFClient::UI::DrawBG::; 2952our @ISA = CFPlus::UI::DrawBG::;
2229 2953
2230my @tex = 2954my @tex =
2231 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2955 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2232 qw(s1_slider.png s1_slider_bg.png); 2956 qw(s1_slider.png s1_slider_bg.png);
2233 2957
2234sub new { 2958sub new {
2235 my $class = shift; 2959 my $class = shift;
2236 2960
… …
2257 $self->update; 2981 $self->update;
2258 2982
2259 $self 2983 $self
2260} 2984}
2261 2985
2262sub changed { }
2263
2264sub set_range { 2986sub set_range {
2265 my ($self, $range) = @_; 2987 my ($self, $range) = @_;
2266 2988
2267 ($range, $self->{range}) = ($self->{range}, $range); 2989 ($range, $self->{range}) = ($self->{range}, $range);
2268 2990
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2991 if ("@$range" ne "@{$self->{range}}") {
2992 $self->update;
2993 $self->set_value ($self->{range}[0]);
2994 }
2271} 2995}
2272 2996
2273sub set_value { 2997sub set_value {
2274 my ($self, $value) = @_; 2998 my ($self, $value) = @_;
2275 2999
… …
2286 if $unit; 3010 if $unit;
2287 3011
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3012 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289 3013
2290 if ($value != $old_value) { 3014 if ($value != $old_value) {
2291 $self->_emit (changed => $value); 3015 $self->emit (changed => $value);
2292 $self->update; 3016 $self->update;
2293 } 3017 }
2294} 3018}
2295 3019
2296sub size_request { 3020sub size_request {
2297 my ($self) = @_; 3021 my ($self) = @_;
2298 3022
2299 ($self->{req_w}, $self->{req_h}) 3023 ($self->{req_w}, $self->{req_h})
2300} 3024}
2301 3025
2302sub button_down { 3026sub invoke_button_down {
2303 my ($self, $ev, $x, $y) = @_; 3027 my ($self, $ev, $x, $y) = @_;
2304 3028
2305 $self->SUPER::button_down ($ev, $x, $y); 3029 $self->SUPER::invoke_button_down ($ev, $x, $y);
2306 3030
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3031 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308 3032
2309 $self->mouse_motion ($ev, $x, $y) 3033 $self->invoke_mouse_motion ($ev, $x, $y);
2310}
2311 3034
3035 1
3036}
3037
2312sub mouse_motion { 3038sub invoke_mouse_motion {
2313 my ($self, $ev, $x, $y) = @_; 3039 my ($self, $ev, $x, $y) = @_;
2314 3040
2315 if ($GRAB == $self) { 3041 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3042 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317 3043
… …
2325 } 3051 }
2326 3052
2327 1 3053 1
2328} 3054}
2329 3055
3056sub invoke_mouse_wheel {
3057 my ($self, $ev) = @_;
3058
3059 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3060
3061 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3062
3063 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3064
3065 1
3066}
3067
2330sub update { 3068sub update {
2331 my ($self) = @_; 3069 my ($self) = @_;
2332 3070
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 3071 delete $self->{knob_w};
3072 $self->SUPER::update;
3073}
3074
3075sub _draw {
3076 my ($self) = @_;
3077
3078 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 3079 $self->set_value ($self->{range}[0]);
2335 3080
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3081 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 3082 my $range = ($hi - $page - $lo) || 1e-100;
2338 3083
… …
2344 $value = ($value - $lo) / $range; 3089 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 3090 $value = $value * $self->{scale} + $self->{offset};
2346 3091
2347 $self->{knob_x} = $value - $knob_w * 0.5; 3092 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 3093 $self->{knob_w} = $knob_w;
2349 }); 3094 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 3095
2357 $self->SUPER::_draw (); 3096 $self->SUPER::_draw ();
2358 3097
2359 glScale $self->{w}, $self->{h}; 3098 glScale $self->{w}, $self->{h};
2360 3099
… …
2380 glDisable GL_TEXTURE_2D; 3119 glDisable GL_TEXTURE_2D;
2381} 3120}
2382 3121
2383############################################################################# 3122#############################################################################
2384 3123
2385package CFClient::UI::ValSlider; 3124package CFPlus::UI::ValSlider;
2386 3125
2387our @ISA = CFClient::UI::HBox::; 3126our @ISA = CFPlus::UI::HBox::;
2388 3127
2389sub new { 3128sub new {
2390 my ($class, %arg) = @_; 3129 my ($class, %arg) = @_;
2391 3130
2392 my $range = delete $arg{range}; 3131 my $range = delete $arg{range};
2393 3132
2394 my $self = $class->SUPER::new ( 3133 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3134 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3135 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift }, 3136 to_value => sub { shift },
2398 from_value => sub { shift }, 3137 from_value => sub { shift },
2399 %arg, 3138 %arg,
2400 ); 3139 );
2401 3140
… …
2421sub set_range { shift->{slider}->set_range (@_) } 3160sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 3161sub set_value { shift->{slider}->set_value (@_) }
2423 3162
2424############################################################################# 3163#############################################################################
2425 3164
2426package CFClient::UI::TextView; 3165package CFPlus::UI::TextScroller;
2427 3166
2428our @ISA = CFClient::UI::HBox::; 3167our @ISA = CFPlus::UI::HBox::;
2429 3168
2430use CFClient::OpenGL; 3169use CFPlus::OpenGL;
2431 3170
2432sub new { 3171sub new {
2433 my $class = shift; 3172 my $class = shift;
2434 3173
2435 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2436 fontsize => 1, 3175 fontsize => 1,
2437 can_events => 0, 3176 can_events => 1,
3177 indent => 0,
2438 #font => default_font 3178 #font => default_font
2439 @_, 3179 @_,
2440 3180
2441 layout => (new CFClient::Layout 1), 3181 layout => (new CFPlus::Layout),
2442 par => [], 3182 par => [],
3183 max_par => 0,
2443 height => 0, 3184 height => 0,
2444 children => [ 3185 children => [
2445 (new CFClient::UI::Empty expand => 1), 3186 (new CFPlus::UI::Empty expand => 1),
2446 (new CFClient::UI::Slider vertical => 1), 3187 (new CFPlus::UI::Slider vertical => 1),
2447 ], 3188 ],
2448 ); 3189 );
2449 3190
2450 $self->{children}[1]->connect (changed => sub { $self->update }); 3191 $self->{children}[1]->connect (changed => sub { $self->update });
2451 3192
… …
2457 3198
2458 $self->{fontsize} = $fontsize; 3199 $self->{fontsize} = $fontsize;
2459 $self->reflow; 3200 $self->reflow;
2460} 3201}
2461 3202
3203sub size_request {
3204 my ($self) = @_;
3205
3206 my ($empty, $slider) = $self->visible_children;
3207
3208 local $self->{children} = [$empty, $slider];
3209 $self->SUPER::size_request
3210}
3211
2462sub size_allocate { 3212sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 3213 my ($self, $w, $h) = @_;
2464 3214
2465 $self->SUPER::size_allocate ($w, $h); 3215 my ($empty, $slider, @other) = @{ $self->{children} };
3216 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2466 3217
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3218 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 3220 $self->{layout}->set_width ($empty->{w});
3221 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 3222
2471 $self->reflow; 3223 $self->reflow;
2472}
2473 3224
2474sub text_size { 3225 local $self->{children} = [$empty, $slider];
3226 $self->SUPER::invoke_size_allocate ($w, $h)
3227}
3228
3229sub invoke_mouse_wheel {
2475 my ($self, $text, $indent) = @_; 3230 my ($self, $ev) = @_;
3231
3232 return 0 unless $ev->{dy}; # only vertical movements
3233
3234 $self->{children}[1]->emit (mouse_wheel => $ev);
3235
3236 1
3237}
3238
3239sub get_layout {
3240 my ($self, $para) = @_;
2476 3241
2477 my $layout = $self->{layout}; 3242 my $layout = $self->{layout};
2478 3243
3244 $layout->set_font ($self->{font}) if $self->{font};
3245 $layout->set_foreground (@{$para->{fg}});
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3246 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 3247 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3248 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 3249 $layout->set_markup ($para->{markup});
3250
3251 $layout->set_shapes (
3252 map
3253 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3254 @{$para->{widget}}
2482 3255 );
3256
2483 $layout->size 3257 $layout
2484} 3258}
2485 3259
2486sub reflow { 3260sub reflow {
2487 my ($self) = @_; 3261 my ($self) = @_;
2488 3262
… …
2495 3269
2496 # todo: base offset on lines or so, not on pixels 3270 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset); 3271 $self->{children}[1]->set_value ($offset);
2498} 3272}
2499 3273
3274sub current_paragraph {
3275 my ($self) = @_;
3276
3277 $self->{top_paragraph} - 1
3278}
3279
3280sub scroll_to {
3281 my ($self, $para) = @_;
3282
3283 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3284
3285 $self->{scroll_to} = $para;
3286 $self->update;
3287}
3288
2500sub clear { 3289sub clear {
2501 my ($self) = @_; 3290 my ($self) = @_;
3291
3292 my (undef, undef, @other) = @{ $self->{children} };
3293 $self->remove ($_) for @other;
2502 3294
2503 $self->{par} = []; 3295 $self->{par} = [];
2504 $self->{height} = 0; 3296 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3297 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506} 3298}
2507 3299
2508sub add_paragraph { 3300sub add_paragraph {
2509 my ($self, $color, $text, $indent) = @_; 3301 my $self = shift;
2510 3302
2511 for my $line (split /\n/, $text) { 3303 for my $para (@_) {
2512 my ($w, $h) = $self->text_size ($line); 3304 $para = {
3305 fg => [1, 1, 1, 1],
3306 indent => 0,
3307 markup => "",
3308 widget => [],
3309 ref $para ? %$para : (markup => $para),
3310 w => 1e10,
3311 wrapped => 1,
3312 };
3313
3314 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3315 push @{$self->{par}}, $para;
3316 }
3317
3318 if (my $max = $self->{max_par}) {
3319 shift @{$self->{par}} while @{$self->{par}} > $max;
3320 }
3321
3322 $self->{need_reflow}++;
3323 $self->update;
3324}
3325
3326sub scroll_to_bottom {
3327 my ($self) = @_;
3328
3329 $self->{scroll_to} = $#{$self->{par}};
3330 $self->update;
3331}
3332
3333sub force_uptodate {
3334 my ($self) = @_;
3335
3336 if (delete $self->{need_reflow}) {
3337 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3338
3339 my $height = 0;
3340
3341 for my $para (@{$self->{par}}) {
3342 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3343 my $layout = $self->get_layout ($para);
3344 my ($w, $h) = $layout->size;
3345
3346 $para->{w} = $w + $para->{indent};
3347 $para->{h} = $h;
3348 $para->{wrapped} = $layout->has_wrapped;
3349 }
3350
3351 $para->{y} = $height;
3352 $height += $para->{h};
3353 }
3354
2513 $self->{height} += $h; 3355 $self->{height} = $height;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3356 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2515 }
2516 3357
2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3358 delete $self->{texture};
3359 }
3360
3361 if (my $paridx = delete $self->{scroll_to}) {
3362 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3363 }
2518} 3364}
2519 3365
2520sub update { 3366sub update {
2521 my ($self) = @_; 3367 my ($self) = @_;
2522 3368
… …
2524 3370
2525 return unless $self->{h} > 0; 3371 return unless $self->{h} > 0;
2526 3372
2527 delete $self->{texture}; 3373 delete $self->{texture};
2528 3374
2529 $ROOT->on_post_alloc ($self, sub { 3375 $ROOT->on_post_alloc ($self => sub {
3376 $self->force_uptodate;
3377
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3378 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 3379
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 { 3380 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 3381 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 3382 glClear GL_COLOR_BUFFER_BIT;
2561 3383
3384 package CFPlus::UI::Base;
3385 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3386 (0, 0, $self->{w}, $self->{h});
3387
3388 my $top = int $self->{children}[1]{range}[0];
3389
3390 my $paridx = 0;
3391 my $top_paragraph;
2562 my $top = int $self->{children}[1]{range}[0]; 3392 my $top = int $self->{children}[1]{range}[0];
2563 3393
2564 my $y0 = $top; 3394 my $y0 = $top;
2565 my $y1 = $top + $H; 3395 my $y1 = $top + $H;
2566 3396
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}}) { 3397 for my $para (@{$self->{par}}) {
2578 my $h = $par->[1]; 3398 my $h = $para->{h};
3399 my $y = $para->{y};
2579 3400
2580 if ($y0 < $y + $h && $y < $y1) { 3401 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 3402 my $layout = $self->get_layout ($para);
2582 $layout->set_width ($W - $par->[3]);
2583 $layout->set_markup ($par->[4]);
2584 3403
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3404 $layout->render ($para->{indent}, $y - $y0);
3405 $layout->draw;
2586 3406
2587 glRasterPos $par->[3], $y - $y0; 3407 if (my @w = @{ $para->{widget} }) {
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3408 my @s = $layout->get_shapes;
3409
3410 for (@w) {
3411 my ($dx, $dy) = splice @s, 0, 2, ();
3412
3413 $_->{x} = $dx + $para->{indent};
3414 $_->{y} = $dy + $y - $y0;
3415
3416 $_->draw;
3417 }
3418 }
2589 } 3419 }
2590 3420
2591 $y += $h; 3421 $paridx++;
3422 $top_paragraph ||= $paridx if $y >= $top;
2592 } 3423 }
2593 3424
2594 glDisable GL_BLEND; 3425 $self->{top_paragraph} = $top_paragraph;
2595 }; 3426 };
2596 }); 3427 });
2597} 3428}
2598 3429
3430sub reconfigure {
3431 my ($self) = @_;
3432
3433 $self->SUPER::reconfigure;
3434
3435 $_->{w} = 1e10 for @{ $self->{par} };
3436 $self->reflow;
3437}
3438
2599sub _draw { 3439sub _draw {
2600 my ($self) = @_; 3440 my ($self) = @_;
2601 3441
2602 glEnable GL_TEXTURE_2D; 3442 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 3444 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3445 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 3446 glDisable GL_TEXTURE_2D;
2607 3447
2608 $self->{children}[1]->draw; 3448 $self->{children}[1]->draw;
2609
2610} 3449}
2611 3450
2612############################################################################# 3451#############################################################################
2613 3452
2614package CFClient::UI::Animator; 3453package CFPlus::UI::Animator;
2615 3454
2616use CFClient::OpenGL; 3455use CFPlus::OpenGL;
2617 3456
2618our @ISA = CFClient::UI::Bin::; 3457our @ISA = CFPlus::UI::Bin::;
2619 3458
2620sub moveto { 3459sub moveto {
2621 my ($self, $x, $y) = @_; 3460 my ($self, $x, $y) = @_;
2622 3461
2623 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3462 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2651 glPopMatrix; 3490 glPopMatrix;
2652} 3491}
2653 3492
2654############################################################################# 3493#############################################################################
2655 3494
2656package CFClient::UI::Flopper; 3495package CFPlus::UI::Flopper;
2657 3496
2658our @ISA = CFClient::UI::Button::; 3497our @ISA = CFPlus::UI::Button::;
2659 3498
2660sub new { 3499sub new {
2661 my $class = shift; 3500 my $class = shift;
2662 3501
2663 my $self = $class->SUPER::new ( 3502 my $self = $class->SUPER::new (
… …
2675 $self->{other}->toggle_visibility; 3514 $self->{other}->toggle_visibility;
2676} 3515}
2677 3516
2678############################################################################# 3517#############################################################################
2679 3518
2680package CFClient::UI::Tooltip; 3519package CFPlus::UI::Tooltip;
2681 3520
2682our @ISA = CFClient::UI::Bin::; 3521our @ISA = CFPlus::UI::Bin::;
2683 3522
2684use CFClient::OpenGL; 3523use CFPlus::OpenGL;
2685 3524
2686sub new { 3525sub new {
2687 my $class = shift; 3526 my $class = shift;
2688 3527
2689 $class->SUPER::new ( 3528 $class->SUPER::new (
… …
2692 ) 3531 )
2693} 3532}
2694 3533
2695sub set_tooltip_from { 3534sub set_tooltip_from {
2696 my ($self, $widget) = @_; 3535 my ($self, $widget) = @_;
3536
3537 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3538 if $widget->{tooltip} =~ /^#(.*)$/;
2697 3539
2698 my $tooltip = $widget->{tooltip}; 3540 my $tooltip = $widget->{tooltip};
2699 3541
2700 if ($ENV{CFPLUS_DEBUG} & 2) { 3542 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n" 3543 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3544 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n" 3545 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}"; 3546 . "visible $widget->{visible}";
2705 } 3547 }
2706 3548
3549 $tooltip =~ s/^\n+//;
3550 $tooltip =~ s/\n+$//;
3551
2707 $self->add (new CFClient::UI::Label 3552 $self->add (new CFPlus::UI::Label
2708 markup => $tooltip, 3553 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3554 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8, 3555 fontsize => 0.8,
2711 fg => [0, 0, 0, 1], 3556 style => 1, # FLAG_INVERSE
2712 ellipsise => 0, 3557 ellipsise => 0,
2713 font => ($widget->{tooltip_font} || $::FONT_PROP), 3558 font => ($widget->{tooltip_font} || $::FONT_PROP),
2714 ); 3559 );
2715} 3560}
2716 3561
… …
2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3565 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2721 3566
2722 ($w + 4, $h + 4) 3567 ($w + 4, $h + 4)
2723} 3568}
2724 3569
2725sub size_allocate { 3570sub invoke_size_allocate {
2726 my ($self, $w, $h) = @_; 3571 my ($self, $w, $h) = @_;
2727 3572
2728 $self->SUPER::size_allocate ($w - 4, $h - 4); 3573 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2729} 3574}
2730 3575
2731sub visibility_change { 3576sub invoke_visibility_change {
2732 my ($self, $visible) = @_; 3577 my ($self, $visible) = @_;
2733 3578
2734 return unless $visible; 3579 return unless $visible;
2735 3580
2736 $self->{root}->on_post_alloc ("move_$self" => sub { 3581 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner} 3582 my $widget = $self->{owner}
2738 or return; 3583 or return;
2739 3584
3585 if ($widget->{visible}) {
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3586 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 3587
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3588 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 3589 if $x + $self->{w} > $self->{root}{w};
2744 3590
2745 $self->move_abs ($x, $y); 3591 $self->move_abs ($x, $y);
3592 } else {
3593 $self->hide;
3594 }
2746 }); 3595 });
2747} 3596}
2748 3597
2749sub _draw { 3598sub _draw {
2750 my ($self) = @_; 3599 my ($self) = @_;
… …
2752 glTranslate 0.375, 0.375; 3601 glTranslate 0.375, 0.375;
2753 3602
2754 my ($w, $h) = @$self{qw(w h)}; 3603 my ($w, $h) = @$self{qw(w h)};
2755 3604
2756 glColor 1, 0.8, 0.4; 3605 glColor 1, 0.8, 0.4;
2757 glBegin GL_QUADS; 3606 glRect 0, 0, $w, $h;
2758 glVertex 0 , 0;
2759 glVertex 0 , $h;
2760 glVertex $w, $h;
2761 glVertex $w, 0;
2762 glEnd;
2763 3607
2764 glColor 0, 0, 0; 3608 glColor 0, 0, 0;
2765 glBegin GL_LINE_LOOP; 3609 glRect_lineloop 0, 0, $w, $h;
2766 glVertex 0 , 0;
2767 glVertex 0 , $h;
2768 glVertex $w, $h;
2769 glVertex $w, 0;
2770 glEnd;
2771 3610
2772 glTranslate 2 - 0.375, 2 - 0.375; 3611 glTranslate 2 - 0.375, 2 - 0.375;
2773 3612
2774 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
2775} 3614}
2776 3615
2777############################################################################# 3616#############################################################################
2778 3617
2779package CFClient::UI::Face; 3618package CFPlus::UI::Face;
2780 3619
2781our @ISA = CFClient::UI::Base::; 3620our @ISA = CFPlus::UI::DrawBG::;
2782 3621
2783use CFClient::OpenGL; 3622use CFPlus::OpenGL;
2784 3623
2785sub new { 3624sub new {
2786 my $class = shift; 3625 my $class = shift;
2787 3626
2788 my $self = $class->SUPER::new ( 3627 my $self = $class->SUPER::new (
3628 size_w => 32,
3629 size_h => 8,
2789 aspect => 1, 3630 aspect => 1,
2790 can_events => 0, 3631 can_events => 0,
2791 @_, 3632 @_,
2792 ); 3633 );
2793 3634
2794 if ($self->{anim} && $self->{animspeed}) { 3635 if ($self->{anim} && $self->{animspeed}) {
2795 Scalar::Util::weaken (my $widget = $self); 3636 CFPlus::weaken (my $widget = $self);
2796 3637
3638 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3639 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2797 $self->{timer} = Event->timer ( 3640 $self->{timer} = Event->timer (
2798 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2799 hard => 1, 3641 parked => 1,
2800 interval => $self->{animspeed},
2801 cb => sub { 3642 cb => sub {
3643 return unless $::CONN;
3644
3645 my $w = $widget
3646 or return;
3647
2802 ++$widget->{frame}; 3648 ++$w->{frame};
3649 $w->update_face;
3650
3651 # somehow, $widget can go away
2803 $widget->update; 3652 $w->update;
3653 $w->update_timer;
2804 }, 3654 },
2805 ); 3655 );
3656
3657 $self->update_face;
3658 $self->update_timer;
2806 } 3659 }
2807 3660
2808 $self 3661 $self
2809} 3662}
2810 3663
3664sub update_timer {
3665 my ($self) = @_;
3666
3667 return unless $self->{timer};
3668
3669 if ($self->{visible}) {
3670 $self->{timer}->at (
3671 $self->{anim_start}
3672 + $self->{animspeed}
3673 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3674 );
3675 $self->{timer}->start;
3676 } else {
3677 $self->{timer}->stop;
3678 }
3679}
3680
3681sub update_face {
3682 my ($self) = @_;
3683
3684 if ($::CONN) {
3685 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3686 if ($anim && @$anim) {
3687 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3688 delete $self->{face_change_cb};
3689
3690 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3691 unless ($tex->{name} || $tex->{loading}) {
3692 $tex->upload (sub { $self->reconfigure });
3693 }
3694 }
3695 }
3696 }
3697 }
3698}
3699
2811sub size_request { 3700sub size_request {
2812 (32, 8) 3701 my ($self) = @_;
3702
3703 if ($::CONN) {
3704 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3705 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3706 if ($tex->{name}) {
3707 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3708 } elsif (!$tex->{loading}) {
3709 $tex->upload (sub { $self->reconfigure });
3710 }
3711 }
3712
3713 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3714 }
3715 }
3716
3717 ($self->{size_w} || 8, $self->{size_h} || 8)
2813} 3718}
2814 3719
2815sub update { 3720sub update {
2816 my ($self) = @_; 3721 my ($self) = @_;
2817 3722
2818 return unless $self->{visible}; 3723 return unless $self->{visible};
2819 3724
2820 $self->SUPER::update; 3725 $self->SUPER::update;
2821} 3726}
2822 3727
3728sub invoke_visibility_change {
3729 my ($self) = @_;
3730
3731 $self->update_timer;
3732
3733 0
3734}
3735
2823sub _draw { 3736sub _draw {
2824 my ($self) = @_; 3737 my ($self) = @_;
2825 3738
2826 return unless $::CONN; 3739 $self->SUPER::_draw;
2827 3740
2828 my $face; 3741 if (my $tex = $self->{tex}) {
2829
2830 if ($self->{frame}) {
2831 my $anim = $::CONN->{anim}[$self->{anim}];
2832
2833 $face = $anim->[ $self->{frame} % @$anim ]
2834 if $anim && @$anim;
2835 }
2836
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838
2839 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 3742 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 3744 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 3746 glDisable GL_TEXTURE_2D;
2845 } 3747 }
2846} 3748}
2847 3749
2848sub DESTROY { 3750sub destroy {
2849 my ($self) = @_; 3751 my ($self) = @_;
2850 3752
2851 $self->{timer}->cancel 3753 (delete $self->{timer})->cancel
2852 if $self->{timer}; 3754 if $self->{timer};
2853 3755
2854 $self->SUPER::DESTROY; 3756 $self->SUPER::destroy;
2855} 3757}
2856 3758
2857############################################################################# 3759#############################################################################
2858 3760
3761package CFPlus::UI::Buttonbar;
3762
3763our @ISA = CFPlus::UI::HBox::;
3764
3765# TODO: should actually wrap buttons and other goodies.
3766
3767#############################################################################
3768
2859package CFClient::UI::Menu; 3769package CFPlus::UI::Menu;
2860 3770
2861our @ISA = CFClient::UI::FancyFrame::; 3771our @ISA = CFPlus::UI::Toplevel::;
2862 3772
2863use CFClient::OpenGL; 3773use CFPlus::OpenGL;
2864 3774
2865sub new { 3775sub new {
2866 my $class = shift; 3776 my $class = shift;
2867 3777
2868 my $self = $class->SUPER::new ( 3778 my $self = $class->SUPER::new (
2869 items => [], 3779 items => [],
2870 z => 100, 3780 z => 100,
2871 @_, 3781 @_,
2872 ); 3782 );
2873 3783
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3784 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2875 3785
2876 for my $item (@{ $self->{items} }) { 3786 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 3787 my ($widget, $cb, $tooltip) = @$item;
2878 3788
2879 # handle various types of items, only text for now 3789 # handle various types of items, only text for now
2880 if (!ref $widget) { 3790 if (!ref $widget) {
3791 if ($widget =~ /\t/) {
3792 my ($left, $right) = split /\t/, $widget, 2;
3793
2881 $widget = new CFClient::UI::Label 3794 $widget = new CFPlus::UI::HBox
2882 can_hover => 1, 3795 can_hover => 1,
2883 can_events => 1, 3796 can_events => 1,
3797 tooltip => $tooltip,
3798 children => [
3799 (new CFPlus::UI::Label markup => $left, expand => 1),
3800 (new CFPlus::UI::Label markup => $right, align => +1),
3801 ],
3802 ;
3803
3804 } else {
3805 $widget = new CFPlus::UI::Label
3806 can_hover => 1,
3807 can_events => 1,
2884 text => $widget; 3808 markup => $widget,
3809 tooltip => $tooltip;
3810 }
2885 } 3811 }
2886 3812
2887 $self->{item}{$widget} = $item; 3813 $self->{item}{$widget} = $item;
2888 3814
2889 $self->{vbox}->add ($widget); 3815 $self->{vbox}->add ($widget);
… …
2894 3820
2895# popup given the event (must be a mouse button down event currently) 3821# popup given the event (must be a mouse button down event currently)
2896sub popup { 3822sub popup {
2897 my ($self, $ev) = @_; 3823 my ($self, $ev) = @_;
2898 3824
2899 $self->_emit ("popdown"); 3825 $self->emit ("popdown");
2900 3826
2901 # maybe save $GRAB? must be careful about events... 3827 # maybe save $GRAB? must be careful about events...
2902 $GRAB = $self; 3828 $GRAB = $self;
2903 $self->{button} = $ev->{button}; 3829 $self->{button} = $ev->{button};
2904 3830
2905 $self->show; 3831 $self->show;
2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3832 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2907} 3833}
2908 3834
2909sub mouse_motion { 3835sub invoke_mouse_motion {
2910 my ($self, $ev, $x, $y) = @_; 3836 my ($self, $ev, $x, $y) = @_;
2911 3837
2912 # TODO: should use vbox->find_widget or so 3838 # TODO: should use vbox->find_widget or so
2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3839 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2914 $self->{hover} = $self->{item}{$HOVER}; 3840 $self->{hover} = $self->{item}{$HOVER};
2915 3841
2916 0 3842 0
2917} 3843}
2918 3844
2919sub button_up { 3845sub invoke_button_up {
2920 my ($self, $ev, $x, $y) = @_; 3846 my ($self, $ev, $x, $y) = @_;
2921 3847
2922 if ($ev->{button} == $self->{button}) { 3848 if ($ev->{button} == $self->{button}) {
2923 undef $GRAB; 3849 undef $GRAB;
2924 $self->hide; 3850 $self->hide;
2925 3851
2926 $self->_emit ("popdown"); 3852 $self->emit ("popdown");
2927 $self->{hover}[1]->() if $self->{hover}; 3853 $self->{hover}[1]->() if $self->{hover};
2928 } else { 3854 } else {
2929 return 0 3855 return 0
2930 } 3856 }
2931 3857
2932 1 3858 1
2933} 3859}
2934 3860
2935############################################################################# 3861#############################################################################
2936 3862
2937package CFClient::UI::Statusbox; 3863package CFPlus::UI::Multiplexer;
2938 3864
2939our @ISA = CFClient::UI::VBox::; 3865our @ISA = CFPlus::UI::Container::;
2940 3866
2941sub new { 3867sub new {
2942 my $class = shift; 3868 my $class = shift;
2943 3869
2944 $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3871 @_,
3872 );
3873
3874 $self->{current} = $self->{children}[0]
3875 if @{ $self->{children} };
3876
3877 $self
3878}
3879
3880sub add {
3881 my ($self, @widgets) = @_;
3882
3883 $self->SUPER::add (@widgets);
3884
3885 $self->{current} = $self->{children}[0]
3886 if @{ $self->{children} };
3887}
3888
3889sub get_current_page {
3890 my ($self) = @_;
3891
3892 $self->{current}
3893}
3894
3895sub set_current_page {
3896 my ($self, $page_or_widget) = @_;
3897
3898 my $widget = ref $page_or_widget
3899 ? $page_or_widget
3900 : $self->{children}[$page_or_widget];
3901
3902 $self->{current} = $widget;
3903 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3904
3905 $self->emit (page_changed => $self->{current});
3906
3907 $self->realloc;
3908}
3909
3910sub visible_children {
3911 $_[0]{current}
3912}
3913
3914sub size_request {
3915 my ($self) = @_;
3916
3917 $self->{current}->size_request
3918}
3919
3920sub invoke_size_allocate {
3921 my ($self, $w, $h) = @_;
3922
3923 $self->{current}->configure (0, 0, $w, $h);
3924
3925 1
3926}
3927
3928sub _draw {
3929 my ($self) = @_;
3930
3931 $self->{current}->draw;
3932}
3933
3934#############################################################################
3935
3936package CFPlus::UI::Notebook;
3937
3938use CFPlus::OpenGL;
3939
3940our @ISA = CFPlus::UI::VBox::;
3941
3942sub new {
3943 my $class = shift;
3944
3945 my $self = $class->SUPER::new (
3946 buttonbar => (new CFPlus::UI::Buttonbar),
3947 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3948 active_outline => [1, 1, 0],
3949 # filter => # will be put between multiplexer and $self
3950 @_,
3951 );
3952
3953 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3954 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3955
3956 {
3957 Scalar::Util::weaken (my $wself = $self);
3958
3959 $self->{multiplexer}->connect (c_add => sub {
3960 my ($mplex, $widgets) = @_;
3961
3962 for my $child (@$widgets) {
3963 Scalar::Util::weaken $child;
3964 $child->{c_tab_} ||= do {
3965 my $tab =
3966 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3967 ? $child->{c_tab}
3968 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3969
3970 $tab->connect (activate => sub {
3971 $wself->set_current_page ($child);
3972 });
3973
3974 $tab
3975 };
3976
3977 $self->{buttonbar}->add ($child->{c_tab_});
3978 }
3979 });
3980
3981 $self->{multiplexer}->connect (c_remove => sub {
3982 my ($mplex, $widgets) = @_;
3983
3984 for my $child (@$widgets) {
3985 $wself->{buttonbar}->remove ($child->{c_tab_});
3986 }
3987 });
3988 }
3989
3990 $self
3991}
3992
3993sub add {
3994 my ($self, @widgets) = @_;
3995
3996 $self->{multiplexer}->add (@widgets)
3997}
3998
3999sub remove {
4000 my ($self, @widgets) = @_;
4001
4002 $self->{multiplexer}->remove (@widgets)
4003}
4004
4005sub pages {
4006 my ($self) = @_;
4007 $self->{multiplexer}->children
4008}
4009
4010sub add_tab {
4011 my ($self, $title, $widget, $tooltip) = @_;
4012
4013 $title = [$title, $tooltip] unless ref $title;
4014 $widget->{c_tab} = $title;
4015
4016 $self->add ($widget);
4017}
4018
4019sub get_current_page {
4020 my ($self) = @_;
4021
4022 $self->{multiplexer}->get_current_page
4023}
4024
4025sub set_current_page {
4026 my ($self, $page) = @_;
4027
4028 $self->{multiplexer}->set_current_page ($page);
4029 $self->emit (page_changed => $self->{multiplexer}{current});
4030}
4031
4032sub _draw {
4033 my ($self) = @_;
4034
4035 $self->SUPER::_draw ();
4036
4037 if (my $cur = $self->{multiplexer}{current}) {
4038 if ($cur = $cur->{c_tab_}) {
4039 glTranslate $cur->{x}, $cur->{y};
4040 glLineWidth 3;
4041 glColor @{$self->{active_outline}};
4042 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4043 glLineWidth 1;
4044 }
4045 }
4046}
4047
4048#############################################################################
4049
4050package CFPlus::UI::Selector;
4051
4052use utf8;
4053
4054our @ISA = CFPlus::UI::Button::;
4055
4056sub new {
4057 my $class = shift;
4058
4059 my $self = $class->SUPER::new (
4060 options => [], # [value, title, longdesc], ...
4061 value => undef,
4062 @_,
4063 );
4064
4065 $self->_set_value ($self->{value});
4066
4067 $self
4068}
4069
4070sub invoke_button_down {
4071 my ($self, $ev) = @_;
4072
4073 my @menu_items;
4074
4075 for (@{ $self->{options} }) {
4076 my ($value, $title, $tooltip) = @$_;
4077
4078 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4079 }
4080
4081 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4082}
4083
4084sub _set_value {
4085 my ($self, $value) = @_;
4086
4087 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
4088 or return;
4089
4090 $self->{value} = $item->[0];
4091 $self->set_markup ("$item->[1] ⇓");
4092 $self->set_tooltip ($item->[2]);
4093}
4094
4095sub set_value {
4096 my ($self, $value) = @_;
4097
4098 return unless $self->{value} ne $value;
4099
4100 $self->_set_value ($value);
4101 $self->emit (changed => $value);
4102}
4103
4104#############################################################################
4105
4106package CFPlus::UI::Statusbox;
4107
4108our @ISA = CFPlus::UI::VBox::;
4109
4110sub new {
4111 my $class = shift;
4112
4113 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 4114 fontsize => 0.8,
2946 @_, 4115 @_,
2947 ) 4116 );
4117
4118 CFPlus::weaken (my $this = $self);
4119
4120 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4121
4122 $self
2948} 4123}
2949 4124
2950sub reorder { 4125sub reorder {
2951 my ($self) = @_; 4126 my ($self) = @_;
2952 my $NOW = time; 4127 my $NOW = Time::HiRes::time;
4128
4129 # freeze display when hovering over any label
4130 return if $CFPlus::UI::TOOLTIP->{owner}
4131 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4132 values %{ $self->{item} };
2953 4133
2954 while (my ($k, $v) = each %{ $self->{item} }) { 4134 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4135 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 4136 }
2957 4137
… …
2960 my @items = sort { 4140 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 4141 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 4142 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 4143 } values %{ $self->{item} };
2964 4144
4145 $self->{timer}->interval (1);
4146
2965 my $count = 10 + 1; 4147 my $count = 10 + 1;
2966 for my $item (@items) { 4148 for my $item (@items) {
2967 last unless --$count; 4149 last unless --$count;
2968 4150
2969 push @widgets, $item->{label} ||= do { 4151 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 4152 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 4153 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 4154 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 4155 : $item->{text};
2974 4156
2975 for ($short) { 4157 for ($short) {
2976 s/^\s+//; 4158 s/^\s+//;
2977 s/\s+/ /g; 4159 s/\s+/ /g;
2978 } 4160 }
2979 4161
2980 new CFClient::UI::Label 4162 new CFPlus::UI::Label
2981 markup => $short, 4163 markup => $short,
2982 tooltip => $item->{tooltip}, 4164 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 4165 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 4166 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 4167 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 4168 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 4169 fg => [@{ $item->{fg} }],
2988 can_events => 1, 4170 can_events => 1,
2989 can_hover => 1 4171 can_hover => 1
2990 }; 4172 };
4173
4174 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4175 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4176 $label->update;
4177 $label->set_max_size (undef, $label->{req_h} * $diff)
4178 if $diff < 1;
4179 $self->{timer}->interval (1/30);
4180 } else {
4181 $label->{fg}[3] = $item->{fg}[3] || 1;
4182 }
4183
4184 push @widgets, $label;
2991 } 4185 }
2992 4186
2993 $self->clear; 4187 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 4188 $self->SUPER::add (reverse @widgets);
2995} 4189}
… …
3000 $text =~ s/^\s+//; 4194 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 4195 $text =~ s/\s+$//;
3002 4196
3003 return unless $text; 4197 return unless $text;
3004 4198
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 4199 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 4200
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4201 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 4202
3009 if (my $item = $self->{item}{$group}) { 4203 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 4204 if ($item->{text} eq $text) {
3011 $item->{count}++; 4205 $item->{count}++;
3012 } else { 4206 } else {
3013 $item->{count} = 1; 4207 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text; 4208 $item->{text} = $item->{tooltip} = $text;
3015 } 4209 }
3016 $item->{id} = ++$self->{id}; 4210 $item->{id} += 0.2;#d#
3017 $item->{timeout} = $timeout; 4211 $item->{timeout} = $timeout;
3018 delete $item->{label}; 4212 delete $item->{label};
3019 } else { 4213 } else {
3020 $self->{item}{$group} = { 4214 $self->{item}{$group} = {
3021 id => ++$self->{id}, 4215 id => ++$self->{id},
… …
3027 count => 1, 4221 count => 1,
3028 %arg, 4222 %arg,
3029 }; 4223 };
3030 } 4224 }
3031 4225
4226 $ROOT->on_refresh (reorder => sub {
3032 $self->reorder; 4227 $self->reorder;
4228 });
3033} 4229}
3034 4230
3035sub reconfigure { 4231sub reconfigure {
3036 my ($self) = @_; 4232 my ($self) = @_;
3037 4233
… …
3040 4236
3041 $self->reorder; 4237 $self->reorder;
3042 $self->SUPER::reconfigure; 4238 $self->SUPER::reconfigure;
3043} 4239}
3044 4240
4241sub destroy {
4242 my ($self) = @_;
4243
4244 $self->{timer}->cancel;
4245
4246 $self->SUPER::destroy;
4247}
4248
3045############################################################################# 4249#############################################################################
3046 4250
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; 4251package CFPlus::UI::Root;
3344 4252
3345our @ISA = CFClient::UI::Container::; 4253our @ISA = CFPlus::UI::Container::;
3346 4254
4255use List::Util qw(min max);
4256
3347use CFClient::OpenGL; 4257use CFPlus::OpenGL;
3348 4258
3349sub new { 4259sub new {
3350 my $class = shift; 4260 my $class = shift;
3351 4261
3352 my $self = $class->SUPER::new ( 4262 my $self = $class->SUPER::new (
3353 visible => 1, 4263 visible => 1,
3354 @_, 4264 @_,
3355 ); 4265 );
3356 4266
3357 Scalar::Util::weaken ($self->{root} = $self); 4267 CFPlus::weaken ($self->{root} = $self);
3358 4268
3359 $self 4269 $self
3360} 4270}
3361 4271
3362sub size_request { 4272sub size_request {
… …
3377 $coord = $max - $size if $coord > $max - $size; 4287 $coord = $max - $size if $coord > $max - $size;
3378 4288
3379 int $coord + 0.5 4289 int $coord + 0.5
3380} 4290}
3381 4291
3382sub size_allocate { 4292sub invoke_size_allocate {
3383 my ($self, $w, $h) = @_; 4293 my ($self, $w, $h) = @_;
3384 4294
3385 for my $child ($self->children) { 4295 for my $child ($self->children) {
3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4296 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3387 4297
… …
3391 $X = _to_pixel $X, $W, $self->{w}; 4301 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h}; 4302 $Y = _to_pixel $Y, $H, $self->{h};
3393 4303
3394 $child->configure ($X, $Y, $W, $H); 4304 $child->configure ($X, $Y, $W, $H);
3395 } 4305 }
4306
4307 1
3396} 4308}
3397 4309
3398sub coord2local { 4310sub coord2local {
3399 my ($self, $x, $y) = @_; 4311 my ($self, $x, $y) = @_;
3400 4312
… …
3408} 4320}
3409 4321
3410sub update { 4322sub update {
3411 my ($self) = @_; 4323 my ($self) = @_;
3412 4324
3413 $::WANT_REFRESH++; 4325 $::WANT_REFRESH->start;
3414} 4326}
3415 4327
3416sub add { 4328sub add {
3417 my ($self, @children) = @_; 4329 my ($self, @children) = @_;
3418 4330
… …
3455 while ($self->{refresh_hook}) { 4367 while ($self->{refresh_hook}) {
3456 $_->() 4368 $_->()
3457 for values %{delete $self->{refresh_hook}}; 4369 for values %{delete $self->{refresh_hook}};
3458 } 4370 }
3459 4371
3460 if ($self->{realloc}) { 4372 while ($self->{realloc}) {
3461 my %queue; 4373 my %queue;
3462 my @queue; 4374 my @queue;
3463 my $widget; 4375 my $widget;
3464 4376
3465 outer: 4377 outer:
… …
3485 4397
3486 delete $queue{$widget+0}; 4398 delete $queue{$widget+0};
3487 4399
3488 my ($w, $h) = $widget->size_request; 4400 my ($w, $h) = $widget->size_request;
3489 4401
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4402 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4403 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4404
4405 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4406 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 4407
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 4408 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 4409 $h = $widget->{force_h} if exists $widget->{force_h};
3495 4410
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4411 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3509 } 4424 }
3510 } 4425 }
3511 4426
3512 delete $self->{realloc}{$widget+0}; 4427 delete $self->{realloc}{$widget+0};
3513 } 4428 }
3514 }
3515 4429
3516 while (my $size_alloc = delete $self->{size_alloc}) { 4430 while (my $size_alloc = delete $self->{size_alloc}) {
3517 my @queue = sort { $b->{visible} <=> $a->{visible} } 4431 my @queue = sort { $a->{visible} <=> $b->{visible} }
3518 values %$size_alloc; 4432 values %$size_alloc;
3519 4433
3520 while () { 4434 while () {
3521 my $widget = pop @queue || last; 4435 my $widget = pop @queue || last;
3522 4436
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4437 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3524 4438
3525 $w = 0 if $w < 0; 4439 $w = max $widget->{min_w}, $w;
3526 $h = 0 if $h < 0; 4440 $h = max $widget->{min_h}, $h;
3527 4441
4442# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4443# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4444
4445 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4446 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4447
3528 $w = int $w + 0.5; 4448 $w = int $w + 0.5;
3529 $h = int $h + 0.5; 4449 $h = int $h + 0.5;
3530 4450
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4451 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w}; 4452 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h}; 4453 $widget->{old_h} = $widget->{h};
3534 4454
3535 $widget->{w} = $w; 4455 $widget->{w} = $w;
3536 $widget->{h} = $h; 4456 $widget->{h} = $h;
3537 4457
3538 $widget->emit (size_allocate => $w, $h); 4458 $widget->emit (size_allocate => $w, $h);
4459 }
3539 } 4460 }
3540 } 4461 }
3541 } 4462 }
3542 4463
3543 while ($self->{post_alloc_hook}) { 4464 while ($self->{post_alloc_hook}) {
3544 $_->() 4465 $_->()
3545 for values %{delete $self->{post_alloc_hook}}; 4466 for values %{delete $self->{post_alloc_hook}};
3546 } 4467 }
3547
3548 4468
3549 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4469 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4470 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3551 glClear GL_COLOR_BUFFER_BIT; 4471 glClear GL_COLOR_BUFFER_BIT;
3552 4472
… …
3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4475 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3556 glMatrixMode GL_MODELVIEW; 4476 glMatrixMode GL_MODELVIEW;
3557 glLoadIdentity; 4477 glLoadIdentity;
3558 4478
3559 { 4479 {
3560 package CFClient::UI::Base; 4480 package CFPlus::UI::Base;
3561 4481
3562 ($draw_x, $draw_y, $draw_w, $draw_h) = 4482 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h}); 4483 (0, 0, $self->{w}, $self->{h});
3564 }
3565 4484
3566 $self->_draw; 4485 $self->_draw;
4486 }
3567} 4487}
3568 4488
3569############################################################################# 4489#############################################################################
3570 4490
3571package CFClient::UI; 4491package CFPlus::UI;
3572 4492
3573$ROOT = new CFClient::UI::Root; 4493$ROOT = new CFPlus::UI::Root;
3574$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4494$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3575 4495
35761 44961
3577 4497

Diff Legend

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