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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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