ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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