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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.473 by root, Sun Jan 11 03:19:47 2009 UTC

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

Diff Legend

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