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.475 by root, Sun Jan 11 22:15:23 2009 UTC

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

Diff Legend

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