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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

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

Diff Legend

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