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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 2007 UTC

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

Diff Legend

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