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.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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