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

Diff Legend

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