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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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