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

Diff Legend

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