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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.479 by root, Thu Feb 4 20:01:09 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines