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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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