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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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