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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.431 by root, Tue Aug 21 02:41:52 2007 UTC

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

Diff Legend

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