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

Diff Legend

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