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

Diff Legend

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