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.248 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

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

Diff Legend

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