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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.486 by root, Wed Nov 21 13:23:10 2012 UTC

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

Diff Legend

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