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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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