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.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 2007 UTC

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

Diff Legend

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