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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

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

Diff Legend

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