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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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