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

Diff Legend

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