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.229 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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