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.295 by root, Tue Jun 6 09:19:28 2006 UTC vs.
Revision 1.473 by root, Sun Jan 11 03:19:47 2009 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 {
… …
171# call when resolution changes etc. 189# call when resolution changes etc.
172sub rescale_widgets { 190sub rescale_widgets {
173 my ($sx, $sy) = @_; 191 my ($sx, $sy) = @_;
174 192
175 for my $widget (values %WIDGET) { 193 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 194 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179 197
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
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
320 $self->{x} = List::Util::max 0, int $x; 356 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 357 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 358 $self->{z} = $z if defined $z;
323 359
324 $self->update; 360 $self->update;
325} 361}
326 362
… …
329 365
330 $self->{force_w} = $w; 366 $self->{force_w} = $w;
331 $self->{force_h} = $h; 367 $self->{force_h} = $h;
332 368
333 $self->realloc; 369 $self->realloc;
370}
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)
334} 388}
335 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
… …
1213 glEnable GL_TEXTURE_2D; 1543 glEnable GL_TEXTURE_2D;
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
1548 if ($border) {
1218 glColor @{ $self->{border_bg} }; 1549 glColor @{ $self->{border_bg} };
1219 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1550 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1551 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1552 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1553 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1554
1555 # move
1556 my $w2 = ($w - $border) * .5;
1557 my $h2 = ($h - $border) * .5;
1558 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1559 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1560 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1561
1562 # resize
1563 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1565 unless $self->{has_close_button};
1566 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1567 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1568 }
1223 1569
1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1570 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} }; 1571 glColor @{ $self->{bg} };
1226 1572
1227 # TODO: repeat texture not scale 1573 # TODO: repeat texture not scale
… …
1233 1579
1234 glDisable GL_TEXTURE_2D; 1580 glDisable GL_TEXTURE_2D;
1235 1581
1236 $child->draw; 1582 $child->draw;
1237 1583
1238 if ($self->{title}) { 1584 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1585 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1586 $self->{title_widget}->_draw;
1587
1588 glTranslate 0, - ($border - $self->{h});
1241 } 1589 }
1590
1591 $self->{close_button}->draw
1592 if $self->{close_button};
1242} 1593}
1243 1594
1244############################################################################# 1595#############################################################################
1245 1596
1246package CFClient::UI::Table; 1597package DC::UI::Table;
1247 1598
1248our @ISA = CFClient::UI::Base::; 1599our @ISA = DC::UI::Container::;
1249 1600
1250use List::Util qw(max sum); 1601use List::Util qw(max sum);
1251 1602
1252use CFClient::OpenGL; 1603use DC::OpenGL;
1253 1604
1254sub new { 1605sub new {
1255 my $class = shift; 1606 my $class = shift;
1256 1607
1257 $class->SUPER::new ( 1608 $class->SUPER::new (
1258 col_expand => [], 1609 col_expand => [],
1610 row_expand => [],
1259 @_, 1611 @_,
1260 ) 1612 )
1261} 1613}
1262 1614
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265}
1266
1267sub add { 1615sub 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) = @_; 1616 my ($self, @widgets) = @_;
1617
1618 for my $child (@widgets) {
1619 $child->{c_rowspan} ||= 1;
1620 $child->{c_colspan} ||= 1;
1621 }
1622
1623 $self->SUPER::add (@widgets);
1624}
1625
1626sub add_at {
1627 my $self = shift;
1628
1629 my @widgets;
1630
1631 while (@_) {
1632 my ($col, $row, $child) = splice @_, 0, 3, ();
1633
1634 $child->{c_row} = $row;
1635 $child->{c_col} = $col;
1636
1637 push @widgets, $child;
1638 }
1639
1640 $self->add (@widgets);
1641}
1642
1643sub get_wh {
1644 my ($self) = @_;
1645
1646 my (@w, @h);
1279 1647
1280 my @children = $self->children; 1648 my @children = $self->children;
1281 delete $self->{children}; 1649
1650 # first pass, columns
1651 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1652 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1653
1654 my $sw = sum @w[$c .. $c + $cs - 1];
1655
1656 if ($w > $sw) {
1657 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1658 }
1282 1659 }
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287 1660
1288 $self->realloc; 1661 # second pass, rows
1289} 1662 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)}; 1663 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1304 1664
1305 $w[$x] = max $w[$x], $w; 1665 my $sh = sum @h[$r .. $r + $rs - 1];
1306 $h[$y] = max $h[$y], $h; 1666
1667 if ($h > $sh) {
1668 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1307 } 1669 }
1308 } 1670 }
1309 1671
1310 (\@w, \@h) 1672 (\@w, \@h)
1311} 1673}
… …
1319 (sum @$ws), 1681 (sum @$ws),
1320 (sum @$hs), 1682 (sum @$hs),
1321 ) 1683 )
1322} 1684}
1323 1685
1324sub size_allocate { 1686sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1326 1688
1327 my ($ws, $hs) = $self->get_wh; 1689 my ($ws, $hs) = $self->get_wh;
1328 1690
1329 my $req_w = (sum @$ws) || 1; 1691 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1692 my $req_h = (sum @$hs) || 1;
1331 1693
1332 # TODO: nicer code && do row_expand 1694 # now linearly scale the rows/columns to the allocated size
1333 my @col_expand = @{$self->{col_expand}}; 1695 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1696 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1697 my $col_expand = (sum @col_expand) || 1;
1336 1698
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1699 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1700
1341 CFClient::UI::harmonize $ws; 1701 DC::UI::harmonize $ws;
1702
1703 my @row_expand = @{$self->{row_expand}};
1704 @row_expand = (1) x @$ws unless @row_expand;
1705 my $row_expand = (sum @row_expand) || 1;
1706
1707 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1708
1342 CFClient::UI::harmonize $hs; 1709 DC::UI::harmonize $hs;
1343 1710
1344 my $y; 1711 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1712 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345 1713
1346 for my $r (0 .. $#{$self->{children}}) { 1714 for my $widget ($self->children) {
1347 my $row = $self->{children}[$r] 1715 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 1716
1350 my $x = 0; 1717 $widget->configure (
1351 my $row_h = $hs->[$r]; 1718 $x[$c], $y[$r],
1719 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352 1720 );
1353 for my $c (0 .. $#$row) { 1721 }
1354 my $col_w = $ws->[$c];
1355 1722
1356 if (my $widget = $row->[$c]) { 1723 1
1357 $widget->configure ($x, $y, $col_w, $row_h); 1724}
1358 }
1359 1725
1360 $x += $col_w; 1726#############################################################################
1727
1728package DC::UI::Fixed;
1729
1730use List::Util qw(min max);
1731
1732our @ISA = DC::UI::Container::;
1733
1734sub _scale($$$) {
1735 my ($rel, $val, $max) = @_;
1736
1737 $rel ? $val * $max : $val
1738}
1739
1740sub size_request {
1741 my ($self) = @_;
1742
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744
1745 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) {
1747 unless ($child->{c_rel}) {
1748 my $x = $child->{c_x};
1749 my $y = $child->{c_y};
1750
1751 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1752 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1361 } 1753 }
1362
1363 $y += $row_h;
1364 } 1754 }
1365 1755
1366} 1756 my $W = $x2 - $x1;
1757 my $H = $y2 - $y1;
1367 1758
1368sub find_widget { 1759 # now layout remaining widgets
1760 for my $child ($self->visible_children) {
1761 if ($child->{c_rel}) {
1762 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1763 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1764
1765 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1766 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1767 }
1768 }
1769
1770 my $W = $x2 - $x1;
1771 my $H = $y2 - $y1;
1772
1773 ($W, $H)
1774}
1775
1776sub invoke_size_allocate {
1369 my ($self, $x, $y) = @_; 1777 my ($self, $W, $H) = @_;
1370 1778
1371 $x -= $self->{x}; 1779 for my $child ($self->visible_children) {
1372 $y -= $self->{y}; 1780 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1781 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1373 1782
1374 my $res; 1783 $x += $child->{c_halign} * $child->{req_w};
1784 $y += $child->{c_valign} * $child->{req_h};
1375 1785
1376 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1786 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1377 $res = $_->find_widget ($x, $y) 1787 }
1378 and return $res; 1788
1379 } 1789 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} 1790}
1391 1791
1392############################################################################# 1792#############################################################################
1393 1793
1394package CFClient::UI::Box; 1794package DC::UI::Box;
1395 1795
1396our @ISA = CFClient::UI::Container::; 1796our @ISA = DC::UI::Container::;
1397 1797
1398sub size_request { 1798sub size_request {
1399 my ($self) = @_; 1799 my ($self) = @_;
1800
1801 my @children = $self->visible_children;
1400 1802
1401 $self->{vertical} 1803 $self->{vertical}
1402 ? ( 1804 ? (
1403 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_w}, @children),
1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1806 (List::Util::sum map $_->{req_h}, @children),
1405 ) 1807 )
1406 : ( 1808 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1809 (List::Util::sum map $_->{req_w}, @children),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1810 (List::Util::max map $_->{req_h}, @children),
1409 ) 1811 )
1410} 1812}
1411 1813
1412sub size_allocate { 1814sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1815 my ($self, $w, $h) = @_;
1414 1816
1415 my $space = $self->{vertical} ? $h : $w; 1817 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1818 my @children = $self->visible_children;
1417 1819
1418 my @req; 1820 my @req;
1419 1821
1420 if ($self->{homogeneous}) { 1822 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1823 @req = ($space / (@children || 1)) x @children;
1422 } else { 1824 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1825 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1826 my $req = List::Util::sum @req;
1425 1827
1426 if ($req > $space) { 1828 if ($req > $space) {
1427 # ah well, not enough space 1829 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1830 $_ *= $space / $req for @req;
1429 } else { 1831 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1832 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1833
1432 $space = ($space - $req) / $expand; # remaining space to give away 1834 $space = ($space - $req) / $expand; # remaining space to give away
1433 1835
1434 $req[$_] += $space * $children->[$_]{expand} 1836 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1837 for 0 .. $#children;
1436 } 1838 }
1437 } 1839 }
1438 1840
1439 CFClient::UI::harmonize \@req; 1841 DC::UI::harmonize \@req;
1440 1842
1441 my $pos = 0; 1843 my $pos = 0;
1442 for (0 .. $#$children) { 1844 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1845 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1846 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1847
1446 $pos += $alloc; 1848 $pos += $alloc;
1447 } 1849 }
1448 1850
1449 1 1851 1
1450} 1852}
1451 1853
1452############################################################################# 1854#############################################################################
1453 1855
1454package CFClient::UI::HBox; 1856package DC::UI::HBox;
1455 1857
1456our @ISA = CFClient::UI::Box::; 1858our @ISA = DC::UI::Box::;
1457 1859
1458sub new { 1860sub new {
1459 my $class = shift; 1861 my $class = shift;
1460 1862
1461 $class->SUPER::new ( 1863 $class->SUPER::new (
… …
1464 ) 1866 )
1465} 1867}
1466 1868
1467############################################################################# 1869#############################################################################
1468 1870
1469package CFClient::UI::VBox; 1871package DC::UI::VBox;
1470 1872
1471our @ISA = CFClient::UI::Box::; 1873our @ISA = DC::UI::Box::;
1472 1874
1473sub new { 1875sub new {
1474 my $class = shift; 1876 my $class = shift;
1475 1877
1476 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1479 ) 1881 )
1480} 1882}
1481 1883
1482############################################################################# 1884#############################################################################
1483 1885
1484package CFClient::UI::Label; 1886package DC::UI::Label;
1485 1887
1486our @ISA = CFClient::UI::DrawBG::; 1888our @ISA = DC::UI::DrawBG::;
1487 1889
1488use CFClient::OpenGL; 1890use DC::OpenGL;
1489 1891
1490sub new { 1892sub new {
1491 my ($class, %arg) = @_; 1893 my ($class, %arg) = @_;
1492 1894
1493 my $self = $class->SUPER::new ( 1895 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1898 #active_bg => none
1497 #font => default_font 1899 #font => default_font
1498 #text => initial text 1900 #text => initial text
1499 #markup => initial narkup 1901 #markup => initial narkup
1500 #max_w => maximum pixel width 1902 #max_w => maximum pixel width
1903 #style => 0, # render flags
1501 ellipsise => 3, # end 1904 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1905 layout => (new DC::Layout),
1503 fontsize => 1, 1906 fontsize => 1,
1504 align => -1, 1907 align => 0.5,
1505 valign => -1, 1908 valign => 0.5,
1506 padding_x => 2, 1909 padding_x => 4,
1507 padding_y => 2, 1910 padding_y => 2,
1508 can_events => 0, 1911 can_events => 0,
1509 %arg 1912 %arg
1510 ); 1913 );
1511 1914
1512 if (exists $self->{template}) { 1915 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1916 my $layout = new DC::Layout;
1514 $layout->set_text (delete $self->{template}); 1917 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1918 $self->{template} = $layout;
1516 } 1919 }
1517 1920
1518 if (exists $self->{markup}) { 1921 if (exists $self->{markup}) {
… …
1522 } 1925 }
1523 1926
1524 $self 1927 $self
1525} 1928}
1526 1929
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1930sub update {
1538 my ($self) = @_; 1931 my ($self) = @_;
1539 1932
1540 delete $self->{texture}; 1933 delete $self->{texture};
1541 $self->SUPER::update; 1934 $self->SUPER::update;
… …
1546 1939
1547 delete $self->{ox}; 1940 delete $self->{ox};
1548 $self->SUPER::realloc; 1941 $self->SUPER::realloc;
1549} 1942}
1550 1943
1944sub clear {
1945 my ($self) = @_;
1946
1947 $self->set_text ("");
1948}
1949
1551sub set_text { 1950sub set_text {
1552 my ($self, $text) = @_; 1951 my ($self, $text) = @_;
1553 1952
1554 return if $self->{text} eq "T$text"; 1953 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1954 $self->{text} = "T$text";
1556 1955
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1956 $self->{layout}->set_text ($text);
1559 1957
1560 delete $self->{size_req}; 1958 delete $self->{size_req};
1561 $self->realloc; 1959 $self->realloc;
1562 $self->update; 1960 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1966 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1967 $self->{text} = "M$markup";
1570 1968
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1969 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1970
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1971 $self->{layout}->set_markup ($markup);
1575 1972
1576 delete $self->{size_req}; 1973 delete $self->{size_req};
1577 $self->realloc; 1974 $self->realloc;
1578 $self->update; 1975 $self->update;
… …
1580 1977
1581sub size_request { 1978sub size_request {
1582 my ($self) = @_; 1979 my ($self) = @_;
1583 1980
1584 $self->{size_req} ||= do { 1981 $self->{size_req} ||= do {
1982 my ($max_w, $max_h) = $self->get_max_wh;
1983
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1984 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1985 $self->{layout}->set_width ($max_w);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1986 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 1989
1591 my ($w, $h) = $self->{layout}->size; 1990 my ($w, $h) = $self->{layout}->size;
1592 1991
1593 if (exists $self->{template}) { 1992 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1993 $self->{template}->set_font ($self->{font}) if $self->{font};
1994 $self->{template}->set_width ($max_w);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1996
1597 my ($w2, $h2) = $self->{template}->size; 1997 my ($w2, $h2) = $self->{template}->size;
1598 1998
1599 $w = List::Util::max $w, $w2; 1999 $w = List::Util::max $w, $w2;
… …
1604 }; 2004 };
1605 2005
1606 @{ $self->{size_req} } 2006 @{ $self->{size_req} }
1607} 2007}
1608 2008
2009sub baseline_shift {
2010 $_[0]{layout}->descent
2011}
2012
1609sub size_allocate { 2013sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2014 my ($self, $w, $h) = @_;
1611 2015
1612 delete $self->{ox}; 2016 delete $self->{ox};
1613 2017
1614 delete $self->{texture} 2018 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2019 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2020
2021 1
1616} 2022}
1617 2023
1618sub set_fontsize { 2024sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2025 my ($self, $fontsize) = @_;
1620 2026
1621 $self->{fontsize} = $fontsize; 2027 $self->{fontsize} = $fontsize;
2028 delete $self->{size_req};
1622 delete $self->{texture}; 2029 delete $self->{texture};
1623 2030
1624 $self->realloc; 2031 $self->realloc;
1625} 2032}
1626 2033
1627sub reconfigure { 2034sub reconfigure {
1628 my ($self) = @_; 2035 my ($self) = @_;
1629 2036
1630 delete $self->{size_req}; 2037 delete $self->{size_req};
2038 delete $self->{texture};
1631 2039
1632 $self->SUPER::reconfigure; 2040 $self->SUPER::reconfigure;
1633} 2041}
1634 2042
1635sub _draw { 2043sub _draw {
1636 my ($self) = @_; 2044 my ($self) = @_;
1637 2045
1638 $self->SUPER::_draw; # draw background, if applicable 2046 $self->SUPER::_draw; # draw background, if applicable
1639 2047
1640 my $tex = $self->{texture} ||= do { 2048 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 2049 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2050 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 2051 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2052 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2053 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 2055
1648 new_from_layout CFClient::Texture $self->{layout} 2056 [$self->{layout}->size]
1649 }; 2057 };
1650 2058
1651 unless (exists $self->{ox}) { 2059 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2060 $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} 2061 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1654 : ($self->{w} - $tex->{w}) * 0.5);
1655 2062
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2063 $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 }; 2064 };
1660 2065
1661 glEnable GL_TEXTURE_2D; 2066# unless ($self->{list}) {
1662 2067# $self->{list} = DC::OpenGL::glGenList;
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2068# DC::OpenGL::glNewList $self->{list};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2069# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1665 2070# 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 } 2071# }
2072#
2073# DC::OpenGL::glCallList $self->{list};
1674 2074
1675 glDisable GL_TEXTURE_2D; 2075 $self->{layout}->draw;
1676} 2076}
2077
2078#sub destroy {
2079# my ($self) = @_;
2080#
2081# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2082#
2083# $self->SUPER::destroy;
2084#}
1677 2085
1678############################################################################# 2086#############################################################################
1679 2087
1680package CFClient::UI::EntryBase; 2088package DC::UI::EntryBase;
1681 2089
1682our @ISA = CFClient::UI::Label::; 2090our @ISA = DC::UI::Label::;
1683 2091
1684use CFClient::OpenGL; 2092use DC::OpenGL;
1685 2093
1686sub new { 2094sub new {
1687 my $class = shift; 2095 my $class = shift;
1688 2096
1689 $class->SUPER::new ( 2097 $class->SUPER::new (
1690 fg => [1, 1, 1], 2098 fg => [1, 1, 1],
1691 bg => [0, 0, 0, 0.2], 2099 bg => [0, 0, 0, 0.2],
2100 outline => undef,
1692 active_bg => [1, 1, 1, 0.5], 2101 active_bg => [0, 0, 1, .2],
1693 active_fg => [0, 0, 0], 2102 active_fg => [1, 1, 1],
2103 active_outline => [1, 1, 0],
1694 can_hover => 1, 2104 can_hover => 1,
1695 can_focus => 1, 2105 can_focus => 1,
2106 align => 0,
1696 valign => 0, 2107 valign => 0.5,
1697 can_events => 1, 2108 can_events => 1,
2109 ellipsise => 0,
2110 padding_x => 4,
2111 padding_y => 2,
1698 #text => ... 2112 #text => ...
1699 #hidden => "*", 2113 #hidden => "*",
1700 @_ 2114 @_
1701 ) 2115 )
1702} 2116}
… …
1713 2127
1714 $text =~ s/./*/g if $self->{hidden}; 2128 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 2129 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 2130 delete $self->{size_req};
1717 2131
1718 $self->_emit (changed => $self->{text}); 2132 $self->emit (changed => $self->{text});
1719 2133
1720 $self->realloc; 2134 $self->realloc;
1721 $self->update; 2135 $self->update;
1722} 2136}
1723 2137
… …
1738 my ($w, $h) = $self->SUPER::size_request; 2152 my ($w, $h) = $self->SUPER::size_request;
1739 2153
1740 ($w + 1, $h) # add 1 for cursor 2154 ($w + 1, $h) # add 1 for cursor
1741} 2155}
1742 2156
1743sub key_down { 2157sub invoke_key_down {
1744 my ($self, $ev) = @_; 2158 my ($self, $ev) = @_;
1745 2159
1746 my $mod = $ev->{mod}; 2160 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 2161 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 2162 my $uni = $ev->{unicode};
1749 2163
1750 my $text = $self->get_text; 2164 my $text = $self->get_text;
1751 2165
1752 if ($uni == 8) { 2166 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2167
2168 if ($sym == DC::SDLK_BACKSPACE) {
1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2169 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754 } elsif ($uni == 127) { 2170 } elsif ($sym == DC::SDLK_DELETE) {
1755 substr $text, $self->{cursor}, 1, ""; 2171 substr $text, $self->{cursor}, 1, "";
1756 } elsif ($sym == CFClient::SDLK_LEFT) { 2172 } elsif ($sym == DC::SDLK_LEFT) {
1757 --$self->{cursor} if $self->{cursor}; 2173 --$self->{cursor} if $self->{cursor};
1758 } elsif ($sym == CFClient::SDLK_RIGHT) { 2174 } elsif ($sym == DC::SDLK_RIGHT) {
1759 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2175 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 2176 } elsif ($sym == DC::SDLK_HOME) {
2177 # what a hack
2178 $self->{cursor} =
2179 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2180 ? length $1
2181 : 0;
2182 } elsif ($sym == DC::SDLK_END) {
2183 # uh, again
2184 $self->{cursor} =
2185 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2186 ? $self->{cursor} + length $1
2187 : length $self->{text};
2188 } elsif ($uni == 21) { # ctrl-u
2189 $text = "";
1761 $self->{cursor} = 0; 2190 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 2191 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 2192 $self->emit ('escape');
1766 } elsif ($uni) { 2193 } elsif ($uni == 0x0d) {
2194 substr $text, $self->{cursor}++, 0, "\012";
2195 } elsif ($uni >= 0x20) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 2196 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 2197 } else {
1769 return 0; 2198 return 0;
1770 } 2199 }
1771 2200
1772 $self->_set_text ($text); 2201 $self->_set_text ($text);
1773 2202
1774 $self->realloc; 2203 $self->realloc;
2204 $self->update;
1775 2205
1776 1 2206 1
1777} 2207}
1778 2208
1779sub focus_in { 2209sub invoke_focus_in {
1780 my ($self) = @_; 2210 my ($self) = @_;
1781 2211
1782 $self->{last_activity} = $::NOW; 2212 $self->{last_activity} = $::NOW;
1783 2213
1784 $self->SUPER::focus_in; 2214 $self->SUPER::invoke_focus_in
1785} 2215}
1786 2216
1787sub button_down { 2217sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1789 2219
1790 $self->SUPER::button_down ($ev, $x, $y); 2220 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 2221
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 2222 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 2223
1794 # byte-index to char-index 2224 # byte-index to char-index
1795 my $text = $self->{text}; 2225 my $text = $self->{text};
1796 utf8::encode $text; 2226 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797 $self->{cursor} = length substr $text, 0, $idx; 2227 $self->{cursor} = length $text;
1798 2228
1799 $self->_set_text ($self->{text}); 2229 $self->_set_text ($self->{text});
1800 $self->update; 2230 $self->update;
1801 2231
1802 1 2232 1
1803} 2233}
1804 2234
1805sub mouse_motion { 2235sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 2236 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2237# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 2238
1809 0 2239 1
1810} 2240}
1811 2241
1812sub _draw { 2242sub _draw {
1813 my ($self) = @_; 2243 my ($self) = @_;
1814 2244
… …
1821 glColor_premultiply @{$self->{bg}}; 2251 glColor_premultiply @{$self->{bg}};
1822 } 2252 }
1823 2253
1824 glEnable GL_BLEND; 2254 glEnable GL_BLEND;
1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2255 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}; 2256 glRect 0, 0, $self->{w}, $self->{h};
1830 glVertex $self->{w}, 0;
1831 glEnd;
1832 glDisable GL_BLEND; 2257 glDisable GL_BLEND;
1833 2258
1834 $self->SUPER::_draw; 2259 $self->SUPER::_draw;
1835 2260
1836 #TODO: force update every cursor change :( 2261 #TODO: force update every cursor change :(
… …
1838 2263
1839 unless (exists $self->{cur_h}) { 2264 unless (exists $self->{cur_h}) {
1840 my $text = substr $self->{text}, 0, $self->{cursor}; 2265 my $text = substr $self->{text}, 0, $self->{cursor};
1841 utf8::encode $text; 2266 utf8::encode $text;
1842 2267
1843 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2268 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1844 } 2269 }
1845 2270
1846 glColor @{$self->{fg}}; 2271 glColor_premultiply @{$self->{active_fg}};
1847 glBegin GL_LINES; 2272 glBegin GL_LINES;
1848 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2273 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}; 2274 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1850 glEnd; 2275 glEnd;
1851 }
1852}
1853 2276
2277 glLineWidth 3;
2278 glColor @{$self->{active_outline}};
2279 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2280 glLineWidth 1;
2281
2282 } else {
2283 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2284 glBegin GL_LINE_STRIP;
2285 glVertex .5, $self->{h} * .5;
2286 glVertex .5, $self->{h} - 2.5;
2287 glVertex $self->{w} - .5, $self->{h} - 2.5;
2288 glVertex $self->{w} - .5, $self->{h} * .5;
2289 glEnd;
2290 }
2291}
2292
2293#############################################################################
2294
1854package CFClient::UI::Entry; 2295package DC::UI::Entry;
1855 2296
1856our @ISA = CFClient::UI::EntryBase::; 2297our @ISA = DC::UI::EntryBase::;
1857 2298
1858use CFClient::OpenGL; 2299use DC::OpenGL;
1859 2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 history_pointer => -1,
2306 @_
2307 )
2308}
2309
2310
1860sub key_down { 2311sub invoke_key_down {
1861 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1862 2313
1863 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1864 2315
1865 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1866 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
2319
1868 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 2322 $self->emit (activate => $txt);
1871 $self->update; 2323 $self->update;
1872 2324
1873 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == DC::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1876 } 2328 }
1877 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1878 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1880 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1881 } 2333 }
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } 2335 }
1884 2336
1885 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == DC::SDLK_DOWN) {
1886 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1887 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888 2340
1889 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1890 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1891 } else { 2343 } else {
2344 if (defined $self->{history_saveback}) {
1892 $self->set_text ($self->{history_saveback}); 2345 $self->set_text ($self->{history_saveback});
2346 $self->{history_saveback} = undef;
2347 }
1893 } 2348 }
1894 2349
1895 } else { 2350 } else {
1896 return $self->SUPER::key_down ($ev) 2351 return $self->SUPER::invoke_key_down ($ev)
1897 } 2352 }
1898 2353
1899 1 2354 1
1900} 2355}
1901 2356
1902############################################################################# 2357#############################################################################
1903 2358
1904package CFClient::UI::Button; 2359package DC::UI::TextEdit;
1905 2360
1906our @ISA = CFClient::UI::Label::; 2361our @ISA = DC::UI::EntryBase::;
1907 2362
1908use CFClient::OpenGL; 2363use DC::OpenGL;
1909
1910my @tex =
1911 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1912 qw(b1_button_active.png);
1913 2364
1914sub new { 2365sub new {
1915 my $class = shift; 2366 my $class = shift;
1916 2367
1917 $class->SUPER::new ( 2368 $class->SUPER::new (
1918 padding_x => 4,
1919 padding_y => 4, 2369 padding_y => 4,
1920 fg => [1, 1, 1], 2370
1921 active_fg => [0, 0, 1], 2371 @_
2372 )
2373}
2374
2375sub move_cursor_ver {
2376 my ($self, $dy) = @_;
2377
2378 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2379
2380 $line += $dy;
2381
2382 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2383 $self->{cursor} = $index;
2384 delete $self->{cur_h};
2385 $self->update;
2386 return;
2387 }
2388}
2389
2390sub invoke_key_down {
2391 my ($self, $ev) = @_;
2392
2393 my $sym = $ev->{sym};
2394
2395 if ($sym == DC::SDLK_UP) {
2396 $self->move_cursor_ver (-1);
2397 } elsif ($sym == DC::SDLK_DOWN) {
2398 $self->move_cursor_ver (+1);
2399 } else {
2400 return $self->SUPER::invoke_key_down ($ev)
2401 }
2402
2403 1
2404}
2405
2406#############################################################################
2407
2408package DC::UI::ButtonBin;
2409
2410our @ISA = DC::UI::Bin::;
2411
2412use DC::OpenGL;
2413
2414my @tex =
2415 map { new_from_resource DC::Texture $_, mipmap => 1 }
2416 qw(b1_button_inactive.png b1_button_active.png);
2417
2418sub new {
2419 my $class = shift;
2420
2421 $class->SUPER::new (
1922 can_hover => 1, 2422 can_hover => 1,
1923 align => 0, 2423 align => 0.5,
1924 valign => 0, 2424 valign => 0.5,
1925 can_events => 1, 2425 can_events => 1,
1926 @_ 2426 @_
1927 ) 2427 )
1928} 2428}
1929 2429
1930sub activate { }
1931
1932sub button_up { 2430sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
1934 2432
1935 $self->emit ("activate") 2433 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 2434 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 2435 && $y >= 0 && $y < $self->{h};
… …
1940} 2438}
1941 2439
1942sub _draw { 2440sub _draw {
1943 my ($self) = @_; 2441 my ($self) = @_;
1944 2442
1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1946
1947 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1949 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
1950 2446
2447 my $tex = $tex[$GRAB == $self];
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 2449
1953 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
1954 2451
1955 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
1956} 2453}
1957 2454
1958############################################################################# 2455#############################################################################
1959 2456
1960package CFClient::UI::CheckBox; 2457package DC::UI::Button;
1961 2458
1962our @ISA = CFClient::UI::DrawBG::; 2459our @ISA = DC::UI::Label::;
2460
2461use DC::OpenGL;
1963 2462
1964my @tex = 2463my @tex =
1965 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2464 map { new_from_resource DC::Texture $_, mipmap => 1 }
2465 qw(b1_button_inactive.png b1_button_active.png);
2466
2467sub new {
2468 my $class = shift;
2469
2470 $class->SUPER::new (
2471 padding_x => 8,
2472 padding_y => 4,
2473 fg => [1.0, 1.0, 1.0],
2474 active_fg => [0.8, 0.8, 0.8],
2475 can_hover => 1,
2476 align => 0.5,
2477 valign => 0.5,
2478 can_events => 1,
2479 @_
2480 )
2481}
2482
2483sub invoke_button_up {
2484 my ($self, $ev, $x, $y) = @_;
2485
2486 $self->emit ("activate")
2487 if $x >= 0 && $x < $self->{w}
2488 && $y >= 0 && $y < $self->{h};
2489
2490 1
2491}
2492
2493sub _draw {
2494 my ($self) = @_;
2495
2496 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2497
2498 glEnable GL_TEXTURE_2D;
2499 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2500 glColor 0, 0, 0, 1;
2501
2502 my $tex = $tex[$GRAB == $self];
2503 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2504
2505 glDisable GL_TEXTURE_2D;
2506
2507 $self->SUPER::_draw;
2508}
2509
2510#############################################################################
2511
2512package DC::UI::CheckBox;
2513
2514our @ISA = DC::UI::DrawBG::;
2515
2516my @tex =
2517 map { new_from_resource DC::Texture $_, mipmap => 1 }
1966 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2518 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967 2519
1968use CFClient::OpenGL; 2520use DC::OpenGL;
1969 2521
1970sub new { 2522sub new {
1971 my $class = shift; 2523 my $class = shift;
1972 2524
1973 $class->SUPER::new ( 2525 $class->SUPER::new (
… …
1987 my ($self) = @_; 2539 my ($self) = @_;
1988 2540
1989 (6) x 2 2541 (6) x 2
1990} 2542}
1991 2543
2544sub toggle {
2545 my ($self) = @_;
2546
2547 $self->{state} = !$self->{state};
2548 $self->emit (changed => $self->{state});
2549 $self->update;
2550}
2551
1992sub button_down { 2552sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2553 my ($self, $ev, $x, $y) = @_;
1994 2554
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2555 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2556 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2557 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2558 } else {
2000 return 0 2559 return 0
2001 } 2560 }
2002 2561
2003 1 2562 1
… …
2006sub _draw { 2565sub _draw {
2007 my ($self) = @_; 2566 my ($self) = @_;
2008 2567
2009 $self->SUPER::_draw; 2568 $self->SUPER::_draw;
2010 2569
2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2570 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2012 2571
2013 my ($w, $h) = @$self{qw(w h)}; 2572 my ($w, $h) = @$self{qw(w h)};
2014 2573
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2574 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2016 2575
… …
2023 glDisable GL_TEXTURE_2D; 2582 glDisable GL_TEXTURE_2D;
2024} 2583}
2025 2584
2026############################################################################# 2585#############################################################################
2027 2586
2028package CFClient::UI::Image; 2587package DC::UI::Image;
2029 2588
2030our @ISA = CFClient::UI::Base::; 2589our @ISA = DC::UI::Base::;
2031 2590
2032use CFClient::OpenGL; 2591use DC::OpenGL;
2033use Carp qw/confess/;
2034 2592
2035our %loaded_images; 2593our %texture_cache;
2036 2594
2037sub new { 2595sub new {
2038 my $class = shift; 2596 my $class = shift;
2039 2597
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2598 my $self = $class->SUPER::new (
2599 can_events => 0,
2600 scale => 1,
2601 @_,
2602 );
2041 2603
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2604 $self->{path} || $self->{tex}
2605 or Carp::croak "'path' or 'tex' attributes required";
2043 2606
2044 $loaded_images{$self->{image}} ||= 2607 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2608 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2046 2609
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2610 DC::weaken $texture_cache{$self->{path}};
2048 2611
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2612 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2613
2053 $self 2614 $self
2054} 2615}
2055 2616
2617sub STORABLE_freeze {
2618 my ($self, $cloning) = @_;
2619
2620 $self->{path}
2621 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2622
2623 $self->{path}
2624}
2625
2626sub STORABLE_attach {
2627 my ($self, $cloning, $path) = @_;
2628
2629 $self->new (path => $path)
2630}
2631
2056sub size_request { 2632sub size_request {
2057 my ($self) = @_; 2633 my ($self) = @_;
2058 2634
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2635 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2060} 2636}
2061 2637
2062sub _draw { 2638sub _draw {
2063 my ($self) = @_; 2639 my ($self) = @_;
2064 2640
… …
2081 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2082} 2658}
2083 2659
2084############################################################################# 2660#############################################################################
2085 2661
2662package DC::UI::ImageButton;
2663
2664our @ISA = DC::UI::Image::;
2665
2666use DC::OpenGL;
2667
2668my %textures;
2669
2670sub new {
2671 my $class = shift;
2672
2673 my $self = $class->SUPER::new (
2674 padding_x => 4,
2675 padding_y => 4,
2676 fg => [1, 1, 1],
2677 active_fg => [0, 0, 1],
2678 can_hover => 1,
2679 align => 0.5,
2680 valign => 0.5,
2681 can_events => 1,
2682 @_
2683 );
2684}
2685
2686sub invoke_button_down {
2687 my ($self, $ev, $x, $y) = @_;
2688
2689 1
2690}
2691
2692sub invoke_button_up {
2693 my ($self, $ev, $x, $y) = @_;
2694
2695 $self->emit ("activate")
2696 if $x >= 0 && $x < $self->{w}
2697 && $y >= 0 && $y < $self->{h};
2698
2699 1
2700}
2701
2702#############################################################################
2703
2086package CFClient::UI::VGauge; 2704package DC::UI::VGauge;
2087 2705
2088our @ISA = CFClient::UI::Base::; 2706our @ISA = DC::UI::Base::;
2089 2707
2090use List::Util qw(min max); 2708use List::Util qw(min max);
2091 2709
2092use CFClient::OpenGL; 2710use DC::OpenGL;
2093 2711
2094my %tex = ( 2712my %tex = (
2095 food => [ 2713 food => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2714 map { new_from_resource DC::Texture $_, mipmap => 1 }
2097 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2715 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098 ], 2716 ],
2099 grace => [ 2717 grace => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2718 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/ 2719 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2102 ], 2720 ],
2103 hp => [ 2721 hp => [
2104 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2722 map { new_from_resource DC::Texture $_, mipmap => 1 }
2105 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2723 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106 ], 2724 ],
2107 mana => [ 2725 mana => [
2108 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2726 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/ 2727 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2110 ], 2728 ],
2111); 2729);
2112 2730
2113# eg. VGauge->new (gauge => 'food'), default gauge: food 2731# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2173 my $ycut1 = max 0, min 1, $ycut; 2791 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2792 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2793
2176 my $h1 = $self->{h} * (1 - $ycut1); 2794 my $h1 = $self->{h} * (1 - $ycut1);
2177 my $h2 = $self->{h} * (1 - $ycut2); 2795 my $h2 = $self->{h} * (1 - $ycut2);
2796 my $h3 = $self->{h};
2797
2798 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178 2799
2179 glEnable GL_BLEND; 2800 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2801 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2802 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2803 glEnable GL_TEXTURE_2D;
… …
2201 2822
2202 if ($t3) { 2823 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2824 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2825 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2826 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2827 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2828 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2829 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2830 glEnd;
2210 } 2831 }
2211 2832
2212 glDisable GL_BLEND; 2833 glDisable GL_BLEND;
2213 glDisable GL_TEXTURE_2D; 2834 glDisable GL_TEXTURE_2D;
2214} 2835}
2215 2836
2216############################################################################# 2837#############################################################################
2217 2838
2839package DC::UI::Progress;
2840
2841our @ISA = DC::UI::Label::;
2842
2843use DC::OpenGL;
2844
2845sub new {
2846 my ($class, %arg) = @_;
2847
2848 my $self = $class->SUPER::new (
2849 padding_x => 2,
2850 padding_y => 2,
2851 fg => [1, 1, 1],
2852 bg => [0, 0, 1, 0.2],
2853 bar => [0.7, 0.5, 0.1, 0.8],
2854 outline => [0.4, 0.3, 0],
2855 fontsize => 0.9,
2856 valign => 0.5,
2857 align => 0.5,
2858 can_events => 1,
2859 ellipsise => 1,
2860 label => "%d%%",
2861 %arg,
2862 );
2863
2864 $self->set_value ($arg{value} || -1);
2865
2866 $self
2867}
2868
2869sub set_label {
2870 my ($self, $label) = @_;
2871
2872 return if $self->{label} eq $label;
2873 $self->{label} = $label;
2874
2875 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2876}
2877
2878sub set_value {
2879 my ($self, $value) = @_;
2880
2881 if ($self->{value} ne $value) {
2882 $self->{value} = $value;
2883
2884 if ($value < 0) {
2885 $self->set_text ("-");
2886 } else {
2887 $self->set_text (sprintf $self->{label}, $value * 100);
2888 }
2889
2890 $self->update;
2891 }
2892}
2893
2894sub _draw {
2895 my ($self) = @_;
2896
2897 glEnable GL_BLEND;
2898 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2899
2900 my $px = $self->{padding_x};
2901 my $py = $self->{padding_y};
2902
2903 if ($self->{value} >= 0) {
2904 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2905
2906 glColor_premultiply @{$self->{bar}};
2907 glRect $px, $py, $s, $self->{h} - $py;
2908 glColor_premultiply @{$self->{bg}};
2909 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2910 }
2911
2912 glColor_premultiply @{$self->{outline}};
2913
2914 $px -= .5;
2915 $py -= .5;
2916
2917 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2918
2919 glDisable GL_BLEND;
2920
2921 {
2922 local $self->{bg}; # do not draw background
2923 $self->SUPER::_draw;
2924 }
2925}
2926
2927#############################################################################
2928
2929package DC::UI::ExperienceProgress;
2930
2931our @ISA = DC::UI::Progress::;
2932
2933sub new {
2934 my ($class, %arg) = @_;
2935
2936 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2937
2938 my $self = $class->SUPER::new (
2939 %arg,
2940 tooltip => sub {
2941 my ($self) = @_;
2942
2943 sprintf "%slevel %d\n%s points\n%s next level\n%s to go",
2944 $tt,
2945 $self->{lvl},
2946 ::formsep ($self->{exp}),
2947 ::formsep ($self->{nxt}),
2948 ::formsep ($self->{nxt} - $self->{exp}),
2949 },
2950 );
2951
2952 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2953 if $::CONN;
2954
2955 $self
2956}
2957
2958sub DESTROY {
2959 my ($self) = @_;
2960
2961 delete $::CONN->{on_exp_update}{$self+0}
2962 if $::CONN;
2963
2964 $self->SUPER::DESTROY;
2965}
2966
2967sub set_value {
2968 my ($self, $lvl, $exp) = @_;
2969
2970 $self->{lvl} = $lvl;
2971 $self->{exp} = $exp;
2972
2973 my $v = -1;
2974
2975 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2976 my $l0 = $table->[$lvl - 1];
2977 my $l1 = $table->[$lvl];
2978
2979 $self->{nxt} = $l1;
2980
2981 $v = ($exp - $l0) / ($l1 - $l0);
2982 }
2983
2984 $self->SUPER::set_value ($v);
2985}
2986
2987#############################################################################
2988
2218package CFClient::UI::Gauge; 2989package DC::UI::Gauge;
2219 2990
2220our @ISA = CFClient::UI::VBox::; 2991our @ISA = DC::UI::VBox::;
2221 2992
2222sub new { 2993sub new {
2223 my ($class, %arg) = @_; 2994 my ($class, %arg) = @_;
2224 2995
2225 my $self = $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
… …
2227 can_hover => 1, 2998 can_hover => 1,
2228 can_events => 1, 2999 can_events => 1,
2229 %arg, 3000 %arg,
2230 ); 3001 );
2231 3002
2232 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 3003 $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); 3004 $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"); 3005 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2235 3006
2236 $self 3007 $self
2237} 3008}
2238 3009
2239sub set_fontsize { 3010sub set_fontsize {
… …
2260 $self->{value}->set_text ($val); 3031 $self->{value}->set_text ($val);
2261} 3032}
2262 3033
2263############################################################################# 3034#############################################################################
2264 3035
2265package CFClient::UI::Slider; 3036package DC::UI::Slider;
2266 3037
2267use strict; 3038use strict;
2268 3039
2269use CFClient::OpenGL; 3040use DC::OpenGL;
2270 3041
2271our @ISA = CFClient::UI::DrawBG::; 3042our @ISA = DC::UI::DrawBG::;
2272 3043
2273my @tex = 3044my @tex =
2274 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3045 map { new_from_resource DC::Texture $_ }
2275 qw(s1_slider.png s1_slider_bg.png); 3046 qw(s1_slider.png s1_slider_bg.png);
2276 3047
2277sub new { 3048sub new {
2278 my $class = shift; 3049 my $class = shift;
2279 3050
… …
2300 $self->update; 3071 $self->update;
2301 3072
2302 $self 3073 $self
2303} 3074}
2304 3075
2305sub changed { }
2306
2307sub set_range { 3076sub set_range {
2308 my ($self, $range) = @_; 3077 my ($self, $range) = @_;
2309 3078
2310 ($range, $self->{range}) = ($self->{range}, $range); 3079 ($range, $self->{range}) = ($self->{range}, $range);
2311 3080
… …
2318sub set_value { 3087sub set_value {
2319 my ($self, $value) = @_; 3088 my ($self, $value) = @_;
2320 3089
2321 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2322 3091
2323 $hi = $lo + 1 if $hi <= $lo; 3092 $hi = $lo if $hi < $lo;
2324 3093
2325 $page = $hi - $lo if $page > $hi - $lo; 3094 $value = $hi - $page if $value > $hi - $page;
2326
2327 $value = $lo if $value < $lo; 3095 $value = $lo if $value < $lo;
2328 $value = $hi - $page if $value > $hi - $page;
2329 3096
2330 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2331 if $unit; 3098 if $unit;
2332 3099
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3100 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 3101
2335 if ($value != $old_value) { 3102 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 3103 $self->emit (changed => $value);
2337 $self->update; 3104 $self->update;
2338 } 3105 }
2339} 3106}
2340 3107
2341sub size_request { 3108sub size_request {
2342 my ($self) = @_; 3109 my ($self) = @_;
2343 3110
2344 ($self->{req_w}, $self->{req_h}) 3111 ($self->{req_w}, $self->{req_h})
2345} 3112}
2346 3113
2347sub button_down { 3114sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2349 3116
2350 $self->SUPER::button_down ($ev, $x, $y); 3117 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 3118
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3119 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 3120
2354 $self->mouse_motion ($ev, $x, $y) 3121 $self->invoke_mouse_motion ($ev, $x, $y);
2355}
2356 3122
3123 1
3124}
3125
2357sub mouse_motion { 3126sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2359 3128
2360 if ($GRAB == $self) { 3129 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 3131
… …
2370 } 3139 }
2371 3140
2372 1 3141 1
2373} 3142}
2374 3143
3144sub invoke_mouse_wheel {
3145 my ($self, $ev) = @_;
3146
3147 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3148
3149 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3150
3151 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3152
3153 1
3154}
3155
2375sub update { 3156sub update {
2376 my ($self) = @_; 3157 my ($self) = @_;
2377 3158
2378 delete $self->{knob_w}; 3159 delete $self->{knob_w};
2379 $self->SUPER::update; 3160 $self->SUPER::update;
… …
2383 my ($self) = @_; 3164 my ($self) = @_;
2384 3165
2385 unless ($self->{knob_w}) { 3166 unless ($self->{knob_w}) {
2386 $self->set_value ($self->{range}[0]); 3167 $self->set_value ($self->{range}[0]);
2387 3168
2388 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3169 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2389 my $range = ($hi - $page - $lo) || 1e-100; 3170 my $range = ($hi - $page - $lo) || 1e-10;
2390 3171
2391 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3172 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2392 3173
2393 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2394 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2395 3176
2396 $value = ($value - $lo) / $range; 3177 $value = ($value - $lo) / $range;
… …
2426 glDisable GL_TEXTURE_2D; 3207 glDisable GL_TEXTURE_2D;
2427} 3208}
2428 3209
2429############################################################################# 3210#############################################################################
2430 3211
2431package CFClient::UI::ValSlider; 3212package DC::UI::ValSlider;
2432 3213
2433our @ISA = CFClient::UI::HBox::; 3214our @ISA = DC::UI::HBox::;
2434 3215
2435sub new { 3216sub new {
2436 my ($class, %arg) = @_; 3217 my ($class, %arg) = @_;
2437 3218
2438 my $range = delete $arg{range}; 3219 my $range = delete $arg{range};
2439 3220
2440 my $self = $class->SUPER::new ( 3221 my $self = $class->SUPER::new (
2441 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3222 slider => (new DC::UI::Slider expand => 1, range => $range),
2442 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3223 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2443 to_value => sub { shift }, 3224 to_value => sub { shift },
2444 from_value => sub { shift }, 3225 from_value => sub { shift },
2445 %arg, 3226 %arg,
2446 ); 3227 );
2447 3228
… …
2467sub set_range { shift->{slider}->set_range (@_) } 3248sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 3249sub set_value { shift->{slider}->set_value (@_) }
2469 3250
2470############################################################################# 3251#############################################################################
2471 3252
2472package CFClient::UI::TextView; 3253package DC::UI::TextScroller;
2473 3254
2474our @ISA = CFClient::UI::HBox::; 3255our @ISA = DC::UI::HBox::;
2475 3256
2476use CFClient::OpenGL; 3257use DC::OpenGL;
2477 3258
2478sub new { 3259sub new {
2479 my $class = shift; 3260 my $class = shift;
2480 3261
2481 my $self = $class->SUPER::new ( 3262 my $self = $class->SUPER::new (
2482 fontsize => 1, 3263 fontsize => 1,
2483 can_events => 0, 3264 can_events => 1,
2484 indent => 0, 3265 indent => 0,
2485 #font => default_font 3266 #font => default_font
2486 @_, 3267 @_,
2487 3268
2488 layout => (new CFClient::Layout 1), 3269 layout => (new DC::Layout),
2489 par => [], 3270 par => [],
3271 max_par => 0,
2490 height => 0, 3272 height => 0,
2491 children => [ 3273 children => [
2492 (new CFClient::UI::Empty expand => 1), 3274 (new DC::UI::Empty expand => 1),
2493 (new CFClient::UI::Slider vertical => 1), 3275 (new DC::UI::Slider vertical => 1),
2494 ], 3276 ],
2495 ); 3277 );
2496 3278
2497 $self->{children}[1]->connect (changed => sub { $self->update }); 3279 $self->{children}[1]->connect (changed => sub { $self->update });
2498 3280
… …
2504 3286
2505 $self->{fontsize} = $fontsize; 3287 $self->{fontsize} = $fontsize;
2506 $self->reflow; 3288 $self->reflow;
2507} 3289}
2508 3290
3291sub size_request {
3292 my ($self) = @_;
3293
3294 my ($empty, $slider) = $self->visible_children;
3295
3296 local $self->{children} = [$empty, $slider];
3297 $self->SUPER::size_request
3298}
3299
2509sub size_allocate { 3300sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 3301 my ($self, $w, $h) = @_;
2511 3302
2512 $self->SUPER::size_allocate ($w, $h); 3303 my ($empty, $slider, @other) = @{ $self->{children} };
3304 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 3305
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3306 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3307 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 3308 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3309 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 3310
2519 $self->reflow; 3311 $self->reflow;
2520}
2521 3312
2522sub text_size { 3313 local $self->{children} = [$empty, $slider];
3314 $self->SUPER::invoke_size_allocate ($w, $h)
3315}
3316
3317sub invoke_mouse_wheel {
2523 my ($self, $text, $indent) = @_; 3318 my ($self, $ev) = @_;
3319
3320 return 0 unless $ev->{dy}; # only vertical movements
3321
3322 $self->{children}[1]->emit (mouse_wheel => $ev);
3323
3324 1
3325}
3326
3327sub get_layout {
3328 my ($self, $para) = @_;
2524 3329
2525 my $layout = $self->{layout}; 3330 my $layout = $self->{layout};
2526 3331
3332 $layout->set_font ($self->{font}) if $self->{font};
3333 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3334 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 3335 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3336 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 3337 $layout->set_markup ($para->{markup});
3338
3339 $layout->set_shapes (
3340 map
3341 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3342 @{$para->{widget}}
2531 3343 );
3344
2532 $layout->size 3345 $layout
2533} 3346}
2534 3347
2535sub reflow { 3348sub reflow {
2536 my ($self) = @_; 3349 my ($self) = @_;
2537 3350
… …
2544 3357
2545 # todo: base offset on lines or so, not on pixels 3358 # todo: base offset on lines or so, not on pixels
2546 $self->{children}[1]->set_value ($offset); 3359 $self->{children}[1]->set_value ($offset);
2547} 3360}
2548 3361
3362sub current_paragraph {
3363 my ($self) = @_;
3364
3365 $self->{top_paragraph} - 1
3366}
3367
3368sub scroll_to {
3369 my ($self, $para) = @_;
3370
3371 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3372
3373 $self->{scroll_to} = $para;
3374 $self->update;
3375}
3376
2549sub clear { 3377sub clear {
2550 my ($self) = @_; 3378 my ($self) = @_;
3379
3380 my (undef, undef, @other) = @{ $self->{children} };
3381 $self->remove ($_) for @other;
2551 3382
2552 $self->{par} = []; 3383 $self->{par} = [];
2553 $self->{height} = 0; 3384 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3385 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 3386}
2556 3387
2557sub add_paragraph { 3388sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 3389 my $self = shift;
2559 3390
2560 for my $line (split /\n/, $text) { 3391 for my $para (@_) {
2561 my ($w, $h) = $self->text_size ($line); 3392 $para = {
3393 fg => [1, 1, 1, 1],
3394 indent => 0,
3395 markup => "",
3396 widget => [],
3397 ref $para ? %$para : (markup => $para),
3398 w => 1e10,
3399 wrapped => 1,
3400 };
3401
3402 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3403 push @{$self->{par}}, $para;
3404 }
3405
3406 if (my $max = $self->{max_par}) {
3407 shift @{$self->{par}} while @{$self->{par}} > $max;
3408 }
3409
3410 $self->{need_reflow}++;
3411 $self->update;
3412}
3413
3414sub scroll_to_bottom {
3415 my ($self) = @_;
3416
3417 $self->{scroll_to} = $#{$self->{par}};
3418 $self->update;
3419}
3420
3421sub force_uptodate {
3422 my ($self) = @_;
3423
3424 if (delete $self->{need_reflow}) {
3425 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3426
3427 my $height = 0;
3428
3429 for my $para (@{$self->{par}}) {
3430 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3431 my $layout = $self->get_layout ($para);
3432 my ($w, $h) = $layout->size;
3433
3434 $para->{w} = $w + $para->{indent};
3435 $para->{h} = $h;
3436 $para->{wrapped} = $layout->has_wrapped;
3437 }
3438
3439 $para->{y} = $height;
3440 $height += $para->{h};
3441 }
3442
2562 $self->{height} += $h; 3443 $self->{height} = $height;
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3444 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2564 }
2565 3445
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3446 delete $self->{texture};
3447 }
3448
3449 if (my $paridx = delete $self->{scroll_to}) {
3450 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3451 }
2567} 3452}
2568 3453
2569sub update { 3454sub update {
2570 my ($self) = @_; 3455 my ($self) = @_;
2571 3456
… …
2574 return unless $self->{h} > 0; 3459 return unless $self->{h} > 0;
2575 3460
2576 delete $self->{texture}; 3461 delete $self->{texture};
2577 3462
2578 $ROOT->on_post_alloc ($self => sub { 3463 $ROOT->on_post_alloc ($self => sub {
3464 $self->force_uptodate;
3465
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3466 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 3467
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 { 3468 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 3469 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 3470 glClear GL_COLOR_BUFFER_BIT;
2611 3471
3472 package DC::UI::Base;
3473 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3474 (0, 0, $self->{w}, $self->{h});
3475
3476 my $top = int $self->{children}[1]{range}[0];
3477
3478 my $paridx = 0;
3479 my $top_paragraph;
2612 my $top = int $self->{children}[1]{range}[0]; 3480 my $top = int $self->{children}[1]{range}[0];
2613 3481
2614 my $y0 = $top; 3482 my $y0 = $top;
2615 my $y1 = $top + $H; 3483 my $y1 = $top + $H;
2616 3484
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}}) { 3485 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 3486 my $h = $para->{h};
3487 my $y = $para->{y};
2629 3488
2630 if ($y0 < $y + $h && $y < $y1) { 3489 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 3490 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 3491
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3492 $layout->render ($para->{indent}, $y - $y0);
3493 $layout->draw;
2637 3494
2638 glRasterPos $par->[3], $y - $y0; 3495 if (my @w = @{ $para->{widget} }) {
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3496 my @s = $layout->get_shapes;
3497
3498 for (@w) {
3499 my ($dx, $dy) = splice @s, 0, 2, ();
3500
3501 $_->{x} = $dx + $para->{indent};
3502 $_->{y} = $dy + $y - $y0;
3503
3504 $_->draw;
3505 }
3506 }
2640 } 3507 }
2641 3508
2642 $y += $h; 3509 $paridx++;
3510 $top_paragraph ||= $paridx if $y >= $top;
2643 } 3511 }
2644 3512
2645 glDisable GL_BLEND; 3513 $self->{top_paragraph} = $top_paragraph;
2646 }; 3514 };
2647 }); 3515 });
3516}
3517
3518sub reconfigure {
3519 my ($self) = @_;
3520
3521 $self->SUPER::reconfigure;
3522
3523 $_->{w} = 1e10 for @{ $self->{par} };
3524 $self->reflow;
2648} 3525}
2649 3526
2650sub _draw { 3527sub _draw {
2651 my ($self) = @_; 3528 my ($self) = @_;
2652 3529
… …
2655 glColor 0, 0, 0, 1; 3532 glColor 0, 0, 0, 1;
2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3533 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657 glDisable GL_TEXTURE_2D; 3534 glDisable GL_TEXTURE_2D;
2658 3535
2659 $self->{children}[1]->draw; 3536 $self->{children}[1]->draw;
2660
2661} 3537}
2662 3538
2663############################################################################# 3539#############################################################################
2664 3540
2665package CFClient::UI::Animator; 3541package DC::UI::Animator;
2666 3542
2667use CFClient::OpenGL; 3543use DC::OpenGL;
2668 3544
2669our @ISA = CFClient::UI::Bin::; 3545our @ISA = DC::UI::Bin::;
2670 3546
2671sub moveto { 3547sub moveto {
2672 my ($self, $x, $y) = @_; 3548 my ($self, $x, $y) = @_;
2673 3549
2674 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2702 glPopMatrix; 3578 glPopMatrix;
2703} 3579}
2704 3580
2705############################################################################# 3581#############################################################################
2706 3582
2707package CFClient::UI::Flopper; 3583package DC::UI::Flopper;
2708 3584
2709our @ISA = CFClient::UI::Button::; 3585our @ISA = DC::UI::Button::;
2710 3586
2711sub new { 3587sub new {
2712 my $class = shift; 3588 my $class = shift;
2713 3589
2714 my $self = $class->SUPER::new ( 3590 my $self = $class->SUPER::new (
… …
2726 $self->{other}->toggle_visibility; 3602 $self->{other}->toggle_visibility;
2727} 3603}
2728 3604
2729############################################################################# 3605#############################################################################
2730 3606
2731package CFClient::UI::Tooltip; 3607package DC::UI::Tooltip;
2732 3608
2733our @ISA = CFClient::UI::Bin::; 3609our @ISA = DC::UI::Bin::;
2734 3610
2735use CFClient::OpenGL; 3611use DC::OpenGL;
2736 3612
2737sub new { 3613sub new {
2738 my $class = shift; 3614 my $class = shift;
2739 3615
2740 $class->SUPER::new ( 3616 $class->SUPER::new (
… …
2744} 3620}
2745 3621
2746sub set_tooltip_from { 3622sub set_tooltip_from {
2747 my ($self, $widget) = @_; 3623 my ($self, $widget) = @_;
2748 3624
2749 my $tooltip = $widget->{tooltip}; 3625 my $tip = $widget->{tooltip};
3626 $tip = $tip->($widget) if "CODE" eq ref $tip;
3627
3628 $tip = DC::Pod::section_label tooltip => $1
3629 if $tip =~ /^#(.*)$/;
2750 3630
2751 if ($ENV{CFPLUS_DEBUG} & 2) { 3631 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 3632 $tip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3633 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 3634 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 3635 . "visible $widget->{visible}";
2756 } 3636 }
2757 3637
3638 $tip =~ s/^\n+//;
3639 $tip =~ s/\n+$//;
3640
2758 $self->add (new CFClient::UI::Label 3641 $self->add (new DC::UI::Label
3642 fg => $DC::THEME{tooltip_fg},
2759 markup => $tooltip, 3643 markup => $tip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3644 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3645 align => 0,
2761 fontsize => 0.8, 3646 fontsize => 0.8,
2762 fg => [0, 0, 0, 1], 3647 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2763 ellipsise => 0, 3648 ellipsise => 0,
2764 font => ($widget->{tooltip_font} || $::FONT_PROP), 3649 font => ($widget->{tooltip_font} || $::FONT_PROP),
2765 ); 3650 );
2766} 3651}
2767 3652
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3656 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 3657
2773 ($w + 4, $h + 4) 3658 ($w + 4, $h + 4)
2774} 3659}
2775 3660
2776sub size_allocate { 3661sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 3662 my ($self, $w, $h) = @_;
2778 3663
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 3664 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 3665}
2781 3666
2782sub visibility_change { 3667sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 3668 my ($self, $visible) = @_;
2784 3669
2785 return unless $visible; 3670 return unless $visible;
2786 3671
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 3672 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner} 3673 my $widget = $self->{owner}
2789 or return; 3674 or return;
2790 3675
3676 if ($widget->{visible}) {
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3677 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 3678
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3679 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $::WIDTH; 3680 if $x + $self->{w} > $self->{root}{w};
2795 3681
2796 $self->move_abs ($x, $y); 3682 $self->move_abs ($x, $y);
3683 } else {
3684 $self->hide;
3685 }
2797 }); 3686 });
2798} 3687}
2799 3688
2800sub _draw { 3689sub _draw {
2801 my ($self) = @_; 3690 my ($self) = @_;
2802 3691
2803 glTranslate 0.375, 0.375;
2804
2805 my ($w, $h) = @$self{qw(w h)}; 3692 my ($w, $h) = @$self{qw(w h)};
2806 3693
2807 glColor 1, 0.8, 0.4; 3694 glColor @{ $DC::THEME{tooltip_bg} };
2808 glBegin GL_QUADS; 3695 glRect 0, 0, $w, $h;
2809 glVertex 0 , 0;
2810 glVertex 0 , $h;
2811 glVertex $w, $h;
2812 glVertex $w, 0;
2813 glEnd;
2814 3696
2815 glColor 0, 0, 0; 3697 glColor @{ $DC::THEME{tooltip_border} };
2816 glBegin GL_LINE_LOOP; 3698 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 3699
2823 glTranslate 2 - 0.375, 2 - 0.375; 3700 glTranslate 2, 2;
2824 3701
2825 $self->SUPER::_draw; 3702 $self->SUPER::_draw;
2826} 3703}
2827 3704
2828############################################################################# 3705#############################################################################
2829 3706
2830package CFClient::UI::Face; 3707package DC::UI::Face;
2831 3708
2832our @ISA = CFClient::UI::Base::; 3709our @ISA = DC::UI::DrawBG::;
2833 3710
2834use CFClient::OpenGL; 3711use DC::OpenGL;
2835 3712
2836sub new { 3713sub new {
2837 my $class = shift; 3714 my $class = shift;
2838 3715
2839 my $self = $class->SUPER::new ( 3716 my $self = $class->SUPER::new (
3717 size_w => 32,
3718 size_h => 8,
2840 aspect => 1, 3719 aspect => 1,
2841 can_events => 0, 3720 can_events => 0,
2842 @_, 3721 @_,
2843 ); 3722 );
2844 3723
2845 if ($self->{anim} && $self->{animspeed}) { 3724 if ($self->{anim} && $self->{animspeed}) {
2846 Scalar::Util::weaken (my $widget = $self); 3725 DC::weaken (my $widget = $self);
2847 3726
2848 $self->{timer} = Event->timer ( 3727 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2849 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3728 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2850 hard => 1, 3729 return unless $::CONN;
2851 interval => $self->{animspeed}, 3730
2852 cb => sub { 3731 my $w = $widget
3732 or return;
3733
2853 ++$widget->{frame}; 3734 ++$w->{frame};
3735 $w->update_face;
3736
3737 # somehow, $widget can go away
2854 $widget->update; 3738 $w->update;
2855 }, 3739 $w->update_timer;
2856 ); 3740 };
3741
3742 $self->update_face;
3743 $self->update_timer;
2857 } 3744 }
2858 3745
2859 $self 3746 $self
2860} 3747}
2861 3748
3749sub update_timer {
3750 my ($self) = @_;
3751
3752 return unless $self->{timer};
3753
3754 if ($self->{visible}) {
3755 $self->{timer}->start;
3756 } else {
3757 $self->{timer}->stop;
3758 }
3759}
3760
3761sub update_face {
3762 my ($self) = @_;
3763
3764 if ($::CONN) {
3765 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3766 if ($anim && @$anim) {
3767 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3768 delete $self->{face_change_cb};
3769
3770 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3771 unless ($tex->{name} || $tex->{loading}) {
3772 $tex->upload (sub { $self->reconfigure });
3773 }
3774 }
3775 }
3776 }
3777 }
3778}
3779
2862sub size_request { 3780sub size_request {
2863 (32, 8) 3781 my ($self) = @_;
3782
3783 if ($::CONN) {
3784 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3785 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3786 if ($tex->{name}) {
3787 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3788 } elsif (!$tex->{loading}) {
3789 $tex->upload (sub { $self->reconfigure });
3790 }
3791 }
3792
3793 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3794 }
3795 }
3796
3797 ($self->{size_w} || 8, $self->{size_h} || 8)
2864} 3798}
2865 3799
2866sub update { 3800sub update {
2867 my ($self) = @_; 3801 my ($self) = @_;
2868 3802
2869 return unless $self->{visible}; 3803 return unless $self->{visible};
2870 3804
2871 $self->SUPER::update; 3805 $self->SUPER::update;
2872} 3806}
2873 3807
3808sub invoke_visibility_change {
3809 my ($self) = @_;
3810
3811 $self->update_timer;
3812
3813 0
3814}
3815
2874sub _draw { 3816sub _draw {
2875 my ($self) = @_; 3817 my ($self) = @_;
2876 3818
2877 return unless $::CONN; 3819 $self->SUPER::_draw;
2878 3820
2879 my $face; 3821 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; 3822 glEnable GL_TEXTURE_2D;
2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3823 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2893 glColor 0, 0, 0, 1; 3824 glColor 0, 0, 0, 1;
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3825 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3826 glDisable GL_TEXTURE_2D;
2896 } 3827 }
2897} 3828}
2898 3829
2899sub DESTROY { 3830sub destroy {
2900 my ($self) = @_; 3831 my ($self) = @_;
2901 3832
2902 $self->{timer}->cancel 3833 (delete $self->{timer})->cancel
2903 if $self->{timer}; 3834 if $self->{timer};
2904 3835
2905 $self->SUPER::DESTROY; 3836 $self->SUPER::destroy;
2906} 3837}
2907 3838
2908############################################################################# 3839#############################################################################
2909 3840
2910package CFClient::UI::Buttonbar; 3841package DC::UI::Buttonbar;
2911 3842
2912our @ISA = CFClient::UI::HBox::; 3843our @ISA = DC::UI::HBox::;
2913 3844
2914# TODO: should actualyl wrap buttons and other goodies. 3845# TODO: should actually wrap buttons and other goodies.
2915 3846
2916############################################################################# 3847#############################################################################
2917 3848
2918package CFClient::UI::Menu; 3849package DC::UI::Menu;
2919 3850
2920our @ISA = CFClient::UI::FancyFrame::; 3851our @ISA = DC::UI::Toplevel::;
2921 3852
2922use CFClient::OpenGL; 3853use DC::OpenGL;
2923 3854
2924sub new { 3855sub new {
2925 my $class = shift; 3856 my $class = shift;
2926 3857
2927 my $self = $class->SUPER::new ( 3858 my $self = $class->SUPER::new (
2928 items => [], 3859 items => [],
2929 z => 100, 3860 z => 100,
2930 @_, 3861 @_,
2931 ); 3862 );
2932 3863
2933 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3864 $self->add ($self->{vbox} = new DC::UI::VBox);
2934 3865
2935 for my $item (@{ $self->{items} }) { 3866 for my $item (@{ $self->{items} }) {
2936 my ($widget, $cb, $tooltip) = @$item; 3867 my ($widget, $cb, $tooltip) = @$item;
2937 3868
2938 # handle various types of items, only text for now 3869 # handle various types of items, only text for now
2939 if (!ref $widget) { 3870 if (!ref $widget) {
3871 if ($widget =~ /\t/) {
3872 my ($left, $right) = split /\t/, $widget, 2;
3873
2940 $widget = new CFClient::UI::Label 3874 $widget = new DC::UI::HBox
2941 can_hover => 1, 3875 can_hover => 1,
2942 can_events => 1, 3876 can_events => 1,
2943 text => $widget,
2944 tooltip => $tooltip 3877 tooltip => $tooltip,
3878 children => [
3879 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3880 (new DC::UI::Label markup => $right, align => 1),
3881 ],
3882 ;
3883
3884 } else {
3885 $widget = new DC::UI::Label
3886 can_hover => 1,
3887 can_events => 1,
3888 align => 0,
3889 markup => $widget,
3890 tooltip => $tooltip;
3891 }
2945 } 3892 }
2946 3893
2947 $self->{item}{$widget} = $item; 3894 $self->{item}{$widget} = $item;
2948 3895
2949 $self->{vbox}->add ($widget); 3896 $self->{vbox}->add ($widget);
… …
2954 3901
2955# popup given the event (must be a mouse button down event currently) 3902# popup given the event (must be a mouse button down event currently)
2956sub popup { 3903sub popup {
2957 my ($self, $ev) = @_; 3904 my ($self, $ev) = @_;
2958 3905
2959 $self->_emit ("popdown"); 3906 $self->emit ("popdown");
2960 3907
2961 # maybe save $GRAB? must be careful about events... 3908 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3909 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3910 $self->{button} = $ev->{button};
2964 3911
2965 $self->show; 3912 $self->show;
2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3913 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967}
2968 3914
3915 1 # so it can be used inside event handlers
3916}
3917
2969sub mouse_motion { 3918sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3919 my ($self, $ev, $x, $y) = @_;
2971 3920
2972 # TODO: should use vbox->find_widget or so 3921 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3922 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3923 $self->{hover} = $self->{item}{$HOVER};
2975 3924
2976 0 3925 0
2977} 3926}
2978 3927
2979sub button_up { 3928sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3929 my ($self, $ev, $x, $y) = @_;
2981 3930
2982 if ($ev->{button} == $self->{button}) { 3931 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3932 undef $GRAB;
2984 $self->hide; 3933 $self->hide;
2985 3934
2986 $self->_emit ("popdown"); 3935 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3936 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3937 } else {
2989 return 0 3938 return 0
2990 } 3939 }
2991 3940
2992 1 3941 1
2993} 3942}
2994 3943
2995############################################################################# 3944#############################################################################
2996 3945
2997package CFClient::UI::Multiplexer; 3946package DC::UI::Multiplexer;
2998 3947
2999our @ISA = CFClient::UI::Container::; 3948our @ISA = DC::UI::Container::;
3000 3949
3001sub new { 3950sub new {
3002 my $class = shift; 3951 my $class = shift;
3003 3952
3004 my $self = $class->SUPER::new ( 3953 my $self = $class->SUPER::new (
3005 @_, 3954 @_,
3006 ); 3955 );
3007 3956
3008 $self->{current} = $self->{children}[0] 3957 $self->set_current_page (0);
3009 if @{ $self->{children} };
3010 3958
3011 $self 3959 $self
3012} 3960}
3013 3961
3014sub add { 3962sub add {
3015 my ($self, @widgets) = @_; 3963 my ($self, @widgets) = @_;
3016 3964
3017 $self->SUPER::add (@widgets); 3965 $self->SUPER::add (@widgets);
3018 3966
3019 $self->{current} = $self->{children}[0] 3967 $self->set_current_page (0)
3020 if @{ $self->{children} }; 3968 if @widgets == @{ $self->{children} };
3969}
3970
3971sub get_current_page {
3972 my ($self) = @_;
3973
3974 $self->{current}
3021} 3975}
3022 3976
3023sub set_current_page { 3977sub set_current_page {
3024 my ($self, $page_or_widget) = @_; 3978 my ($self, $page_or_widget) = @_;
3025 3979
3026 my $widget = ref $page_or_widget 3980 my $widget = ref $page_or_widget
3027 ? $page_or_widget 3981 ? $page_or_widget
3028 : $self->{children}[$page_or_widget]; 3982 : $self->{children}[$page_or_widget];
3029 3983
3984 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3985
3030 $self->{current} = $widget; 3986 if (($self->{current} = $widget)) {
3987 $self->{current}->set_visible if $self->{current} && $self->{visible};
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3988 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3989
3033 $self->_emit (page_changed => $self->{current}); 3990 $self->emit (page_changed => $self->{current});
3991 }
3034 3992
3035 $self->realloc; 3993 $self->realloc;
3036} 3994}
3037 3995
3038sub visible_children { 3996sub visible_children {
3039 $_[0]{current} 3997 $_[0]{current} || ()
3040} 3998}
3041 3999
3042sub size_request { 4000sub size_request {
3043 my ($self) = @_; 4001 my ($self) = @_;
3044 4002
4003 $self->{current}
3045 $self->{current}->size_request 4004 ? $self->{current}->size_request
4005 : (0, 0)
3046} 4006}
3047 4007
3048sub size_allocate { 4008sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 4009 my ($self, $w, $h) = @_;
3050 4010
3051 $self->{current}->configure (0, 0, $w, $h); 4011 $self->{current}->configure (0, 0, $w, $h)
4012 if $self->{current};
4013
4014 1
3052} 4015}
3053 4016
3054sub _draw { 4017sub _draw {
3055 my ($self) = @_; 4018 my ($self) = @_;
3056 4019
3057 $self->{current}->draw; 4020 $self->{current}->draw
4021 if $self->{current};
3058} 4022}
3059 4023
3060############################################################################# 4024#############################################################################
3061 4025
3062package CFClient::UI::Notebook; 4026package DC::UI::Notebook;
3063 4027
4028use DC::OpenGL;
4029
3064our @ISA = CFClient::UI::VBox::; 4030our @ISA = DC::UI::VBox::;
3065 4031
3066sub new { 4032sub new {
3067 my $class = shift; 4033 my $class = shift;
3068 4034
3069 my $self = $class->SUPER::new ( 4035 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar), 4036 buttonbar => (new DC::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4037 multiplexer => (new DC::UI::Multiplexer expand => 1),
4038 active_outline => [.7, .7, 0.2],
3072 # filter => # will be put between multiplexer and $self 4039 # filter => # will be put between multiplexer and $self
3073 @_, 4040 @_,
3074 ); 4041 );
3075 4042
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4043 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4044 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078 4045
4046 {
4047 Scalar::Util::weaken (my $wself = $self);
4048
4049 $self->{multiplexer}->connect (c_add => sub {
4050 my ($mplex, $widgets) = @_;
4051
4052 for my $child (@$widgets) {
4053 Scalar::Util::weaken $child;
4054 $child->{c_tab_} ||= do {
4055 my $tab =
4056 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4057 ? $child->{c_tab}
4058 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4059
4060 $tab->connect (activate => sub {
4061 $wself->set_current_page ($child);
4062 });
4063
4064 $tab
4065 };
4066
4067 $self->{buttonbar}->add ($child->{c_tab_});
4068 }
4069 });
4070
4071 $self->{multiplexer}->connect (c_remove => sub {
4072 my ($mplex, $widgets) = @_;
4073
4074 for my $child (@$widgets) {
4075 $wself->{buttonbar}->remove ($child->{c_tab_});
4076 }
4077 });
4078 }
4079
3079 $self 4080 $self
3080} 4081}
3081 4082
3082sub add { 4083sub add {
4084 my ($self, @widgets) = @_;
4085
4086 $self->{multiplexer}->add (@widgets)
4087}
4088
4089sub remove {
4090 my ($self, @widgets) = @_;
4091
4092 $self->{multiplexer}->remove (@widgets)
4093}
4094
4095sub pages {
4096 my ($self) = @_;
4097 $self->{multiplexer}->children
4098}
4099
4100sub page_index {
4101 my ($self, $widget) = @_;
4102
4103 my $i = 0;
4104 for ($self->pages) {
4105 if ($_ eq $widget) { return $i };
4106 $i++;
4107 }
4108
4109 undef
4110}
4111
4112sub add_tab {
3083 my ($self, $title, $widget, $tooltip) = @_; 4113 my ($self, $title, $widget, $tooltip) = @_;
3084 4114
3085 Scalar::Util::weaken $self; 4115 $title = [$title, $tooltip] unless ref $title;
4116 $widget->{c_tab} = $title;
3086 4117
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); 4118 $self->add ($widget);
4119}
4120
4121sub get_current_page {
4122 my ($self) = @_;
4123
4124 $self->{multiplexer}->get_current_page
3094} 4125}
3095 4126
3096sub set_current_page { 4127sub set_current_page {
3097 my ($self, $page) = @_; 4128 my ($self, $page) = @_;
3098 4129
3099 $self->{multiplexer}->set_current_page ($page); 4130 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 4131 $self->emit (page_changed => $self->{multiplexer}{current});
4132}
4133
4134sub _draw {
4135 my ($self) = @_;
4136
4137 $self->SUPER::_draw ();
4138
4139 if (my $cur = $self->{multiplexer}{current}) {
4140 if ($cur = $cur->{c_tab_}) {
4141 glTranslate $self->{buttonbar}{x} + $cur->{x},
4142 $self->{buttonbar}{y} + $cur->{y};
4143 glLineWidth 3;
4144 #glEnable GL_BLEND;
4145 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4146 glColor @{$self->{active_outline}};
4147 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4148 glLineWidth 1;
4149 #glDisable GL_BLEND;
4150 }
4151 }
3101} 4152}
3102 4153
3103############################################################################# 4154#############################################################################
3104 4155
3105package CFClient::UI::Combobox; 4156package DC::UI::Selector;
3106 4157
3107use utf8; 4158use utf8;
3108 4159
3109our @ISA = CFClient::UI::Button::; 4160our @ISA = DC::UI::Button::;
3110 4161
3111sub new { 4162sub new {
3112 my $class = shift; 4163 my $class = shift;
3113 4164
3114 my $self = $class->SUPER::new ( 4165 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 4166 options => [], # [value, title, longdesc], ...
3116 value => undef, 4167 value => undef,
3117 @_, 4168 @_,
3118 ); 4169 );
3119 4170
3120 $self->_set_value ($self->{value}); 4171 $self->_set_value ($self->{value});
3121 4172
3122 $self 4173 $self
3123} 4174}
3124 4175
3125sub button_down { 4176sub invoke_button_down {
3126 my ($self, $ev) = @_; 4177 my ($self, $ev) = @_;
3127 4178
3128 my @menu_items; 4179 my @menu_items;
3129 4180
3130 for (@{ $self->{options} }) { 4181 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 4182 my ($value, $title, $tooltip) = @$_;
3132 4183
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 4184 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 4185 }
3135 4186
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4187 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 4188}
3138 4189
3139sub _set_value { 4190sub _set_value {
3140 my ($self, $value) = @_; 4191 my ($self, $value) = @_;
3141 4192
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 4193 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4194 $item ||= $self->{options}[0]
3143 or return; 4195 or return;
3144 4196
3145 $self->{value} = $item->[1]; 4197 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 4198 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 4199# $self->set_tooltip ($item->[2]);
3148} 4200}
3149 4201
3150sub set_value { 4202sub set_value {
3151 my ($self, $value) = @_; 4203 my ($self, $value) = @_;
3152 4204
3153 return unless $self->{value} ne $value; 4205 return unless $self->{value} ne $value;
3154 4206
3155 $self->_set_value ($value); 4207 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 4208 $self->emit (changed => $value);
4209}
4210
4211sub set_options {
4212 my ($self, $options) = @_;
4213
4214 $self->{options} = $options;
4215 $self->_set_value ($self->{value});
3157} 4216}
3158 4217
3159############################################################################# 4218#############################################################################
3160 4219
3161package CFClient::UI::Statusbox; 4220package DC::UI::Statusbox;
3162 4221
3163our @ISA = CFClient::UI::VBox::; 4222our @ISA = DC::UI::VBox::;
3164 4223
3165sub new { 4224sub new {
3166 my $class = shift; 4225 my $class = shift;
3167 4226
3168 my $self = $class->SUPER::new ( 4227 my $self = $class->SUPER::new (
3169 fontsize => 0.8, 4228 fontsize => 0.8,
3170 @_, 4229 @_,
3171 ); 4230 );
3172 4231
3173 Scalar::Util::weaken (my $this = $self); 4232 DC::weaken (my $this = $self);
3174 4233
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4234 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3176 4235
3177 $self 4236 $self
3178} 4237}
3179 4238
3180sub reorder { 4239sub reorder {
3181 my ($self) = @_; 4240 my ($self) = @_;
3182 my $NOW = Time::HiRes::time; 4241 my $NOW = EV::time;
3183 4242
3184 # freeze display when hovering over any label 4243 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner} 4244 return if $DC::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4245 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} }; 4246 values %{ $self->{item} };
3188 4247
3189 while (my ($k, $v) = each %{ $self->{item} }) { 4248 while (my ($k, $v) = each %{ $self->{item} }) {
3190 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4249 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191 } 4250 }
4251
4252 $self->{timer}->set (1, 1);
3192 4253
3193 my @widgets; 4254 my @widgets;
3194 4255
3195 my @items = sort { 4256 my @items = sort {
3196 $a->{pri} <=> $b->{pri} 4257 $a->{pri} <=> $b->{pri}
3197 or $b->{id} <=> $a->{id} 4258 or $b->{id} <=> $a->{id}
3198 } values %{ $self->{item} }; 4259 } values %{ $self->{item} };
3199
3200 $self->{timer}->interval (1);
3201 4260
3202 my $count = 10 + 1; 4261 my $count = 10 + 1;
3203 for my $item (@items) { 4262 for my $item (@items) {
3204 last unless --$count; 4263 last unless --$count;
3205 4264
… …
3212 for ($short) { 4271 for ($short) {
3213 s/^\s+//; 4272 s/^\s+//;
3214 s/\s+/ /g; 4273 s/\s+/ /g;
3215 } 4274 }
3216 4275
3217 new CFClient::UI::Label 4276 new DC::UI::Label
3218 markup => $short, 4277 markup => $short,
3219 tooltip => $item->{tooltip}, 4278 tooltip => $item->{tooltip},
3220 tooltip_font => $::FONT_PROP, 4279 tooltip_font => $::FONT_PROP,
3221 tooltip_width => 0.67, 4280 tooltip_width => 0.67,
3222 fontsize => $item->{fontsize} || $self->{fontsize}, 4281 fontsize => $item->{fontsize} || $self->{fontsize},
3223 max_w => $::WIDTH * 0.44, 4282 max_w => $::WIDTH * 0.44,
4283 align => 0,
3224 fg => [@{ $item->{fg} }], 4284 fg => [@{ $item->{fg} }],
3225 can_events => 1, 4285 can_events => 1,
3226 can_hover => 1 4286 can_hover => 1
3227 }; 4287 };
3228 4288
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4289 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4290 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update; 4291 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff) 4292 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1; 4293 if $diff < 1;
3234 $self->{timer}->interval (1/30); 4294 $self->{timer}->set (1/30, 1/30);
3235 } else { 4295 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1; 4296 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 } 4297 }
3238 4298
3239 push @widgets, $label; 4299 push @widgets, $label;
3240 } 4300 }
4301
4302 my $hash = join ",", @widgets;
4303 return if $hash eq $self->{last_widget_hash};
4304 $self->{last_widget_hash} = $hash;
3241 4305
3242 $self->clear; 4306 $self->clear;
3243 $self->SUPER::add (reverse @widgets); 4307 $self->SUPER::add (reverse @widgets);
3244} 4308}
3245 4309
… …
3260 $item->{count}++; 4324 $item->{count}++;
3261 } else { 4325 } else {
3262 $item->{count} = 1; 4326 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 4327 $item->{text} = $item->{tooltip} = $text;
3264 } 4328 }
3265 $item->{id} = ++$self->{id}; 4329 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 4330 $item->{timeout} = $timeout;
3267 delete $item->{label}; 4331 delete $item->{label};
3268 } else { 4332 } else {
3269 $self->{item}{$group} = { 4333 $self->{item}{$group} = {
3270 id => ++$self->{id}, 4334 id => ++$self->{id},
… …
3276 count => 1, 4340 count => 1,
3277 %arg, 4341 %arg,
3278 }; 4342 };
3279 } 4343 }
3280 4344
4345 $ROOT->on_refresh (reorder => sub {
3281 $self->reorder; 4346 $self->reorder;
4347 });
3282} 4348}
3283 4349
3284sub reconfigure { 4350sub reconfigure {
3285 my ($self) = @_; 4351 my ($self) = @_;
3286 4352
… …
3289 4355
3290 $self->reorder; 4356 $self->reorder;
3291 $self->SUPER::reconfigure; 4357 $self->SUPER::reconfigure;
3292} 4358}
3293 4359
3294sub DESTROY { 4360sub destroy {
3295 my ($self) = @_; 4361 my ($self) = @_;
3296 4362
3297 $self->{timer}->cancel; 4363 $self->{timer}->cancel;
3298 4364
3299 $self->SUPER::DESTROY; 4365 $self->SUPER::destroy;
3300} 4366}
3301 4367
3302############################################################################# 4368#############################################################################
3303 4369
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; 4370package DC::UI::Root;
3628 4371
3629our @ISA = CFClient::UI::Container::; 4372our @ISA = DC::UI::Container::;
3630 4373
3631use List::Util qw(min max); 4374use List::Util qw(min max);
3632 4375
3633use CFClient::OpenGL; 4376use DC::OpenGL;
3634 4377
3635sub new { 4378sub new {
3636 my $class = shift; 4379 my $class = shift;
3637 4380
3638 my $self = $class->SUPER::new ( 4381 my $self = $class->SUPER::new (
3639 visible => 1, 4382 visible => 1,
3640 @_, 4383 @_,
3641 ); 4384 );
3642 4385
3643 Scalar::Util::weaken ($self->{root} = $self); 4386 DC::weaken ($self->{root} = $self);
3644 4387
3645 $self 4388 $self
3646} 4389}
3647 4390
3648sub size_request { 4391sub size_request {
… …
3663 $coord = $max - $size if $coord > $max - $size; 4406 $coord = $max - $size if $coord > $max - $size;
3664 4407
3665 int $coord + 0.5 4408 int $coord + 0.5
3666} 4409}
3667 4410
3668sub size_allocate { 4411sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 4412 my ($self, $w, $h) = @_;
3670 4413
3671 for my $child ($self->children) { 4414 for my $child ($self->children) {
3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4415 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673 4416
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 4420 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 4421 $Y = _to_pixel $Y, $H, $self->{h};
3679 4422
3680 $child->configure ($X, $Y, $W, $H); 4423 $child->configure ($X, $Y, $W, $H);
3681 } 4424 }
4425
4426 1
3682} 4427}
3683 4428
3684sub coord2local { 4429sub coord2local {
3685 my ($self, $x, $y) = @_; 4430 my ($self, $x, $y) = @_;
3686 4431
… …
3694} 4439}
3695 4440
3696sub update { 4441sub update {
3697 my ($self) = @_; 4442 my ($self) = @_;
3698 4443
3699 $::WANT_REFRESH++; 4444 $::WANT_REFRESH = 1;
3700} 4445}
3701 4446
3702sub add { 4447sub add {
3703 my ($self, @children) = @_; 4448 my ($self, @children) = @_;
3704 4449
… …
3741 while ($self->{refresh_hook}) { 4486 while ($self->{refresh_hook}) {
3742 $_->() 4487 $_->()
3743 for values %{delete $self->{refresh_hook}}; 4488 for values %{delete $self->{refresh_hook}};
3744 } 4489 }
3745 4490
3746 if ($self->{realloc}) { 4491 while ($self->{realloc}) {
3747 my %queue; 4492 my %queue;
3748 my @queue; 4493 my @queue;
3749 my $widget; 4494 my $widget;
3750 4495
3751 outer: 4496 outer:
… …
3771 4516
3772 delete $queue{$widget+0}; 4517 delete $queue{$widget+0};
3773 4518
3774 my ($w, $h) = $widget->size_request; 4519 my ($w, $h) = $widget->size_request;
3775 4520
3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4521 $w += $widget->{padding_x} * 2;
3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4522 $h += $widget->{padding_y} * 2;
4523
4524 $w = max $widget->{min_w}, $w;
4525 $h = max $widget->{min_h}, $h;
3778 4526
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4527 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4528 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3781 4529
3782 $w = $widget->{force_w} if exists $widget->{force_w}; 4530 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3798 } 4546 }
3799 } 4547 }
3800 4548
3801 delete $self->{realloc}{$widget+0}; 4549 delete $self->{realloc}{$widget+0};
3802 } 4550 }
3803 }
3804 4551
3805 while (my $size_alloc = delete $self->{size_alloc}) { 4552 while (my $size_alloc = delete $self->{size_alloc}) {
3806 my @queue = sort { $b->{visible} <=> $a->{visible} } 4553 my @queue = sort { $a->{visible} <=> $b->{visible} }
3807 values %$size_alloc; 4554 values %$size_alloc;
3808 4555
3809 while () { 4556 while () {
3810 my $widget = pop @queue || last; 4557 my $widget = pop @queue || last;
3811 4558
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4559 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813 4560
3814 $w = 0 if $w < 0; 4561 $w = max $widget->{min_w}, $w;
3815 $h = 0 if $h < 0; 4562 $h = max $widget->{min_h}, $h;
3816 4563
4564# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4565# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4566
4567 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4568 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4569
3817 $w = int $w + 0.5; 4570 $w = int $w + 0.5;
3818 $h = int $h + 0.5; 4571 $h = int $h + 0.5;
3819 4572
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4573 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w}; 4574 $widget->{old_w} = $widget->{w};
3822 $widget->{old_h} = $widget->{h}; 4575 $widget->{old_h} = $widget->{h};
3823 4576
3824 $widget->{w} = $w; 4577 $widget->{w} = $w;
3825 $widget->{h} = $h; 4578 $widget->{h} = $h;
3826 4579
3827 $widget->emit (size_allocate => $w, $h); 4580 $widget->emit (size_allocate => $w, $h);
4581 }
3828 } 4582 }
3829 } 4583 }
3830 } 4584 }
3831 4585
3832 while ($self->{post_alloc_hook}) { 4586 while ($self->{post_alloc_hook}) {
3833 $_->() 4587 $_->()
3834 for values %{delete $self->{post_alloc_hook}}; 4588 for values %{delete $self->{post_alloc_hook}};
3835 } 4589 }
3836
3837 4590
3838 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4591 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4592 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3840 glClear GL_COLOR_BUFFER_BIT; 4593 glClear GL_COLOR_BUFFER_BIT;
3841 4594
… …
3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4597 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845 glMatrixMode GL_MODELVIEW; 4598 glMatrixMode GL_MODELVIEW;
3846 glLoadIdentity; 4599 glLoadIdentity;
3847 4600
3848 { 4601 {
3849 package CFClient::UI::Base; 4602 package DC::UI::Base;
3850 4603
3851 ($draw_x, $draw_y, $draw_w, $draw_h) = 4604 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h}); 4605 (0, 0, $self->{w}, $self->{h});
3853 }
3854 4606
3855 $self->_draw; 4607 $self->_draw;
4608 }
3856} 4609}
3857 4610
3858############################################################################# 4611#############################################################################
3859 4612
3860package CFClient::UI; 4613package DC::UI;
3861 4614
3862$ROOT = new CFClient::UI::Root; 4615$ROOT = new DC::UI::Root;
3863$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4616$TOOLTIP = new DC::UI::Tooltip z => 900;
3864 4617
38651 46181
3866

Diff Legend

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