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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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