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

Diff Legend

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