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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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