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.346 by root, Mon Aug 14 01:21:02 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 $tex = $self->{texture}
915 or return;
916
917 glEnable GL_TEXTURE_2D;
918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
919 glColor 0, 0, 0, 1;
920
921 $tex->draw_quad_alpha_premultiplied (0, 0);
922
923 glDisable GL_TEXTURE_2D;
924}
925
926#############################################################################
927
928package CFPlus::UI::ViewPort;
929
930our @ISA = CFPlus::UI::Window::;
855 931
856sub new { 932sub new {
857 my $class = shift; 933 my $class = shift;
858 934
859 # TODO: user_x, user_y, overwrite moveto? 935 $class->SUPER::new (
936 scroll_x => 0,
937 scroll_y => 1,
938 @_,
939 )
940}
941
942sub size_request {
943 my ($self) = @_;
944
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946
947 $w = 10 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y};
949
950 ($w, $h)
951}
952
953sub invoke_size_allocate {
954 my ($self, $w, $h) = @_;
955
956 my $child = $self->child;
957
958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
960
961 $self->child->configure (0, 0, $w, $h);
962 $self->update;
963
964 1
965}
966
967sub set_offset {
968 my ($self, $x, $y) = @_;
969
970 $self->{view_x} = int $x;
971 $self->{view_y} = int $y;
972
973 $self->update;
974}
975
976# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local {
978 my ($self, $x, $y) = @_;
979
980 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
981}
982
983sub coord2global {
984 my ($self, $x, $y) = @_;
985
986 $x = List::Util::min $self->{w}, $x - $self->{view_x};
987 $y = List::Util::min $self->{h}, $y - $self->{view_y};
988
989 $self->SUPER::coord2global ($x, $y)
990}
991
992sub find_widget {
993 my ($self, $x, $y) = @_;
994
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 }
1002}
1003
1004sub _render {
1005 my ($self) = @_;
1006
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1009
1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1011
1012 $self->SUPER::_render;
1013}
1014
1015#############################################################################
1016
1017package CFPlus::UI::ScrolledWindow;
1018
1019our @ISA = CFPlus::UI::HBox::;
1020
1021sub new {
1022 my ($class, %arg) = @_;
1023
1024 my $child = delete $arg{child};
1025
1026 my $self;
1027
1028 my $slider = new CFPlus::UI::Slider
1029 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]);
1033 },
1034 ;
1035
1036 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
1039 slider => $slider,
1040 %arg,
1041 );
1042
1043 $self->SUPER::add ($self->{vp}, $self->{slider});
1044 $self->add ($child) if $child;
1045
1046 $self
1047}
1048
1049#TODO# update range on size_allocate depending on child
1050
1051sub add {
1052 my ($self, $widget) = @_;
1053
1054 $self->{vp}->add ($self->{child} = $widget);
1055}
1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 $self->SUPER::update;
1077
1078 $self->update_slider;
1079}
1080
1081sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_;
1083
1084 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h)
1087}
1088
1089#############################################################################
1090
1091package CFPlus::UI::Frame;
1092
1093our @ISA = CFPlus::UI::Bin::;
1094
1095use CFPlus::OpenGL;
1096
1097sub new {
1098 my $class = shift;
1099
1100 $class->SUPER::new (
1101 bg => undef,
1102 @_,
1103 )
1104}
1105
1106sub _draw {
1107 my ($self) = @_;
1108
1109 if ($self->{bg}) {
1110 my ($w, $h) = @$self{qw(w h)};
1111
1112 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND;
1124 }
1125
1126 $self->SUPER::_draw;
1127}
1128
1129#############################################################################
1130
1131package CFPlus::UI::FancyFrame;
1132
1133our @ISA = CFPlus::UI::Bin::;
1134
1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 1,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
860 1147
861 my $self = $class->SUPER::new ( 1148 my $self = $class->SUPER::new (
1149 # label => "",
862 bg => [1, 1, 1, 1], 1150 fg => [0.6, 0.3, 0.1],
863 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1151 border => 0.8,
865 toplevel => 1, 1152 style => 'single',
866 can_events => 1, 1153 %arg,
867 @_
868 ); 1154 );
869 1155
870 $self->{title} &&= new CFClient::UI::Label
871 align => 0,
872 valign => 1,
873 text => $self->{title},
874 fontsize => $self->{border};
875
876 $self 1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
877} 1164}
878 1165
879sub border { 1166sub border {
880 int $_[0]{border} * $::FONTSIZE 1167 int $_[0]{border} * $::FONTSIZE
881} 1168}
882 1169
883sub size_request { 1170sub size_request {
884 my ($self) = @_; 1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
885 1175
886 my ($w, $h) = $self->SUPER::size_request; 1176 my ($w, $h) = $self->SUPER::size_request;
887 1177
888 ( 1178 (
889 $w + $self->border * 2, 1179 $w + $self->border * 2,
890 $h + $self->border * 2, 1180 $h + $self->border * 2,
891 ) 1181 )
892} 1182}
893 1183
894sub size_allocate { 1184sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 1185 my ($self, $w, $h) = @_;
896 1186
897 $h -= List::Util::max 0, $self->border * 2; 1187 my $border = $self->border;
1188
898 $w -= List::Util::max 0, $self->border * 2; 1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
899 1191
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1192 if (my $label = $self->{label}) {
901 if $self->{title}; 1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
902 1197
903 $self->child->configure ($self->border, $self->border, $w, $h); 1198 $self->child->configure ($border, $border, $w, $h);
904}
905 1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1;
1240
1241my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244
1245sub new {
1246 my ($class, %arg) = @_;
1247
1248 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1],
1250 border_bg => [1, 1, 1, 1],
1251 border => 0.6,
1252 can_events => 1,
1253 min_w => 64,
1254 min_h => 32,
1255 %arg,
1256 );
1257
1258 $self->{title_widget} = new CFPlus::UI::Label
1259 align => 0,
1260 valign => 1,
1261 text => $self->{title},
1262 fontsize => $self->{border},
1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1273
1274 $self
1275}
1276
1277sub add {
1278 my ($self, @widgets) = @_;
1279
1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1283}
1284
1285sub border {
1286 int $_[0]{border} * $::FONTSIZE
1287}
1288
1289sub size_request {
1290 my ($self) = @_;
1291
1292 $self->{title_widget}->size_request
1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1297
1298 my ($w, $h) = $self->SUPER::size_request;
1299
1300 (
1301 $w + $self->border * 2,
1302 $h + $self->border * 2,
1303 )
1304}
1305
1306sub invoke_size_allocate {
1307 my ($self, $w, $h) = @_;
1308
1309 if ($self->{title_widget}) {
1310 $self->{title_widget}{w} = $w;
1311 $self->{title_widget}{h} = $h;
1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1313 }
1314
1315 my $border = $self->border;
1316
1317 $h -= List::Util::max 0, $border * 2;
1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1332
1333 1
1334}
1335
906sub button_down { 1336sub invoke_button_down {
907 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
908 1338
909 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
910 my $border = $self->border; 1340 my $border = $self->border;
911 1341
… …
924 my ($ev, $x, $y) = @_; 1354 my ($ev, $x, $y) = @_;
925 1355
926 my $dx = $ev->{x} - $ox; 1356 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1357 my $dy = $ev->{y} - $oy;
928 1358
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1359 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1360 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1361
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1362 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size; 1363 $self->realloc;
933 }; 1364 };
934 1365
935 } elsif ($lr ^ $td) { 1366 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1367 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1368 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1370 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1371 my ($ev, $x, $y) = @_;
941 1372
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
943 1374
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update; 1376 # HACK: the next line is required to enforce placement
1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
946 }; 1378 };
1379 } else {
1380 return 0;
1381 }
1382
947 } 1383 1
948} 1384}
949 1385
950sub button_up { 1386sub invoke_button_up {
951 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
952 1388
953 delete $self->{motion}; 1389 ! ! delete $self->{motion}
954} 1390}
955 1391
956sub mouse_motion { 1392sub invoke_mouse_motion {
957 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
958 1394
959 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1396
1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
960} 1406}
961 1407
962sub _draw { 1408sub _draw {
963 my ($self) = @_; 1409 my ($self) = @_;
964 1410
1411 my $child = $self->{children}[0];
1412
965 my ($w, $h ) = ($self->{w}, $self->{h}); 1413 my ($w, $h ) = ($self->{w}, $self->{h});
966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1414 my ($cw, $ch) = ($child->{w}, $child->{h});
967 1415
968 glEnable GL_TEXTURE_2D; 1416 glEnable GL_TEXTURE_2D;
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1418
971 my $border = $self->border; 1419 my $border = $self->border;
972 1420
973 glColor @{ $self->{border_bg} }; 1421 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1422 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1426
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1428 glColor @{ $self->{bg} };
981 1429
982 # TODO: repeat texture not scale 1430 # TODO: repeat texture not scale
1431 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1432 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1433 $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); 1434 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1435 }
993 1436
994 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
995 1438
996 $self->{title}->draw if $self->{title};
997
998 $self->child->draw; 1439 $child->draw;
1440
1441 if ($self->{title_widget}) {
1442 glTranslate 0, $border - $self->{h};
1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
999} 1450}
1000 1451
1001############################################################################# 1452#############################################################################
1002 1453
1003package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1004 1455
1005our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1006 1457
1007use List::Util qw(max sum); 1458use List::Util qw(max sum);
1008 1459
1009use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1010 1461
1011sub new { 1462sub new {
1012 my $class = shift; 1463 my $class = shift;
1013 1464
1014 $class->SUPER::new ( 1465 $class->SUPER::new (
1015 col_expand => [], 1466 col_expand => [],
1016 @_ 1467 @_,
1017 ) 1468 )
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} 1469}
1028 1470
1029sub children { 1471sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1473}
1032 1474
1475sub add {
1476 my ($self) = shift;
1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1493}
1494
1033# TODO: move to container class maybe? send childs a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1496sub clear {
1035 my ($self) = @_; 1497 my ($self) = @_;
1036 1498
1037 my @children = $self->children; 1499 my @children = $self->children;
1038 delete $self->{children}; 1500 delete $self->{children};
… …
1040 for (@children) { 1502 for (@children) {
1041 delete $_->{parent}; 1503 delete $_->{parent};
1042 $_->hide; 1504 $_->hide;
1043 } 1505 }
1044 1506
1045 $self->update; 1507 $self->realloc;
1046} 1508}
1047 1509
1048sub get_wh { 1510sub get_wh {
1049 my ($self) = @_; 1511 my ($self) = @_;
1050 1512
… …
1076 (sum @$ws), 1538 (sum @$ws),
1077 (sum @$hs), 1539 (sum @$hs),
1078 ) 1540 )
1079} 1541}
1080 1542
1081sub size_allocate { 1543sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1083 1545
1084 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1085 1547
1086 my $req_w = sum @$ws; 1548 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1549 my $req_h = (sum @$hs) || 1;
1088 1550
1089 # TODO: nicer code && do row_expand 1551 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1552 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1553 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1554 my $col_expand = (sum @col_expand) || 1;
1093 1555
1094 # linearly scale sizes 1556 # linearly scale sizes
1095 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1096 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1097 1559
1098 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1099 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1100 1562
1101 my $y; 1563 my $y;
1102 1564
1103 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1104 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1118 } 1580 }
1119 1581
1120 $y += $row_h; 1582 $y += $row_h;
1121 } 1583 }
1122 1584
1585 1
1123} 1586}
1124 1587
1125sub find_widget { 1588sub find_widget {
1126 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1127 1590
… …
1146 } 1609 }
1147} 1610}
1148 1611
1149############################################################################# 1612#############################################################################
1150 1613
1151package CFClient::UI::HBox; 1614package CFPlus::UI::Box;
1152 1615
1153# TODO: wrap into common Box base class
1154
1155our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1156 1617
1157sub size_request { 1618sub size_request {
1158 my ($self) = @_; 1619 my ($self) = @_;
1159 1620
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1621 $self->{vertical}
1622 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1625 )
1626 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1629 )
1630}
1161 1631
1632sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_;
1634
1635 my $space = $self->{vertical} ? $h : $w;
1636 my @children = $self->visible_children;
1637
1638 my @req;
1639
1640 if ($self->{homogeneous}) {
1641 @req = ($space / (@children || 1)) x @children;
1642 } else {
1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1644 my $req = List::Util::sum @req;
1645
1646 if ($req > $space) {
1647 # ah well, not enough space
1648 $_ *= $space / $req for @req;
1649 } else {
1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1651
1652 $space = ($space - $req) / $expand; # remaining space to give away
1653
1654 $req[$_] += $space * $children[$_]{expand}
1655 for 0 .. $#children;
1656 }
1162 ( 1657 }
1163 (List::Util::sum map $_->[0], @alloc), 1658
1164 (List::Util::max map $_->[1], @alloc), 1659 CFPlus::UI::harmonize \@req;
1660
1661 my $pos = 0;
1662 for (0 .. $#children) {
1663 my $alloc = $req[$_];
1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1665
1666 $pos += $alloc;
1667 }
1668
1669 1
1670}
1671
1672#############################################################################
1673
1674package CFPlus::UI::HBox;
1675
1676our @ISA = CFPlus::UI::Box::;
1677
1678sub new {
1679 my $class = shift;
1680
1681 $class->SUPER::new (
1682 vertical => 0,
1683 @_,
1165 ) 1684 )
1166} 1685}
1167 1686
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############################################################################# 1687#############################################################################
1210 1688
1211package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1212 1690
1213# TODO: wrap into common Box base class 1691our @ISA = CFPlus::UI::Box::;
1214 1692
1215our @ISA = CFClient::UI::Container::; 1693sub new {
1694 my $class = shift;
1216 1695
1217sub size_request { 1696 $class->SUPER::new (
1218 my ($self) = @_; 1697 vertical => 1,
1219 1698 @_,
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 ) 1699 )
1226} 1700}
1227 1701
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############################################################################# 1702#############################################################################
1268 1703
1269package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1270 1705
1271our @ISA = CFClient::UI::Base::; 1706our @ISA = CFPlus::UI::DrawBG::;
1272 1707
1273use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1274 1709
1275sub new { 1710sub new {
1276 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1277 1712
1278 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1714 fg => [1, 1, 1],
1715 #bg => none
1716 #active_bg => none
1280 #font => default_font 1717 #font => default_font
1281 #text => initial text 1718 #text => initial text
1282 #markup => initial narkup 1719 #markup => initial narkup
1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1722 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1284 fontsize => 1, 1724 fontsize => 1,
1285 align => -1, 1725 align => -1,
1286 valign => -1, 1726 valign => -1,
1287 padding => 2, 1727 padding_x => 2,
1728 padding_y => 2,
1288 can_events => 0, 1729 can_events => 0,
1289 %arg 1730 %arg
1290 ); 1731 );
1291 1732
1292 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1293 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1294 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1295 $self->{template} = $layout; 1736 $self->{template} = $layout;
1296 } 1737 }
1297 1738
1298 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1302 } 1743 }
1303 1744
1304 $self 1745 $self
1305} 1746}
1306 1747
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 { 1748sub update {
1318 my ($self) = @_; 1749 my ($self) = @_;
1319 1750
1320 delete $self->{texture}; 1751 delete $self->{texture};
1321 $self->SUPER::update; 1752 $self->SUPER::update;
1322} 1753}
1323 1754
1755sub realloc {
1756 my ($self) = @_;
1757
1758 delete $self->{ox};
1759 $self->SUPER::realloc;
1760}
1761
1324sub set_text { 1762sub set_text {
1325 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1326 1764
1327 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1329 1767
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1332 1769
1770 delete $self->{size_req};
1771 $self->realloc;
1333 $self->update; 1772 $self->update;
1334 $self->check_size;
1335} 1773}
1336 1774
1337sub set_markup { 1775sub set_markup {
1338 my ($self, $markup) = @_; 1776 my ($self, $markup) = @_;
1339 1777
1340 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1342 1780
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1782
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1347 1784
1785 delete $self->{size_req};
1786 $self->realloc;
1348 $self->update; 1787 $self->update;
1349 $self->check_size;
1350} 1788}
1351 1789
1352sub size_request { 1790sub size_request {
1353 my ($self) = @_; 1791 my ($self) = @_;
1354 1792
1793 $self->{size_req} ||= do {
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1794 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1795 $self->{layout}->set_width ($self->{max_w} || -1);
1796 $self->{layout}->set_ellipsise ($self->{ellipsise});
1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1799
1359 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1360 1801
1361 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1806
1365 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1366 1808
1367 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1810 $h = List::Util::max $h, $h2;
1811 }
1812
1813 [$w, $h]
1369 } 1814 };
1370 1815
1371 ( 1816 @{ $self->{size_req} }
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1817}
1376 1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1377sub size_allocate { 1823sub invoke_size_allocate {
1378 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1379 1825
1826 delete $self->{ox};
1827
1380 delete $self->{texture}; 1828 delete $self->{texture}
1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1381} 1832}
1382 1833
1383sub set_fontsize { 1834sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1385 1836
1386 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1387 delete $self->{texture}; 1839 delete $self->{texture};
1388 1840
1389 $self->update; 1841 $self->realloc;
1390 $self->check_size; 1842}
1843
1844sub reconfigure {
1845 my ($self) = @_;
1846
1847 delete $self->{size_req};
1848 delete $self->{texture};
1849
1850 $self->SUPER::reconfigure;
1391} 1851}
1392 1852
1393sub _draw { 1853sub _draw {
1394 my ($self) = @_; 1854 my ($self) = @_;
1395 1855
1856 $self->SUPER::_draw; # draw background, if applicable
1857
1396 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1865
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1866 [$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 }; 1867 };
1414 1868
1415 glEnable GL_TEXTURE_2D; 1869 unless (exists $self->{ox}) {
1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1872 : ($self->{w} - $size->[0]) * 0.5);
1417 1873
1418 if ($tex->{format} == GL_ALPHA) { 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1419 glColor @{$self->{fg}}; 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1876 : ($self->{h} - $size->[1]) * 0.5);
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 } 1877 };
1424 1878
1425 glDisable GL_TEXTURE_2D; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1881
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1426} 1883}
1427 1884
1428############################################################################# 1885#############################################################################
1429 1886
1430package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1431 1888
1432our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1433 1890
1434use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1435 1892
1436sub new { 1893sub new {
1437 my $class = shift; 1894 my $class = shift;
1438 1895
1439 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1443 active_fg => [0, 0, 0], 1900 active_fg => [0, 0, 0],
1444 can_hover => 1, 1901 can_hover => 1,
1445 can_focus => 1, 1902 can_focus => 1,
1446 valign => 0, 1903 valign => 0,
1447 can_events => 1, 1904 can_events => 1,
1905 #text => ...
1906 #hidden => "*",
1448 @_ 1907 @_
1449 ) 1908 )
1450} 1909}
1451 1910
1452sub _set_text { 1911sub _set_text {
… …
1454 1913
1455 delete $self->{cur_h}; 1914 delete $self->{cur_h};
1456 1915
1457 return if $self->{text} eq $text; 1916 return if $self->{text} eq $text;
1458 1917
1459 delete $self->{texture};
1460
1461 $self->{last_activity} = $::NOW; 1918 $self->{last_activity} = $::NOW;
1462 $self->{text} = $text; 1919 $self->{text} = $text;
1463 1920
1464 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1923 delete $self->{size_req};
1466 1924
1467 $self->emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1926
1927 $self->realloc;
1928 $self->update;
1468} 1929}
1469 1930
1470sub set_text { 1931sub set_text {
1471 my ($self, $text) = @_; 1932 my ($self, $text) = @_;
1472 1933
1473 $self->{cursor} = length $text; 1934 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1935 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477} 1936}
1478 1937
1479sub get_text { 1938sub get_text {
1480 $_[0]{text} 1939 $_[0]{text}
1481} 1940}
… …
1486 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1487 1946
1488 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1489} 1948}
1490 1949
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 { 1950sub invoke_key_down {
1498 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1499 1952
1500 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1501 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1502 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1505 1958
1506 if ($uni == 8) { 1959 if ($uni == 8) {
1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1508 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1509 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1510 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1511 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1512 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1513 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1515 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1517 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1971 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1972 $self->emit ('escape');
1520 } elsif ($uni) { 1973 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1974 substr $text, $self->{cursor}++, 0, chr $uni;
1975 } else {
1976 return 0;
1522 } 1977 }
1523 1978
1524 $self->_set_text ($text); 1979 $self->_set_text ($text);
1525 $self->update;
1526}
1527 1980
1981 $self->realloc;
1982
1983 1
1984}
1985
1528sub focus_in { 1986sub invoke_focus_in {
1529 my ($self) = @_; 1987 my ($self) = @_;
1530 1988
1531 $self->{last_activity} = $::NOW; 1989 $self->{last_activity} = $::NOW;
1532 1990
1533 $self->SUPER::focus_in; 1991 $self->SUPER::invoke_focus_in
1534} 1992}
1535 1993
1536sub button_down { 1994sub invoke_button_down {
1537 my ($self, $ev, $x, $y) = @_; 1995 my ($self, $ev, $x, $y) = @_;
1538 1996
1539 $self->SUPER::button_down ($ev, $x, $y); 1997 $self->SUPER::invoke_button_down ($ev, $x, $y);
1540 1998
1541 my $idx = $self->{layout}->xy_to_index ($x, $y); 1999 my $idx = $self->{layout}->xy_to_index ($x, $y);
1542 2000
1543 # byte-index to char-index 2001 # byte-index to char-index
1544 my $text = $self->{text}; 2002 my $text = $self->{text};
1545 utf8::encode $text; 2003 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1546 $self->{cursor} = length substr $text, 0, $idx; 2004 $self->{cursor} = length $text;
1547 2005
1548 $self->_set_text ($self->{text}); 2006 $self->_set_text ($self->{text});
1549 $self->update; 2007 $self->update;
2008
2009 1
1550} 2010}
1551 2011
1552sub mouse_motion { 2012sub invoke_mouse_motion {
1553 my ($self, $ev, $x, $y) = @_; 2013 my ($self, $ev, $x, $y) = @_;
1554# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2014# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2015
2016 1
1555} 2017}
1556 2018
1557sub _draw { 2019sub _draw {
1558 my ($self) = @_; 2020 my ($self) = @_;
1559 2021
1560 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $self->{fg};
1561 2023
1562 if ($FOCUS == $self) { 2024 if ($FOCUS == $self) {
1563 glColor @{$self->{active_bg}}; 2025 glColor_premultiply @{$self->{active_bg}};
1564 $self->{fg} = $self->{active_fg}; 2026 $self->{fg} = $self->{active_fg};
1565 } else { 2027 } else {
1566 glColor @{$self->{bg}}; 2028 glColor_premultiply @{$self->{bg}};
1567 } 2029 }
1568 2030
1569 glEnable GL_BLEND; 2031 glEnable GL_BLEND;
1570 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2032 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1571 glBegin GL_QUADS; 2033 glBegin GL_QUADS;
1572 glVertex 0 , 0; 2034 glVertex 0 , 0;
1573 glVertex 0 , $self->{h}; 2035 glVertex 0 , $self->{h};
1574 glVertex $self->{w}, $self->{h}; 2036 glVertex $self->{w}, $self->{h};
1575 glVertex $self->{w}, 0; 2037 glVertex $self->{w}, 0;
… …
1586 utf8::encode $text; 2048 utf8::encode $text;
1587 2049
1588 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1589 } 2051 }
1590 2052
1591 glColor @{$self->{fg}};
1592 glBegin GL_LINES; 2053 glBegin GL_LINES;
1593 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2054 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1594 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2055 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1595 glEnd; 2056 glEnd;
1596 } 2057 }
1597} 2058}
1598 2059
1599package CFClient::UI::Entry; 2060package CFPlus::UI::Entry;
1600 2061
1601our @ISA = CFClient::UI::EntryBase::; 2062our @ISA = CFPlus::UI::EntryBase::;
1602 2063
1603use CFClient::OpenGL; 2064use CFPlus::OpenGL;
1604 2065
1605sub key_down { 2066sub invoke_key_down {
1606 my ($self, $ev) = @_; 2067 my ($self, $ev) = @_;
1607 2068
1608 my $sym = $ev->{sym}; 2069 my $sym = $ev->{sym};
1609 2070
1610 if ($sym == 13) { 2071 if ($sym == 13) {
1611 unshift @{$self->{history}}, 2072 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 2073 my $txt = $self->get_text;
2074
1613 $self->{history_pointer} = -1; 2075 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 2076 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 2077 $self->emit (activate => $txt);
1616 $self->update; 2078 $self->update;
1617 2079
1618 } elsif ($sym == CFClient::SDLK_UP) { 2080 } elsif ($sym == CFPlus::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) { 2081 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text; 2082 $self->{history_saveback} = $self->get_text;
1621 } 2083 }
1622 if (@{$self->{history} || []} > 0) { 2084 if (@{$self->{history} || []} > 0) {
1623 $self->{history_pointer}++; 2085 $self->{history_pointer}++;
… …
1625 $self->{history_pointer} = @{$self->{history} || []} - 1; 2087 $self->{history_pointer} = @{$self->{history} || []} - 1;
1626 } 2088 }
1627 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2089 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1628 } 2090 }
1629 2091
1630 } elsif ($sym == CFClient::SDLK_DOWN) { 2092 } elsif ($sym == CFPlus::SDLK_DOWN) {
1631 $self->{history_pointer}--; 2093 $self->{history_pointer}--;
1632 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2094 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1633 2095
1634 if ($self->{history_pointer} >= 0) { 2096 if ($self->{history_pointer} >= 0) {
1635 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2097 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1636 } else { 2098 } else {
1637 $self->set_text ($self->{history_saveback}); 2099 $self->set_text ($self->{history_saveback});
1638 } 2100 }
1639 2101
1640 } else { 2102 } else {
1641 $self->SUPER::key_down ($ev); 2103 return $self->SUPER::invoke_key_down ($ev)
2104 }
2105
1642 } 2106 1
1643
1644} 2107}
1645 2108
1646############################################################################# 2109#############################################################################
1647 2110
1648package CFClient::UI::Button; 2111package CFPlus::UI::Button;
1649 2112
1650our @ISA = CFClient::UI::Label::; 2113our @ISA = CFPlus::UI::Label::;
1651 2114
1652use CFClient::OpenGL; 2115use CFPlus::OpenGL;
1653 2116
1654my @tex = 2117my @tex =
1655 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2118 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1656 qw(b1_button_active.png); 2119 qw(b1_button_active.png);
1657 2120
1658sub new { 2121sub new {
1659 my $class = shift; 2122 my $class = shift;
1660 2123
1661 $class->SUPER::new ( 2124 $class->SUPER::new (
1662 padding => 4, 2125 padding_x => 4,
2126 padding_y => 4,
1663 fg => [1, 1, 1], 2127 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 2128 active_fg => [0, 0, 1],
1666 can_hover => 1, 2129 can_hover => 1,
1667 align => 0, 2130 align => 0,
1668 valign => 0, 2131 valign => 0,
1669 can_events => 1, 2132 can_events => 1,
1670 @_ 2133 @_
1671 ) 2134 )
1672} 2135}
1673 2136
1674sub button_up { 2137sub invoke_button_up {
1675 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
1676 2139
2140 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 2141 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 2142 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate"); 2143
1680 } 2144 1
1681} 2145}
1682 2146
1683sub _draw { 2147sub _draw {
1684 my ($self) = @_; 2148 my ($self) = @_;
1685 2149
1686 local $self->{fg} = $self->{fg}; 2150 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1687
1688 if ($GRAB == $self) {
1689 $self->{fg} = $self->{active_fg};
1690 }
1691 2151
1692 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1694 glColor 0, 0, 0, 1; 2154 glColor 0, 0, 0, 1;
1695 2155
… …
1700 $self->SUPER::_draw; 2160 $self->SUPER::_draw;
1701} 2161}
1702 2162
1703############################################################################# 2163#############################################################################
1704 2164
1705package CFClient::UI::CheckBox; 2165package CFPlus::UI::CheckBox;
1706 2166
1707our @ISA = CFClient::UI::DrawBG::; 2167our @ISA = CFPlus::UI::DrawBG::;
1708 2168
1709my @tex = 2169my @tex =
1710 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2170 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1711 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2171 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1712 2172
1713use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1714 2174
1715sub new { 2175sub new {
1716 my $class = shift; 2176 my $class = shift;
1717 2177
1718 $class->SUPER::new ( 2178 $class->SUPER::new (
1719 padding => 2, 2179 padding_x => 2,
2180 padding_y => 2,
1720 fg => [1, 1, 1], 2181 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 2182 active_fg => [1, 1, 0],
2183 bg => [0, 0, 0, 0.2],
2184 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 2185 state => 0,
1723 can_hover => 1, 2186 can_hover => 1,
1724 @_ 2187 @_
1725 ) 2188 )
1726} 2189}
1727 2190
1728sub size_request { 2191sub size_request {
1729 my ($self) = @_; 2192 my ($self) = @_;
1730 2193
1731 ($self->{padding} * 2 + 6) x 2 2194 (6) x 2
1732} 2195}
1733 2196
2197sub toggle {
2198 my ($self) = @_;
2199
2200 $self->{state} = !$self->{state};
2201 $self->emit (changed => $self->{state});
2202 $self->update;
2203}
2204
1734sub button_down { 2205sub invoke_button_down {
1735 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1736 2207
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2208 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2209 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1739 $self->{state} = !$self->{state}; 2210 $self->toggle;
1740 $self->emit (changed => $self->{state}); 2211 } else {
2212 return 0
2213 }
2214
1741 } 2215 1
1742} 2216}
1743 2217
1744sub _draw { 2218sub _draw {
1745 my ($self) = @_; 2219 my ($self) = @_;
1746 2220
1747 $self->SUPER::_draw; 2221 $self->SUPER::_draw;
1748 2222
1749 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2223 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1750 2224
1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2225 my ($w, $h) = @$self{qw(w h)};
2226
2227 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1752 2228
1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2229 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1754 2230
1755 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2231 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756 2232
… …
1759 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
1760} 2236}
1761 2237
1762############################################################################# 2238#############################################################################
1763 2239
1764package CFClient::UI::Image; 2240package CFPlus::UI::Image;
1765 2241
1766our @ISA = CFClient::UI::Base::; 2242our @ISA = CFPlus::UI::Base::;
1767 2243
1768use CFClient::OpenGL; 2244use CFPlus::OpenGL;
1769use Carp qw/confess/;
1770 2245
1771our %loaded_images; 2246our %texture_cache;
1772 2247
1773sub new { 2248sub new {
1774 my $class = shift; 2249 my $class = shift;
1775 2250
1776 my $self = $class->SUPER::new (can_events => 0, @_); 2251 my $self = $class->SUPER::new (
2252 can_events => 0,
2253 @_,
2254 );
1777 2255
1778 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2256 $self->{path} || $self->{tex}
2257 or Carp::croak "'path' or 'tex' attributes required";
1779 2258
1780 $loaded_images{$self->{image}} ||= 2259 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1781 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2260 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1782 2261
1783 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2262 Scalar::Util::weaken $texture_cache{$self->{path}};
1784 2263
1785 Scalar::Util::weaken $loaded_images{$self->{image}}; 2264 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1786
1787 $self->{aspect} = $tex->{w} / $tex->{h};
1788 2265
1789 $self 2266 $self
1790} 2267}
1791 2268
2269sub STORABLE_freeze {
2270 my ($self, $cloning) = @_;
2271
2272 $self->{path}
2273 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2274
2275 $self->{path}
2276}
2277
2278sub STORABLE_attach {
2279 my ($self, $cloning, $path) = @_;
2280
2281 $self->new (path => $path)
2282}
2283
1792sub size_request { 2284sub size_request {
1793 my ($self) = @_; 2285 my ($self) = @_;
1794 2286
1795 ($self->{tex}->{w}, $self->{tex}->{h}) 2287 ($self->{tex}{w}, $self->{tex}{h})
1796} 2288}
1797 2289
1798sub _draw { 2290sub _draw {
1799 my ($self) = @_; 2291 my ($self) = @_;
1800 2292
… …
1810 } 2302 }
1811 2303
1812 glEnable GL_TEXTURE_2D; 2304 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814 2306
1815 $tex->draw_quad_alpha (0, 0, $w, $h); 2307 $tex->draw_quad (0, 0, $w, $h);
1816 2308
1817 glDisable GL_TEXTURE_2D; 2309 glDisable GL_TEXTURE_2D;
1818} 2310}
1819 2311
1820############################################################################# 2312#############################################################################
1821 2313
2314package CFPlus::UI::ImageButton;
2315
2316our @ISA = CFPlus::UI::Image::;
2317
2318use CFPlus::OpenGL;
2319
2320my %textures;
2321
2322sub new {
2323 my $class = shift;
2324
2325 my $self = $class->SUPER::new (
2326 padding_x => 4,
2327 padding_y => 4,
2328 fg => [1, 1, 1],
2329 active_fg => [0, 0, 1],
2330 can_hover => 1,
2331 align => 0,
2332 valign => 0,
2333 can_events => 1,
2334 @_
2335 );
2336}
2337
2338sub invoke_button_up {
2339 my ($self, $ev, $x, $y) = @_;
2340
2341 $self->emit ("activate")
2342 if $x >= 0 && $x < $self->{w}
2343 && $y >= 0 && $y < $self->{h};
2344
2345 1
2346}
2347
2348#############################################################################
2349
1822package CFClient::UI::VGauge; 2350package CFPlus::UI::VGauge;
1823 2351
1824our @ISA = CFClient::UI::Base::; 2352our @ISA = CFPlus::UI::Base::;
1825 2353
1826use List::Util qw(min max); 2354use List::Util qw(min max);
1827 2355
1828use CFClient::OpenGL; 2356use CFPlus::OpenGL;
1829 2357
1830my %tex = ( 2358my %tex = (
1831 food => [ 2359 food => [
1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1833 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2361 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1834 ], 2362 ],
1835 grace => [ 2363 grace => [
1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2364 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/ 2365 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1838 ], 2366 ],
1839 hp => [ 2367 hp => [
1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1841 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2369 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1842 ], 2370 ],
1843 mana => [ 2371 mana => [
1844 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2372 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/ 2373 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1846 ], 2374 ],
1847); 2375);
1848 2376
1849# eg. VGauge->new (gauge => 'food'), default gauge: food 2377# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1909 my $ycut1 = max 0, min 1, $ycut; 2437 my $ycut1 = max 0, min 1, $ycut;
1910 my $ycut2 = max 0, min 1, $ycut - 1; 2438 my $ycut2 = max 0, min 1, $ycut - 1;
1911 2439
1912 my $h1 = $self->{h} * (1 - $ycut1); 2440 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2); 2441 my $h2 = $self->{h} * (1 - $ycut2);
2442 my $h3 = $self->{h};
2443
2444 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1914 2445
1915 glEnable GL_BLEND; 2446 glEnable GL_BLEND;
1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2447 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2448 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1917 glEnable GL_TEXTURE_2D; 2449 glEnable GL_TEXTURE_2D;
1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1919 2451
1920 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2452 glBindTexture GL_TEXTURE_2D, $t1->{name};
1921 glBegin GL_QUADS; 2453 glBegin GL_QUADS;
… …
1936 2468
1937 if ($t3) { 2469 if ($t3) {
1938 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2470 glBindTexture GL_TEXTURE_2D, $t3->{name};
1939 glBegin GL_QUADS; 2471 glBegin GL_QUADS;
1940 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2472 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1941 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2473 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1942 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2474 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1943 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2475 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1944 glEnd; 2476 glEnd;
1945 } 2477 }
1946 2478
1947 glDisable GL_BLEND; 2479 glDisable GL_BLEND;
1948 glDisable GL_TEXTURE_2D; 2480 glDisable GL_TEXTURE_2D;
1949} 2481}
1950 2482
1951############################################################################# 2483#############################################################################
1952 2484
1953package CFClient::UI::Gauge; 2485package CFPlus::UI::Gauge;
1954 2486
1955our @ISA = CFClient::UI::VBox::; 2487our @ISA = CFPlus::UI::VBox::;
1956 2488
1957sub new { 2489sub new {
1958 my ($class, %arg) = @_; 2490 my ($class, %arg) = @_;
1959 2491
1960 my $self = $class->SUPER::new ( 2492 my $self = $class->SUPER::new (
… …
1962 can_hover => 1, 2494 can_hover => 1,
1963 can_events => 1, 2495 can_events => 1,
1964 %arg, 2496 %arg,
1965 ); 2497 );
1966 2498
1967 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2499 $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); 2500 $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"); 2501 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1970 2502
1971 $self 2503 $self
1972} 2504}
1973 2505
1974sub set_fontsize { 2506sub set_fontsize {
… …
1995 $self->{value}->set_text ($val); 2527 $self->{value}->set_text ($val);
1996} 2528}
1997 2529
1998############################################################################# 2530#############################################################################
1999 2531
2000package CFClient::UI::Slider; 2532package CFPlus::UI::Slider;
2001 2533
2002use strict; 2534use strict;
2003 2535
2004use CFClient::OpenGL; 2536use CFPlus::OpenGL;
2005 2537
2006our @ISA = CFClient::UI::DrawBG::; 2538our @ISA = CFPlus::UI::DrawBG::;
2007 2539
2008my @tex = 2540my @tex =
2009 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2541 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2010 qw(s1_slider.png s1_slider_bg.png); 2542 qw(s1_slider.png s1_slider_bg.png);
2011 2543
2012sub new { 2544sub new {
2013 my $class = shift; 2545 my $class = shift;
2014 2546
… …
2018 # TODO: req_w/h are wrong with vertical 2550 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2551 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2553 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2554 active_fg => [0, 0, 0],
2555 bg => [0, 0, 0, 0.2],
2556 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2557 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2558 min_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2559 min_h => $::WIDTH / 80,
2026 vertical => 0, 2560 vertical => 0,
2027 can_hover => 1, 2561 can_hover => 1,
2028 inner_pad => .05, 2562 inner_pad => 0.02,
2029 @_ 2563 @_
2030 ); 2564 );
2031 2565
2032 $self->set_value ($self->{range}[0]); 2566 $self->set_value ($self->{range}[0]);
2033 $self->update; 2567 $self->update;
2034 2568
2035 $self 2569 $self
2036} 2570}
2037 2571
2572sub set_range {
2573 my ($self, $range) = @_;
2574
2575 ($range, $self->{range}) = ($self->{range}, $range);
2576
2577 if ("@$range" ne "@{$self->{range}}") {
2578 $self->update;
2579 $self->set_value ($self->{range}[0]);
2580 }
2581}
2582
2038sub set_value { 2583sub set_value {
2039 my ($self, $value) = @_; 2584 my ($self, $value) = @_;
2040 2585
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2586 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2587
2043 $hi = $lo + 1 if $hi <= $lo; 2588 $hi = $lo + 1 if $hi <= $lo;
2044 2589
2590 $page = $hi - $lo if $page > $hi - $lo;
2591
2045 $value = $lo if $value < $lo; 2592 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2593 $value = $hi - $page if $value > $hi - $page;
2047 2594
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2595 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2596 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052 2597
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2598 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2599
2055 if ($value != $old_value) { 2600 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2601 $self->emit (changed => $value);
… …
2059} 2604}
2060 2605
2061sub size_request { 2606sub size_request {
2062 my ($self) = @_; 2607 my ($self) = @_;
2063 2608
2064 my $w = $self->{req_w}; 2609 ($self->{req_w}, $self->{req_h})
2065 my $h = $self->{req_h};
2066
2067 $self->{vertical} ? ($h, $w) : ($w, $h)
2068} 2610}
2069 2611
2070sub button_down { 2612sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_; 2613 my ($self, $ev, $x, $y) = @_;
2072 2614
2073 $self->SUPER::button_down ($ev, $x, $y); 2615 $self->SUPER::invoke_button_down ($ev, $x, $y);
2616
2617 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2618
2074 $self->mouse_motion ($ev, $x, $y); 2619 $self->invoke_mouse_motion ($ev, $x, $y)
2075} 2620}
2076 2621
2077sub mouse_motion { 2622sub invoke_mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2623 my ($self, $ev, $x, $y) = @_;
2079 2624
2080 if ($GRAB == $self) { 2625 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2626 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2627
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2628 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2629
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2630 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2631
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2632 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2633 } else {
2634 return 0;
2635 }
2636
2088 } 2637 1
2638}
2639
2640sub invoke_mouse_wheel {
2641 my ($self, $ev) = @_;
2642
2643 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644
2645 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2646
2647 ! ! $delta
2089} 2648}
2090 2649
2091sub update { 2650sub update {
2092 my ($self) = @_; 2651 my ($self) = @_;
2093 2652
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2653 delete $self->{knob_w};
2654 $self->SUPER::update;
2655}
2656
2657sub _draw {
2658 my ($self) = @_;
2659
2660 unless ($self->{knob_w}) {
2095 $self->set_value ($self->{range}[0]); 2661 $self->set_value ($self->{range}[0]);
2096 2662
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2663 my ($value, $lo, $hi, $page) = @{$self->{range}};
2664 my $range = ($hi - $page - $lo) || 1e-100;
2098 2665
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2666 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2667
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2668 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2669 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2670
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2671 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2672 $value = $value * $self->{scale} + $self->{offset};
2105 2673
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; 2674 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2675 $self->{knob_w} = $knob_w;
2113 }); 2676 }
2114
2115 $self->SUPER::update;
2116}
2117
2118sub _draw {
2119 my ($self) = @_;
2120 2677
2121 $self->SUPER::_draw (); 2678 $self->SUPER::_draw ();
2122 2679
2123 glScale $self->{w}, $self->{h}; 2680 glScale $self->{w}, $self->{h};
2124 2681
2125 if ($self->{vertical}) { 2682 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2683 # draw a vertical slider like a rotated horizontal slider
2127 2684
2685 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2686 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2687 }
2131 2688
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2689 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2690 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2691
… …
2144 glDisable GL_TEXTURE_2D; 2701 glDisable GL_TEXTURE_2D;
2145} 2702}
2146 2703
2147############################################################################# 2704#############################################################################
2148 2705
2149package CFClient::UI::TextView; 2706package CFPlus::UI::ValSlider;
2150 2707
2151our @ISA = CFClient::UI::HBox::; 2708our @ISA = CFPlus::UI::HBox::;
2152 2709
2710sub new {
2711 my ($class, %arg) = @_;
2712
2713 my $range = delete $arg{range};
2714
2715 my $self = $class->SUPER::new (
2716 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2717 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2718 to_value => sub { shift },
2719 from_value => sub { shift },
2720 %arg,
2721 );
2722
2723 $self->{slider}->connect (changed => sub {
2724 my ($self, $value) = @_;
2725 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2726 $self->{parent}->emit (changed => $value);
2727 });
2728
2729# $self->{entry}->connect (changed => sub {
2730# my ($self, $value) = @_;
2731# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2732# $self->{parent}->emit (changed => $value);
2733# });
2734
2735 $self->add ($self->{slider}, $self->{entry});
2736
2737 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2738
2739 $self
2740}
2741
2742sub set_range { shift->{slider}->set_range (@_) }
2743sub set_value { shift->{slider}->set_value (@_) }
2744
2745#############################################################################
2746
2747package CFPlus::UI::TextScroller;
2748
2749our @ISA = CFPlus::UI::HBox::;
2750
2153use CFClient::OpenGL; 2751use CFPlus::OpenGL;
2154 2752
2155sub new { 2753sub new {
2156 my $class = shift; 2754 my $class = shift;
2157 2755
2158 my $self = $class->SUPER::new ( 2756 my $self = $class->SUPER::new (
2159 fontsize => 1, 2757 fontsize => 1,
2160 can_events => 0, 2758 can_events => 1,
2759 indent => 0,
2161 #font => default_font 2760 #font => default_font
2162 @_, 2761 @_,
2163 2762
2164 layout => (new CFClient::Layout 1), 2763 layout => (new CFPlus::Layout),
2165 par => [], 2764 par => [],
2166 height => 0, 2765 height => 0,
2167 children => [ 2766 children => [
2168 (new CFClient::UI::Empty expand => 1), 2767 (new CFPlus::UI::Empty expand => 1),
2169 (new CFClient::UI::Slider vertical => 1), 2768 (new CFPlus::UI::Slider vertical => 1),
2170 ], 2769 ],
2171 ); 2770 );
2172 2771
2173 $self->{children}[1]->connect (changed => sub { $self->update }); 2772 $self->{children}[1]->connect (changed => sub { $self->update });
2174 2773
… …
2180 2779
2181 $self->{fontsize} = $fontsize; 2780 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2781 $self->reflow;
2183} 2782}
2184 2783
2185sub text_height { 2784sub size_request {
2785 my ($self) = @_;
2786
2787 my ($empty, $slider) = @{ $self->{children} };
2788
2789 local $self->{children} = [$empty, $slider];
2790 $self->SUPER::size_request
2791}
2792
2793sub invoke_size_allocate {
2794 my ($self, $w, $h) = @_;
2795
2796 my ($empty, $slider, @other) = @{ $self->{children} };
2797 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2798
2799 $self->{layout}->set_font ($self->{font}) if $self->{font};
2800 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2801 $self->{layout}->set_width ($empty->{w});
2802 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2803
2804 $self->reflow;
2805
2806 local $self->{children} = [$empty, $slider];
2807 $self->SUPER::invoke_size_allocate ($w, $h)
2808}
2809
2810sub invoke_mouse_wheel {
2186 my ($self, $text) = @_; 2811 my ($self, $ev) = @_;
2812
2813 return 0 unless $ev->{dy}; # only vertical movements
2814
2815 $self->{children}[1]->emit (mouse_wheel => $ev);
2816
2817 1
2818}
2819
2820sub get_layout {
2821 my ($self, $para) = @_;
2187 2822
2188 my $layout = $self->{layout}; 2823 my $layout = $self->{layout};
2189 2824
2825 $layout->set_font ($self->{font}) if $self->{font};
2826 $layout->set_foreground (@{$para->{fg}});
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2827 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w}); 2828 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2829 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2192 $layout->set_markup ($text); 2830 $layout->set_markup ($para->{markup});
2831
2832 $layout->set_shapes (
2833 map
2834 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2835 @{$para->{widget}}
2193 2836 );
2194 ($layout->size)[1] 2837
2838 $layout
2195} 2839}
2196 2840
2197sub reflow { 2841sub reflow {
2198 my ($self) = @_; 2842 my ($self) = @_;
2199 2843
2200 $self->{need_reflow}++; 2844 $self->{need_reflow}++;
2201 $self->update; 2845 $self->update;
2202} 2846}
2203 2847
2204sub size_allocate { 2848sub set_offset {
2849 my ($self, $offset) = @_;
2850
2851 # todo: base offset on lines or so, not on pixels
2852 $self->{children}[1]->set_value ($offset);
2853}
2854
2855sub current_paragraph {
2856 my ($self) = @_;
2857
2858 $self->force_uptodate;
2859 $self->{top_paragraph} - 1
2860}
2861
2862sub scroll_to {
2205 my ($self, $w, $h) = @_; 2863 my ($self, $para) = @_;
2206 2864
2207 $self->SUPER::size_allocate ($w, $h); 2865 $self->force_uptodate;
2208 2866
2209 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2211 $self->{layout}->set_width ($self->{children}[0]{w});
2212 2868
2213 $self->reflow; 2869 $self->{children}[1]->set_value ($self->{par}[$para]{y});
2870}
2871
2872sub clear {
2873 my ($self) = @_;
2874
2875 my (undef, undef, @other) = @{ $self->{children} };
2876 $self->remove ($_) for @other;
2877
2878 $self->{par} = [];
2879 $self->{height} = 0;
2880 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2214} 2881}
2215 2882
2216sub add_paragraph { 2883sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2884 my $self = shift;
2218 2885
2219 #TODO: intelligently "reformat" paragraph 2886 for my $para (@_) {
2887 $para = {
2888 fg => [1, 1, 1, 1],
2889 indent => 0,
2890 markup => "",
2891 widget => [],
2892 ref $para ? %$para : (markup => $para),
2893 w => 1e10,
2894 wrapped => 1,
2895 };
2220 2896
2221 my $height = $self->text_height ($text); 2897 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898 push @{$self->{par}}, $para;
2899 }
2222 2900
2901 $self->{need_reflow}++;
2902 $self->update;
2903}
2904
2905sub scroll_to_bottom {
2906 my ($self) = @_;
2907
2908 $self->{scroll_to_bottom} = 1;
2909 $self->update;
2910}
2911
2912sub force_uptodate {
2913 my ($self) = @_;
2914
2915 if (delete $self->{need_reflow}) {
2916 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2917
2918 my $height = 0;
2919 my $paridx;
2920 my $top_paragraph;
2921 my $top = int $self->{children}[1]{range}[0];
2922
2923 for my $para (@{$self->{par}}) {
2924 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2925 my $layout = $self->get_layout ($para);
2926 my ($w, $h) = $layout->size;
2927
2928 $para->{w} = $w + $para->{indent};
2929 $para->{h} = $h;
2930 $para->{wrapped} = $layout->has_wrapped;
2931 }
2932
2933 $para->{y} = $height;
2934
2935 $paridx++;
2936 $top_paragraph ||= $paridx if $height >= $top;
2937
2938 $height += $para->{h};
2939 }
2940
2941 $self->{top_paragraph} = $top_paragraph;
2223 $self->{height} += $height; 2942 $self->{height} = $height;
2224 2943
2225 push @{$self->{par}}, [$height, $color, $text]; 2944 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2226 2945
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2946 delete $self->{texture};
2228 $self->{children}[1]->update; 2947 }
2948
2949 if (delete $self->{scroll_to_bottom}) {
2950 $self->{children}[1]->set_value (1e10);
2951 }
2229} 2952}
2230 2953
2231sub update { 2954sub update {
2232 my ($self) = @_; 2955 my ($self) = @_;
2233 2956
… …
2235 2958
2236 return unless $self->{h} > 0; 2959 return unless $self->{h} > 0;
2237 2960
2238 delete $self->{texture}; 2961 delete $self->{texture};
2239 2962
2240 $ROOT->on_post_alloc ($self, sub { 2963 $ROOT->on_post_alloc ($self => sub {
2241 if (delete $self->{need_reflow}) { 2964 $self->force_uptodate;
2242 my $height = 0;
2243 2965
2244 $height += $_->[0] = $self->text_height ($_->[2]) 2966 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2245 for @{$self->{par}};
2246 2967
2247 $self->{height} = $height; 2968 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2248
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2250
2251 delete $self->{texture};
2252 }
2253
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2255 glClearColor 0, 0, 0, 0; 2969 glClearColor 0, 0, 0, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2970 glClear GL_COLOR_BUFFER_BIT;
2257 2971
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]; 2972 my $top = int $self->{children}[1]{range}[0];
2262 2973
2263 my $y0 = $top; 2974 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2975 my $y1 = $top + $H;
2265 2976
2266 my $y = 0;
2267
2268 my $layout = $self->{layout};
2269
2270 $layout->set_font ($self->{font}) if $self->{font};
2271
2272 for my $par (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2273 my $h = $par->[0]; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2274 2980
2275 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 2982 my $layout = $self->get_layout ($para);
2277 $layout->set_markup ($par->[2]);
2278 2983
2279 my ($W, $H) = $layout->size; 2984 $layout->render ($para->{indent}, $y - $y0);
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2985
2986 if (my @w = @{ $para->{widget} }) {
2987 my @s = $layout->get_shapes;
2988
2989 for (@w) {
2990 my ($dx, $dy) = splice @s, 0, 2, ();
2991
2992 $_->{x} = $dx + $para->{indent};
2993 $_->{y} = $dy + $y - $y0;
2994
2995 $_->draw;
2996 }
2997 }
2281 } 2998 }
2282
2283 $y += $h;
2284 } 2999 }
2285
2286 glDisable GL_TEXTURE_2D;
2287 }; 3000 };
2288 }); 3001 });
2289} 3002}
2290 3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $_->{w} = 1e10 for @{ $self->{par} };
3010 $self->reflow;
3011}
3012
2291sub _draw { 3013sub _draw {
2292 my ($self) = @_; 3014 my ($self) = @_;
2293 3015
2294 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3019 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2299 3021
2300 $self->{children}[1]->draw; 3022 $self->{children}[1]->draw;
2301
2302} 3023}
2303 3024
2304############################################################################# 3025#############################################################################
2305 3026
2306package CFClient::UI::Animator; 3027package CFPlus::UI::Animator;
2307 3028
2308use CFClient::OpenGL; 3029use CFPlus::OpenGL;
2309 3030
2310our @ISA = CFClient::UI::Bin::; 3031our @ISA = CFPlus::UI::Bin::;
2311 3032
2312sub moveto { 3033sub moveto {
2313 my ($self, $x, $y) = @_; 3034 my ($self, $x, $y) = @_;
2314 3035
2315 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3036 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2343 glPopMatrix; 3064 glPopMatrix;
2344} 3065}
2345 3066
2346############################################################################# 3067#############################################################################
2347 3068
2348package CFClient::UI::Flopper; 3069package CFPlus::UI::Flopper;
2349 3070
2350our @ISA = CFClient::UI::Button::; 3071our @ISA = CFPlus::UI::Button::;
2351 3072
2352sub new { 3073sub new {
2353 my $class = shift; 3074 my $class = shift;
2354 3075
2355 my $self = $class->SUPER::new ( 3076 my $self = $class->SUPER::new (
2356 state => 0, 3077 state => 0,
2357 connect_activate => \&toggle_flopper, 3078 on_activate => \&toggle_flopper,
2358 @_ 3079 @_
2359 ); 3080 );
2360 3081
2361 if ($self->{state}) {
2362 $self->{state} = 0;
2363 $self->toggle_flopper;
2364 }
2365
2366 $self 3082 $self
2367} 3083}
2368 3084
2369sub toggle_flopper { 3085sub toggle_flopper {
2370 my ($self) = @_; 3086 my ($self) = @_;
2371 3087
2372 # TODO: use animation 3088 $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} 3089}
2384 3090
2385############################################################################# 3091#############################################################################
2386 3092
2387package CFClient::UI::Tooltip; 3093package CFPlus::UI::Tooltip;
2388 3094
2389our @ISA = CFClient::UI::Bin::; 3095our @ISA = CFPlus::UI::Bin::;
2390 3096
2391use CFClient::OpenGL; 3097use CFPlus::OpenGL;
2392 3098
2393sub new { 3099sub new {
2394 my $class = shift; 3100 my $class = shift;
2395 3101
2396 $class->SUPER::new ( 3102 $class->SUPER::new (
… …
2400} 3106}
2401 3107
2402sub set_tooltip_from { 3108sub set_tooltip_from {
2403 my ($self, $widget) = @_; 3109 my ($self, $widget) = @_;
2404 3110
3111 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3112 if $widget->{tooltip} =~ /^#(.*)$/;
3113
3114 my $tooltip = $widget->{tooltip};
3115
3116 if ($ENV{CFPLUS_DEBUG} & 2) {
3117 $tooltip .= "\n\n" . (ref $widget) . "\n"
3118 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3119 . "req $widget->{req_w} $widget->{req_h}\n"
3120 . "visible $widget->{visible}";
3121 }
3122
3123 $tooltip =~ s/^\n+//;
3124 $tooltip =~ s/\n+$//;
3125
2405 $self->add (new CFClient::UI::Label 3126 $self->add (new CFPlus::UI::Label
2406 markup => $widget->{tooltip}, 3127 markup => $tooltip,
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3128 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 3129 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 3130 style => 1, # FLAG_INVERSE
3131 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 3132 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 3133 );
2412} 3134}
2413 3135
2414sub size_request { 3136sub size_request {
2415 my ($self) = @_; 3137 my ($self) = @_;
… …
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3139 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418 3140
2419 ($w + 4, $h + 4) 3141 ($w + 4, $h + 4)
2420} 3142}
2421 3143
2422sub size_allocate { 3144sub invoke_size_allocate {
2423 my ($self, $w, $h) = @_; 3145 my ($self, $w, $h) = @_;
2424 3146
2425 $self->SUPER::size_allocate ($w - 4, $h - 4); 3147 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3148}
3149
3150sub invoke_visibility_change {
3151 my ($self, $visible) = @_;
3152
3153 return unless $visible;
3154
3155 $self->{root}->on_post_alloc ("move_$self" => sub {
3156 my $widget = $self->{owner}
3157 or return;
3158
3159 if ($widget->{visible}) {
3160 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3161
3162 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3163 if $x + $self->{w} > $self->{root}{w};
3164
3165 $self->move_abs ($x, $y);
3166 } else {
3167 $self->hide;
3168 }
3169 });
2426} 3170}
2427 3171
2428sub _draw { 3172sub _draw {
2429 my ($self) = @_; 3173 my ($self) = @_;
2430 3174
… …
2447 glVertex $w, $h; 3191 glVertex $w, $h;
2448 glVertex $w, 0; 3192 glVertex $w, 0;
2449 glEnd; 3193 glEnd;
2450 3194
2451 glTranslate 2 - 0.375, 2 - 0.375; 3195 glTranslate 2 - 0.375, 2 - 0.375;
3196
2452 $self->SUPER::_draw; 3197 $self->SUPER::_draw;
2453} 3198}
2454 3199
2455############################################################################# 3200#############################################################################
2456 3201
2457package CFClient::UI::Face; 3202package CFPlus::UI::Face;
2458 3203
2459our @ISA = CFClient::UI::Base::; 3204our @ISA = CFPlus::UI::DrawBG::;
2460 3205
2461use CFClient::OpenGL; 3206use CFPlus::OpenGL;
2462 3207
2463sub new { 3208sub new {
2464 my $class = shift; 3209 my $class = shift;
2465 3210
2466 $class->SUPER::new ( 3211 my $self = $class->SUPER::new (
2467 aspect => 1, 3212 aspect => 1,
3213 can_events => 0,
2468 @_, 3214 @_,
2469 ) 3215 );
3216
3217 if ($self->{anim} && $self->{animspeed}) {
3218 Scalar::Util::weaken (my $widget = $self);
3219
3220 $self->{timer} = Event->timer (
3221 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3222 hard => 1,
3223 interval => $self->{animspeed},
3224 cb => sub {
3225 ++$widget->{frame};
3226 $widget->update;
3227 },
3228 );
3229 }
3230
3231 $self
2470} 3232}
2471 3233
2472sub size_request { 3234sub size_request {
2473 (32, 8) 3235 (32, 8)
2474} 3236}
2475 3237
3238sub update {
3239 my ($self) = @_;
3240
3241 return unless $self->{visible};
3242
3243 $self->SUPER::update;
3244}
3245
2476sub _draw { 3246sub _draw {
2477 my ($self) = @_; 3247 my ($self) = @_;
2478 3248
2479 return unless $::CONN;#d# manage and cache textures differently 3249 return unless $::CONN;
3250
3251 $self->SUPER::_draw;
3252
3253 my $face;
3254
3255 if ($self->{frame}) {
3256 my $anim = $::CONN->{anim}[$self->{anim}];
3257
3258 $face = $anim->[ $self->{frame} % @$anim ]
3259 if $anim && @$anim;
3260 }
3261
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3262 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 3263
2482 # TODO animation
2483 if ($tex) { 3264 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 3265 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 3267 glColor 0, 0, 0, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3268 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 3269 glDisable GL_TEXTURE_2D;
2489 } 3270 }
2490} 3271}
2491 3272
3273sub destroy {
3274 my ($self) = @_;
3275
3276 $self->{timer}->cancel
3277 if $self->{timer};
3278
3279 $self->SUPER::destroy;
3280}
3281
2492############################################################################# 3282#############################################################################
2493 3283
2494package CFClient::UI::InventoryItem; 3284package CFPlus::UI::Buttonbar;
2495 3285
2496our @ISA = CFClient::UI::HBox::; 3286our @ISA = CFPlus::UI::HBox::;
2497 3287
2498sub new { 3288# 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 3289
2572############################################################################# 3290#############################################################################
2573 3291
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; 3292package CFPlus::UI::Menu;
2623 3293
2624our @ISA = CFClient::UI::FancyFrame::; 3294our @ISA = CFPlus::UI::Toplevel::;
2625 3295
2626use CFClient::OpenGL; 3296use CFPlus::OpenGL;
2627 3297
2628sub new { 3298sub new {
2629 my $class = shift; 3299 my $class = shift;
2630 3300
2631 my $self = $class->SUPER::new ( 3301 my $self = $class->SUPER::new (
2632 items => [], 3302 items => [],
2633 z => 100, 3303 z => 100,
2634 @_, 3304 @_,
2635 ); 3305 );
2636 3306
2637 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3307 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2638 3308
2639 for my $item (@{ $self->{items} }) { 3309 for my $item (@{ $self->{items} }) {
2640 my ($widget, $cb) = @$item; 3310 my ($widget, $cb, $tooltip) = @$item;
2641 3311
2642 # handle various types of items, only text for now 3312 # handle various types of items, only text for now
2643 if (!ref $widget) { 3313 if (!ref $widget) {
3314 if ($widget =~ /\t/) {
3315 my ($left, $right) = split /\t/, $widget, 2;
3316
2644 $widget = new CFClient::UI::Label 3317 $widget = new CFPlus::UI::HBox
2645 can_hover => 1, 3318 can_hover => 1,
2646 can_events => 1, 3319 can_events => 1,
3320 tooltip => $tooltip,
3321 children => [
3322 (new CFPlus::UI::Label markup => $left, expand => 1),
3323 (new CFPlus::UI::Label markup => $right, align => +1),
3324 ],
3325 ;
3326
3327 } else {
3328 $widget = new CFPlus::UI::Label
3329 can_hover => 1,
3330 can_events => 1,
2647 text => $widget; 3331 markup => $widget,
3332 tooltip => $tooltip;
3333 }
2648 } 3334 }
2649 3335
2650 $self->{item}{$widget} = $item; 3336 $self->{item}{$widget} = $item;
2651 3337
2652 $self->{vbox}->add ($widget); 3338 $self->{vbox}->add ($widget);
… …
2664 # maybe save $GRAB? must be careful about events... 3350 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self; 3351 $GRAB = $self;
2666 $self->{button} = $ev->{button}; 3352 $self->{button} = $ev->{button};
2667 3353
2668 $self->show; 3354 $self->show;
2669 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3355 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2670} 3356}
2671 3357
2672sub mouse_motion { 3358sub invoke_mouse_motion {
2673 my ($self, $ev, $x, $y) = @_; 3359 my ($self, $ev, $x, $y) = @_;
2674 3360
2675 # TODO: should use vbox->find_widget or so 3361 # TODO: should use vbox->find_widget or so
2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3362 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2677 $self->{hover} = $self->{item}{$HOVER}; 3363 $self->{hover} = $self->{item}{$HOVER};
2678}
2679 3364
3365 0
3366}
3367
2680sub button_up { 3368sub invoke_button_up {
2681 my ($self, $ev, $x, $y) = @_; 3369 my ($self, $ev, $x, $y) = @_;
2682 3370
2683 if ($ev->{button} == $self->{button}) { 3371 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB; 3372 undef $GRAB;
2685 $self->hide; 3373 $self->hide;
2686 3374
2687 $self->emit ("popdown"); 3375 $self->emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover}; 3376 $self->{hover}[1]->() if $self->{hover};
3377 } else {
3378 return 0
3379 }
3380
2689 } 3381 1
2690} 3382}
2691 3383
2692############################################################################# 3384#############################################################################
2693 3385
2694package CFClient::UI::Statusbox; 3386package CFPlus::UI::Multiplexer;
2695 3387
3388our @ISA = CFPlus::UI::Container::;
3389
3390sub new {
3391 my $class = shift;
3392
3393 my $self = $class->SUPER::new (
3394 @_,
3395 );
3396
3397 $self->{current} = $self->{children}[0]
3398 if @{ $self->{children} };
3399
3400 $self
3401}
3402
3403sub add {
3404 my ($self, @widgets) = @_;
3405
3406 $self->SUPER::add (@widgets);
3407
3408 $self->{current} = $self->{children}[0]
3409 if @{ $self->{children} };
3410}
3411
3412sub get_current_page {
3413 my ($self) = @_;
3414
3415 $self->{current}
3416}
3417
3418sub set_current_page {
3419 my ($self, $page_or_widget) = @_;
3420
3421 my $widget = ref $page_or_widget
3422 ? $page_or_widget
3423 : $self->{children}[$page_or_widget];
3424
3425 $self->{current} = $widget;
3426 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3427
3428 $self->emit (page_changed => $self->{current});
3429
3430 $self->realloc;
3431}
3432
3433sub visible_children {
3434 $_[0]{current}
3435}
3436
3437sub size_request {
3438 my ($self) = @_;
3439
3440 $self->{current}->size_request
3441}
3442
3443sub invoke_size_allocate {
3444 my ($self, $w, $h) = @_;
3445
3446 $self->{current}->configure (0, 0, $w, $h);
3447
3448 1
3449}
3450
3451sub _draw {
3452 my ($self) = @_;
3453
3454 $self->{current}->draw;
3455}
3456
3457#############################################################################
3458
3459package CFPlus::UI::Notebook;
3460
2696our @ISA = CFClient::UI::VBox::; 3461our @ISA = CFPlus::UI::VBox::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (
3467 buttonbar => (new CFPlus::UI::Buttonbar),
3468 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3469 # filter => # will be put between multiplexer and $self
3470 @_,
3471 );
3472
3473 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3474 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3475
3476 $self
3477}
3478
3479sub add {
3480 my ($self, $title, $widget, $tooltip) = @_;
3481
3482 Scalar::Util::weaken $self;
3483
3484 $self->{buttonbar}->add (new CFPlus::UI::Button
3485 markup => $title,
3486 tooltip => $tooltip,
3487 on_activate => sub { $self->set_current_page ($widget) },
3488 );
3489
3490 $self->{multiplexer}->add ($widget);
3491}
3492
3493sub get_current_page {
3494 my ($self) = @_;
3495
3496 $self->{multiplexer}->get_current_page
3497}
3498
3499sub set_current_page {
3500 my ($self, $page) = @_;
3501
3502 $self->{multiplexer}->set_current_page ($page);
3503 $self->emit (page_changed => $self->{multiplexer}{current});
3504}
3505
3506#############################################################################
3507
3508package CFPlus::UI::Selector;
3509
3510use utf8;
3511
3512our @ISA = CFPlus::UI::Button::;
3513
3514sub new {
3515 my $class = shift;
3516
3517 my $self = $class->SUPER::new (
3518 options => [], # [value, title, longdesc], ...
3519 value => undef,
3520 @_,
3521 );
3522
3523 $self->_set_value ($self->{value});
3524
3525 $self
3526}
3527
3528sub invoke_button_down {
3529 my ($self, $ev) = @_;
3530
3531 my @menu_items;
3532
3533 for (@{ $self->{options} }) {
3534 my ($value, $title, $tooltip) = @$_;
3535
3536 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3537 }
3538
3539 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3540}
3541
3542sub _set_value {
3543 my ($self, $value) = @_;
3544
3545 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3546 or return;
3547
3548 $self->{value} = $item->[0];
3549 $self->set_markup ("$item->[1] ⇓");
3550 $self->set_tooltip ($item->[2]);
3551}
3552
3553sub set_value {
3554 my ($self, $value) = @_;
3555
3556 return unless $self->{value} ne $value;
3557
3558 $self->_set_value ($value);
3559 $self->emit (changed => $value);
3560}
3561
3562#############################################################################
3563
3564package CFPlus::UI::Statusbox;
3565
3566our @ISA = CFPlus::UI::VBox::;
3567
3568sub new {
3569 my $class = shift;
3570
3571 my $self = $class->SUPER::new (
3572 fontsize => 0.8,
3573 @_,
3574 );
3575
3576 Scalar::Util::weaken (my $this = $self);
3577
3578 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3579
3580 $self
3581}
2697 3582
2698sub reorder { 3583sub reorder {
2699 my ($self) = @_; 3584 my ($self) = @_;
2700 my $NOW = time; 3585 my $NOW = Time::HiRes::time;
3586
3587 # freeze display when hovering over any label
3588 return if $CFPlus::UI::TOOLTIP->{owner}
3589 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3590 values %{ $self->{item} };
2701 3591
2702 while (my ($k, $v) = each %{ $self->{item} }) { 3592 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3593 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 } 3594 }
2705 3595
… …
2708 my @items = sort { 3598 my @items = sort {
2709 $a->{pri} <=> $b->{pri} 3599 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id} 3600 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} }; 3601 } values %{ $self->{item} };
2712 3602
3603 $self->{timer}->interval (1);
3604
2713 my $count = 10 + 1; 3605 my $count = 10 + 1;
2714 for my $item (@items) { 3606 for my $item (@items) {
2715 last unless --$count; 3607 last unless --$count;
2716 3608
2717 push @widgets, $item->{label} ||= do { 3609 my $label = $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all) 3610 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1 3611 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}" 3612 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text}; 3613 : $item->{text};
2722 3614
2723 for ($short) { 3615 for ($short) {
2724 s/^\s+//; 3616 s/^\s+//;
2725 s/\s+/ /g; 3617 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 3618 }
2729 3619
2730 new CFClient::UI::Label 3620 new CFPlus::UI::Label
2731 markup => $short, 3621 markup => $short,
2732 tooltip => $item->{tooltip}, 3622 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 3623 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 3624 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 3625 fontsize => $item->{fontsize} || $self->{fontsize},
3626 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 3627 fg => [@{ $item->{fg} }],
2737 can_events => 1, 3628 can_events => 1,
2738 can_hover => 1 3629 can_hover => 1
2739 }; 3630 };
3631
3632 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3633 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3634 $label->update;
3635 $label->set_max_size (undef, $label->{req_h} * $diff)
3636 if $diff < 1;
3637 $self->{timer}->interval (1/30);
3638 } else {
3639 $label->{fg}[3] = $item->{fg}[3] || 1;
3640 }
3641
3642 push @widgets, $label;
2740 } 3643 }
2741 3644
2742 $self->clear; 3645 $self->clear;
2743 $self->SUPER::add (reverse @widgets); 3646 $self->SUPER::add (reverse @widgets);
2744} 3647}
… …
2747 my ($self, $text, %arg) = @_; 3650 my ($self, $text, %arg) = @_;
2748 3651
2749 $text =~ s/^\s+//; 3652 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//; 3653 $text =~ s/\s+$//;
2751 3654
3655 return unless $text;
3656
2752 my $timeout = time + ((delete $arg{timeout}) || 60); 3657 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2753 3658
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3659 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755 3660
2756 if (my $item = $self->{item}{$group}) { 3661 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) { 3662 if ($item->{text} eq $text) {
2758 $item->{count}++; 3663 $item->{count}++;
2759 } else { 3664 } else {
2760 $item->{count} = 1; 3665 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text; 3666 $item->{text} = $item->{tooltip} = $text;
2762 } 3667 }
2763 $item->{id} = ++$self->{id}; 3668 $item->{id} += 0.2;#d#
2764 $item->{timeout} = $timeout; 3669 $item->{timeout} = $timeout;
2765 delete $item->{label}; 3670 delete $item->{label};
2766 } else { 3671 } else {
2767 $self->{item}{$group} = { 3672 $self->{item}{$group} = {
2768 id => ++$self->{id}, 3673 id => ++$self->{id},
2769 text => $text, 3674 text => $text,
2770 timeout => $timeout, 3675 timeout => $timeout,
2771 tooltip => $text, 3676 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 3677 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 3678 pri => 0,
2775 count => 1, 3679 count => 1,
2776 %arg, 3680 %arg,
2777 }; 3681 };
2778 } 3682 }
2779 3683
3684 $ROOT->on_refresh (reorder => sub {
3685 $self->reorder;
3686 });
3687}
3688
3689sub reconfigure {
3690 my ($self) = @_;
3691
3692 delete $_->{label}
3693 for values %{ $self->{item} || {} };
3694
2780 $self->reorder; 3695 $self->reorder;
3696 $self->SUPER::reconfigure;
3697}
3698
3699sub destroy {
3700 my ($self) = @_;
3701
3702 $self->{timer}->cancel;
3703
3704 $self->SUPER::destroy;
2781} 3705}
2782 3706
2783############################################################################# 3707#############################################################################
2784 3708
2785package CFClient::UI::Root; 3709package CFPlus::UI::Inventory;
2786 3710
2787our @ISA = CFClient::UI::Container::; 3711our @ISA = CFPlus::UI::Table::;
2788
2789use CFClient::OpenGL;
2790 3712
2791sub new { 3713sub new {
2792 my $class = shift; 3714 my $class = shift;
2793 3715
2794 $class->SUPER::new ( 3716 my $self = $class->SUPER::new (
3717 col_expand => [0, 1, 0],
3718 items => [],
3719 @_,
3720 );
3721
3722 $self->set_sort_order (undef);
3723
3724 $self
3725}
3726
3727sub update_items {
3728 my ($self) = @_;
3729
3730 $self->clear;
3731
3732 my @item = $self->{sort}->(@{ $self->{items} });
3733
3734 my @adds;
3735 my $row = 0;
3736 for my $item ($self->{sort}->(@{ $self->{items} })) {
3737 CFPlus::Item::update_widgets $item;
3738
3739 push @adds, 0, $row, $item->{face_widget};
3740 push @adds, 1, $row, $item->{desc_widget};
3741 push @adds, 2, $row, $item->{weight_widget};
3742
3743 $row++;
3744 }
3745
3746 $self->add (@adds);
3747}
3748
3749sub set_sort_order {
3750 my ($self, $order) = @_;
3751
3752 $self->{sort} = $order ||= sub {
3753 sort {
3754 $a->{type} <=> $b->{type}
3755 or $a->{name} cmp $b->{name}
3756 } @_
3757 };
3758
3759 $self->update_items;
3760}
3761
3762sub set_items {
3763 my ($self, $items) = @_;
3764
3765 $self->{items} = [$items ? values %$items : ()];
3766 $self->update_items;
3767}
3768
3769#############################################################################
3770
3771package CFPlus::UI::SpellList;
3772
3773our @ISA = CFPlus::UI::Table::;
3774
3775sub new {
3776 my $class = shift;
3777
3778 my $self = $class->SUPER::new (
3779 binding => [],
3780 commands => [],
2795 @_, 3781 @_,
2796 ) 3782 )
2797} 3783}
2798 3784
2799sub configure { 3785my $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 3786
2802 $self->{w} = $w; 3787my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2803 $self->{h} = $h; 3788 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2804} 3789my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3790 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3791my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3792 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3793my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3794 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3795my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2805 3797
2806sub check_size { 3798sub rebuild_spell_list {
3799 my ($self) = @_;
3800
3801 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3802 $self->clear;
3803
3804 return unless $::CONN;
3805
3806 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3807 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3808 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3809 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3810 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3811
3812 my $row = 0;
3813
3814 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3815 my $spell = $self->{spell}{$_};
3816
3817 $row++;
3818
3819 my $spell_cb = sub {
3820 my ($widget, $ev) = @_;
3821
3822 if ($ev->{button} == 1) {
3823 $::CONN->user_send ("cast $spell->{name}");
3824 } elsif ($ev->{button} == 2) {
3825 $::CONN->user_send ("invoke $spell->{name}");
3826 } elsif ($ev->{button} == 3) {
3827 (new CFPlus::UI::Menu
3828 items => [
3829 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831 ],
3832 )->popup ($ev);
3833 } else {
3834 return 0;
3835 }
3836
3837 1
3838 };
3839
3840 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3841
3842 #TODO: add path info to tooltip
3843 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844
3845 $self->add (0, $row, new CFPlus::UI::Face
3846 face => $spell->{face},
3847 can_hover => 1,
3848 can_events => 1,
3849 tooltip => $tooltip,
3850 on_button_down => $spell_cb,
3851 );
3852
3853 $self->add (1, $row, new CFPlus::UI::Label
3854 expand => 1,
3855 text => $spell->{name},
3856 can_hover => 1,
3857 can_events => 1,
3858 tooltip => $tooltip,
3859 on_button_down => $spell_cb,
3860 );
3861
3862 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3863 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3864 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3865 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3866 }
3867 });
3868}
3869
3870sub add_spell {
2807 my ($self) = @_; 3871 my ($self, $spell) = @_;
2808 3872
2809 $self->size_allocate ($self->{w}, $self->{h}) 3873 $self->{spell}->{$spell->{name}} = $spell;
2810 if $self->{w}; 3874 $self->rebuild_spell_list;
3875}
3876
3877sub remove_spell {
3878 my ($self, $spell) = @_;
3879
3880 delete $self->{spell}->{$spell->{name}};
3881 $self->rebuild_spell_list;
3882}
3883
3884sub clear_spells {
3885 my ($self) = @_;
3886
3887 $self->{spell} = {};
3888 $self->rebuild_spell_list;
3889}
3890
3891#############################################################################
3892
3893package CFPlus::UI::Root;
3894
3895our @ISA = CFPlus::UI::Container::;
3896
3897use List::Util qw(min max);
3898
3899use CFPlus::OpenGL;
3900
3901sub new {
3902 my $class = shift;
3903
3904 my $self = $class->SUPER::new (
3905 visible => 1,
3906 @_,
3907 );
3908
3909 Scalar::Util::weaken ($self->{root} = $self);
3910
3911 $self
2811} 3912}
2812 3913
2813sub size_request { 3914sub size_request {
2814 my ($self) = @_; 3915 my ($self) = @_;
2815 3916
2816 ($self->{w}, $self->{h}) 3917 ($self->{w}, $self->{h})
2817} 3918}
2818 3919
3920sub _to_pixel {
3921 my ($coord, $size, $max) = @_;
3922
3923 $coord =
3924 $coord eq "center" ? ($max - $size) * 0.5
3925 : $coord eq "max" ? $max
3926 : $coord;
3927
3928 $coord = 0 if $coord < 0;
3929 $coord = $max - $size if $coord > $max - $size;
3930
3931 int $coord + 0.5
3932}
3933
2819sub size_allocate { 3934sub invoke_size_allocate {
2820 my ($self, $w, $h) = @_; 3935 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 3936
2828 for my $child ($self->children) { 3937 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3938 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830 3939
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3940 $X = $child->{force_x} if exists $child->{force_x};
2832 if exists $child->{req_x}; 3941 $Y = $child->{force_y} if exists $child->{force_y};
2833 3942
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3943 $X = _to_pixel $X, $W, $self->{w};
2835 if exists $child->{req_y}; 3944 $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 3945
2840 $child->configure ($X, $Y, $W, $H); 3946 $child->configure ($X, $Y, $W, $H);
2841 } 3947 }
3948
3949 1
2842} 3950}
2843 3951
2844sub coord2local { 3952sub coord2local {
2845 my ($self, $x, $y) = @_; 3953 my ($self, $x, $y) = @_;
2846 3954
… …
2854} 3962}
2855 3963
2856sub update { 3964sub update {
2857 my ($self) = @_; 3965 my ($self) = @_;
2858 3966
2859 $self->check_size;
2860 $::WANT_REFRESH++; 3967 $::WANT_REFRESH++;
2861} 3968}
2862 3969
2863sub add { 3970sub add {
2864 my ($self, @children) = @_; 3971 my ($self, @children) = @_;
2865 3972
2866 for my $child (@children) {
2867 $child->{toplevel} = 1; 3973 $_->{is_toplevel} = 1
2868 3974 for @children;
2869 # integerise window positions
2870 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y};
2872 }
2873 3975
2874 $self->SUPER::add (@children); 3976 $self->SUPER::add (@children);
3977}
3978
3979sub remove {
3980 my ($self, @children) = @_;
3981
3982 $self->SUPER::remove (@children);
3983
3984 delete $self->{is_toplevel}
3985 for @children;
3986
3987 while (@children) {
3988 my $w = pop @children;
3989 push @children, $w->children;
3990 $w->set_invisible;
3991 }
2875} 3992}
2876 3993
2877sub on_refresh { 3994sub on_refresh {
2878 my ($self, $id, $cb) = @_; 3995 my ($self, $id, $cb) = @_;
2879 3996
… …
2892 while ($self->{refresh_hook}) { 4009 while ($self->{refresh_hook}) {
2893 $_->() 4010 $_->()
2894 for values %{delete $self->{refresh_hook}}; 4011 for values %{delete $self->{refresh_hook}};
2895 } 4012 }
2896 4013
2897 if ($self->{check_size}) { 4014 if ($self->{realloc}) {
2898 my @queue = ([], []); 4015 my %queue;
4016 my @queue;
4017 my $widget;
2899 4018
2900 for (;;) { 4019 outer:
2901 if ($self->{check_size}) { 4020 while () {
2902 # heuristic: check containers last 4021 if (my $realloc = delete $self->{realloc}) {
2903 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4022 for $widget (values %$realloc) {
2904 for values %{delete $self->{check_size}} 4023 $widget->{visible} or next; # do not resize invisible widgets
4024
4025 $queue{$widget+0}++ and next; # duplicates are common
4026
4027 push @{ $queue[$widget->{visible}] }, $widget;
4028 }
2905 } 4029 }
2906 4030
2907 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4031 while () {
4032 @queue or last outer;
2908 4033
2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4034 $widget = pop @{ $queue[-1] || [] }
2910 ? @$widget{qw(user_w user_h)} 4035 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 4036
4037 pop @queue;
4038 }
4039
4040 delete $queue{$widget+0};
4041
4042 my ($w, $h) = $widget->size_request;
4043
4044 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4045 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4046
4047 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4048 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4049
4050 $w = $widget->{force_w} if exists $widget->{force_w};
4051 $h = $widget->{force_h} if exists $widget->{force_h};
4052
4053 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4054 || delete $widget->{force_realloc}) {
2917 $widget->{req_w} = $w; 4055 $widget->{req_w} = $w;
2918 $widget->{req_h} = $h; 4056 $widget->{req_h} = $h;
2919 4057
2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4058 $self->{size_alloc}{$widget+0} = $widget;
2921 4059
2922 $widget->{parent}->check_size
2923 if $widget->{parent}; 4060 if (my $parent = $widget->{parent}) {
4061 $self->{realloc}{$parent+0} = $parent
4062 unless $queue{$parent+0};
4063
4064 $parent->{force_size_alloc} = 1;
4065 $self->{size_alloc}{$parent+0} = $parent;
4066 }
2924 } 4067 }
4068
4069 delete $self->{realloc}{$widget+0};
2925 } 4070 }
2926 } 4071 }
2927 4072
2928 while ($self->{size_alloc}) { 4073 while (my $size_alloc = delete $self->{size_alloc}) {
2929 for (values %{delete $self->{size_alloc}}) { 4074 my @queue = sort { $b->{visible} <=> $a->{visible} }
2930 my ($widget, $w, $h) = @$_; 4075 values %$size_alloc;
4076
4077 while () {
4078 my $widget = pop @queue || last;
4079
4080 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2931 4081
2932 $w = 0 if $w < 0; 4082 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0; 4083 $h = 0 if $h < 0;
2934 4084
4085 $w = max $widget->{min_w}, $w;
4086 $h = max $widget->{min_h}, $h;
4087
4088# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4089# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4090
4091 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4092 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4093
4094 $w = int $w + 0.5;
4095 $h = int $h + 0.5;
4096
4097 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4098 $widget->{old_w} = $widget->{w};
4099 $widget->{old_h} = $widget->{h};
4100
2935 $widget->{w} = $w; 4101 $widget->{w} = $w;
2936 $widget->{h} = $h; 4102 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h); 4103
2938 $widget->emit (size_allocate => $w, $h); 4104 $widget->emit (size_allocate => $w, $h);
4105 }
2939 } 4106 }
2940 } 4107 }
2941 4108
2942 while ($self->{post_alloc_hook}) { 4109 while ($self->{post_alloc_hook}) {
2943 $_->() 4110 $_->()
2944 for values %{delete $self->{post_alloc_hook}}; 4111 for values %{delete $self->{post_alloc_hook}};
2945 } 4112 }
2946 4113
4114
2947 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4115 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4116 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 4117 glClear GL_COLOR_BUFFER_BIT;
2950 4118
2951 glMatrixMode GL_PROJECTION; 4119 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 4120 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4121 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 4122 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 4123 glLoadIdentity;
2956 4124
4125 {
4126 package CFPlus::UI::Base;
4127
4128 ($draw_x, $draw_y, $draw_w, $draw_h) =
4129 (0, 0, $self->{w}, $self->{h});
4130 }
4131
2957 $self->_draw; 4132 $self->_draw;
2958} 4133}
2959 4134
2960############################################################################# 4135#############################################################################
2961 4136
2962package CFClient::UI; 4137package CFPlus::UI;
2963 4138
2964$ROOT = new CFClient::UI::Root; 4139$ROOT = new CFPlus::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 4140$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2966 4141
29671 41421
2968 4143

Diff Legend

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