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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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