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

Diff Legend

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