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

Diff Legend

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