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

Diff Legend

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