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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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