ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 2006 UTC

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

Diff Legend

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