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

Diff Legend

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