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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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