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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines