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.233 by root, Thu May 25 03:42:40 2006 UTC vs.
Revision 1.457 by root, Fri Dec 28 15:05:20 2007 UTC

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

Diff Legend

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