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

Diff Legend

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