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

Diff Legend

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