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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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