ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

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

Diff Legend

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