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.55 by root, Mon Apr 10 19:34:04 2006 UTC vs.
Revision 1.103 by elmex, Fri Apr 14 13:51:36 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $TOPLEVEL;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
… …
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
65 65
66 $hover->update if $hover; 66 $hover->update if $hover;
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER;
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
72 80
73sub new { 81sub new {
74 my $class = shift; 82 my $class = shift;
75 83
76 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
77} 100}
78 101
79sub move { 102sub move {
80 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 104 $self->{x} = $x;
… …
90sub size_request { 113sub size_request {
91 require Carp; 114 require Carp;
92 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
93} 116}
94 117
95sub size_allocate { 118sub _size_allocate {
96 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
97 125
98 $self->{w} = $w; 126 $self->{w} = $w;
99 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
100} 143}
101 144
102sub focus_in { 145sub focus_in {
103 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
104 150
105 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 152 $focus->update if $focus;
107 $FOCUS->update; 153 $FOCUS->update;
108} 154}
… …
116 $focus->update if $focus; #? 162 $focus->update if $focus; #?
117} 163}
118 164
119sub mouse_motion { } 165sub mouse_motion { }
120sub button_up { } 166sub button_up { }
121sub button_down { }
122sub key_down { } 167sub key_down { }
123sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
124 175
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 181
131sub draw { 182sub draw {
132 my ($self) = @_; 183 my ($self) = @_;
133 184
185 return unless $self->{h} && $self->{w};
186
134 glPushMatrix; 187 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 189 $self->_draw;
137 if ($self == $HOVER) { 190 glPopMatrix;
138 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
139 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 198 glBegin GL_QUADS;
141 glVertex 0 , 0; 199 glVertex $x , $y;
142 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
145 glEnd; 203 glEnd;
146 glDisable GL_BLEND; 204 glDisable GL_BLEND;
147 } 205 }
148 glPopMatrix;
149} 206}
150 207
151sub _draw { 208sub _draw {
152 my ($self) = @_; 209 my ($self) = @_;
153 210
154 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 212}
167 213
168sub find_widget { 214sub find_widget {
169 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
170 216
… …
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 220
175 () 221 ()
176} 222}
177 223
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 224sub set_parent {
181 my ($self, $par) = @_; 225 my ($self, $par) = @_;
182 226
183 $self->{parent} = $par; 227 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
193 237
194 $self->{parent}->update 238 $self->{parent}->update
195 if $self->{parent}; 239 if $self->{parent};
196} 240}
197 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
198sub DESTROY { 255sub DESTROY {
199 my ($self) = @_; 256 my ($self) = @_;
200 257
201 #$self->deactivate; 258 #$self->deactivate;
202} 259}
203 260
204############################################################################# 261#############################################################################
205 262
206package Crossfire::Client::Widget::Container; 263package CFClient::UI::DrawBG;
207 264
208our @ISA = Crossfire::Client::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
209 269
210sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
211 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
212 321
322 my $children = delete $arg{children} || [];
323
213 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
215 326
216 $self 327 $self
217} 328}
218 329
219sub add { 330sub add {
220 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
221 332
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 333 $chld->set_parent ($self);
224 334
225 @{$self->{children}} = 335 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
228 339
229 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
230 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
231} 342}
232 343
233sub remove { 344sub remove {
234 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
235 346
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237 348
238 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
239} 350}
240 351
241sub find_widget { 352sub find_widget {
242 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
243 354
… …
260 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
261} 372}
262 373
263############################################################################# 374#############################################################################
264 375
265package Crossfire::Client::Widget::Bin; 376package CFClient::UI::Bin;
266 377
267our @ISA = Crossfire::Client::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
268 404
269sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
270 406
271sub size_request { 407sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
273} 409}
274 410
275sub size_allocate { 411sub size_allocate {
276 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
277 413
278 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
279 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
280 if $self->{children}[0]
281} 417}
282 418
283############################################################################# 419#############################################################################
284 420
285package Crossfire::Client::Widget::Window; 421package CFClient::UI::Window;
286 422
287our @ISA = Crossfire::Client::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
288 424
289use SDL::OpenGL; 425use SDL::OpenGL;
290 426
291sub new { 427sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
293 429
294 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 431}
298 432
299sub update { 433sub update {
300 my ($self) = @_; 434 my ($self) = @_;
301 435
436 # we want to do this delayed...
302 $self->render_chld; 437 $self->render_chld;
303 $self->SUPER::update; 438 $self->SUPER::update;
304} 439}
305 440
306sub render_chld { 441sub render_chld {
307 my ($self) = @_; 442 my ($self) = @_;
308 443
309 $self->{texture} = 444 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl ( 445 CFClient::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
312 ); 447 );
313} 448}
314 449
315sub size_allocate { 450sub size_allocate {
316 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
317 452
318 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
319 $self->{h} = $h;
320 454
321 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
322 456
323 $self->render_chld; 457 $self->render_chld;
324} 458}
325 459
326sub _draw { 460sub _draw {
… …
330 464
331 my $tex = $self->{texture} 465 my $tex = $self->{texture}
332 or return; 466 or return;
333 467
334 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 glBindTexture GL_TEXTURE_2D, $tex->{name};
338 472
339 glBegin GL_QUADS; 473 $tex->draw_quad (0, 0, $w, $h);
340 glTexCoord 0, 0; glVertex 0, 0;
341 glTexCoord 0, 1; glVertex 0, $h;
342 glTexCoord 1, 1; glVertex $w, $h;
343 glTexCoord 1, 0; glVertex $w, 0;
344 glEnd;
345 474
346 glDisable GL_BLEND; 475 glDisable GL_BLEND;
347 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
348} 477}
349 478
350############################################################################# 479#############################################################################
351 480
352package Crossfire::Client::Widget::Frame; 481package CFClient::UI::Frame;
353 482
354our @ISA = Crossfire::Client::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
355 484
356use SDL::OpenGL; 485use SDL::OpenGL;
357 486
358sub size_request { 487sub size_request {
359 my ($self) = @_; 488 my ($self) = @_;
… …
364 493
365 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
366} 495}
367 496
368sub size_allocate { 497sub size_allocate {
369 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
370 499
371 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 501
374 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
375 $self->child->move (2, 2);
376} 503}
377 504
378sub _draw { 505sub _draw {
379 my ($self) = @_; 506 my ($self) = @_;
380 507
… …
382 509
383 my ($w, $h) = $chld->size_request; 510 my ($w, $h) = $chld->size_request;
384 511
385 glBegin GL_QUADS; 512 glBegin GL_QUADS;
386 glColor 0, 0, 0; 513 glColor 0, 0, 0;
387 glTexCoord 0, 0; glVertex 0 , 0; 514 glVertex 0 , 0;
388 glTexCoord 0, 1; glVertex 0 , $h + 4; 515 glVertex 0 , $h + 4;
389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 516 glVertex $w + 4 , $h + 4;
390 glTexCoord 1, 0; glVertex $w + 4 , 0; 517 glVertex $w + 4 , 0;
391 glEnd; 518 glEnd;
392 519
393 $chld->draw; 520 $chld->draw;
394} 521}
395 522
396############################################################################# 523#############################################################################
397 524
398package Crossfire::Client::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
399 526
400our @ISA = Crossfire::Client::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
401 528
402use SDL::OpenGL; 529use SDL::OpenGL;
403 530
404my @tex = 531my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
408sub size_request { 548sub size_request {
409 my ($self) = @_; 549 my ($self) = @_;
410 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
411 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
412 554
413 $h += $tex[1]->{height}; 555 (
414 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
415 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
416 $w += $tex[3]->{width}; 558 )
417
418 ($w, $h)
419} 559}
420 560
421sub size_allocate { 561sub size_allocate {
422 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
423 563
424 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
425 565
426 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
427 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
428 $w -= $tex[2]->{width};
429 $w -= $tex[3]->{width};
430 568
431 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
432 $w = $w < 0 ? 0 : $w; 570}
433 571
434 $self->child->size_allocate ($w, $h); 572sub button_down {
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 573 my ($self, $ev, $x, $y) = @_;
574
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
436} 618}
437 619
438sub _draw { 620sub _draw {
439 my ($self) = @_; 621 my ($self) = @_;
440 622
441 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
442 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
443 625
444 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
445 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
448 630
449 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
450 glBindTexture GL_TEXTURE_2D, $top->{name}; 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
451 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
452 glBegin GL_QUADS; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
453 glTexCoord 0, 0; glVertex 0 , 0; 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
454 glTexCoord 0, 1; glVertex 0 , $top->{height};
455 glTexCoord 1, 1; glVertex $w , $top->{height};
456 glTexCoord 1, 0; glVertex $w , 0;
457 glEnd;
458
459 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name};
461
462 glBegin GL_QUADS;
463 glTexCoord 0, 0; glVertex 0 , $top->{height};
464 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467 glEnd;
468
469 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name};
471
472 glBegin GL_QUADS;
473 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476 glTexCoord 1, 0; glVertex $w , $top->{height};
477 glEnd;
478
479 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name};
481
482 glBegin GL_QUADS;
483 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484 glTexCoord 0, 1; glVertex 0 , $h;
485 glTexCoord 1, 1; glVertex $w , $h;
486 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487 glEnd;
488 636
489 my $bg = $tex[0]; 637 my $bg = $tex[0];
490 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494 638
639 # TODO: repeat texture not scale
495 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
496 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
497 642
498 glBegin GL_QUADS; 643 glColor @{ $self->{bg} };
499 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
500 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503 glEnd;
504 644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
649
650 glDisable GL_TEXTURE_2D;
505 glDisable GL_BLEND; 651 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D;
507 652
508 $self->child->draw; 653 $self->child->draw;
509
510} 654}
511 655
512############################################################################# 656#############################################################################
513 657
514package Crossfire::Client::Widget::Table; 658package CFClient::UI::Table;
515 659
516our @ISA = Crossfire::Client::Widget::Bin::; 660our @ISA = CFClient::UI::Base::;
661
662use List::Util qw(max sum);
517 663
518use SDL::OpenGL; 664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
519 674
520sub add { 675sub add {
521 my ($self, $x, $y, $chld) = @_; 676 my ($self, $x, $y, $chld) = @_;
522 my $old_chld = $self->{children}[$y][$x];
523 677
524 $self->{children}[$y][$x] = $chld; 678 $self->{children}[$y][$x] = $chld;
525 $chld->set_parent ($self); 679 $chld->set_parent ($self);
680
681 $self->{w} = $self->{h} = -1;
526 $self->update; 682 $self->update;
527} 683}
528 684
529sub max_row_height { 685sub get_wh {
530 my ($self, $row) = @_; 686 my ($self) = @_;
531 687
532 my $hs = 0; 688 my (@w, @h);
533 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 689
690 for my $y (0 .. $#{$self->{children}}) {
534 my $c = $self->{children}->[$row]->[$xi]; 691 my $row = $self->{children}[$y]
535 if ($c) { 692 or next;
693
694 for my $x (0 .. $#$row) {
695 my $widget = $row->[$x]
696 or next;
536 my ($w, $h) = $c->size_request; 697 my ($w, $h) = $widget->size_request;
537 if ($hs < $h) { $hs = $h } 698
699 $w[$x] = max $w[$x], $w;
700 $h[$y] = max $h[$y], $h;
538 } 701 }
539 } 702 }
540 return $hs;
541}
542 703
543sub max_col_width { 704 (\@w, \@h)
705}
706
707sub size_request {
544 my ($self, $col) = @_; 708 my ($self) = @_;
545 709
710 my ($ws, $hs) = $self->get_wh;
711
712 (
713 (sum @$ws),
714 (sum @$hs),
715 )
716}
717
718sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722
723 my ($ws, $hs) = $self->get_wh;
724
725 my $req_w = sum @$ws;
726 my $req_h = sum @$hs;
727
728 # TODO: nicer code && do row_expand
729 my @col_expand = @{$self->{col_expand}};
730 @col_expand = (1) x @$ws unless @col_expand;
731 my $col_expand = (sum @col_expand) || 1;
732
733 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
736
737 my $y;
738
739 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r]
741 or next;
742
546 my $ws = 0; 743 my $x = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 744 my $row_h = $hs->[$r];
548 my $c = ($self->{children}->[$yi] || [])->[$col]; 745
549 if ($c) { 746 for my $c (0 .. $#$row) {
550 my ($w, $h) = $c->size_request; 747 my $col_w = $ws->[$c];
551 if ($ws < $w) { $ws = $w } 748
749 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
752
753 $x += $col_w;
552 } 754 }
755
756 $y += $row_h;
553 } 757 }
554 return $ws; 758
555} 759}
760
761sub find_widget {
762 my ($self, $x, $y) = @_;
763
764 $x -= $self->{x};
765 $y -= $self->{y};
766
767 my $res;
768
769 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
770 $res = $_->find_widget ($x, $y)
771 and return $res;
772 }
773
774 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
775}
776
777sub _draw {
778 my ($self) = @_;
779
780 for (grep $_, @{$self->{children}}) {
781 $_->draw for grep $_, @$_;
782 }
783}
784
785#############################################################################
786
787package CFClient::UI::HBox;
788
789# TODO: wrap into common Box base class
790
791our @ISA = CFClient::UI::Container::;
556 792
557sub size_request { 793sub size_request {
558 my ($self) = @_; 794 my ($self) = @_;
559 795
796 my @alloc = map [$_->size_request], @{$self->{children}};
797
798 (
799 (List::Util::sum map $_->[0], @alloc),
800 (List::Util::max map $_->[1], @alloc),
801 )
802}
803
804sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808
560 my ($hs, $ws) = (0, 0); 809 ($h, $w) = ($w, $h);
561 810
562 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 811 my $children = $self->{children};
563 $hs += $self->max_row_height ($yi);
564 }
565 812
566 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 813 my @h = map +($_->size_request)[0], @$children;
567 my $wm = 0; 814
568 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 815 my $req_h = List::Util::sum @h;
569 $wm += $self->max_col_width ($xi) 816
817 if ($req_h > $h) {
818 # ah well, not enough space
819 $_ *= $h / $req_h for @h;
820 } else {
821 my $exp = List::Util::sum map $_->{expand}, @$children;
822 $exp ||= 1;
823
824 for (0 .. $#$children) {
825 my $child = $children->[$_];
826
827 my $alloc_h = $h[$_];
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h;
570 } 830 }
571 if ($ws < $wm) { $ws = $wm }
572 } 831 }
573
574 return ($ws, $hs);
575}
576
577sub _draw {
578 my ($self) = @_;
579 832
580 my $y = 0; 833 my $y = 0;
581 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 834 for (0 .. $#$children) {
835 my $child = $children->[$_];
582 my $x = 0; 836 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w);
583 838
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 839 $y += $h;
585
586 my $c = $self->{children}->[$yi]->[$xi];
587 if ($c) {
588 $c->move ($x, $y, 0); #TODO: Move to size_request
589 $c->draw if $c;
590 }
591
592 $x += $self->max_col_width ($xi);
593 }
594
595 $y += $self->max_row_height ($yi);
596 } 840 }
597} 841}
598 842
599############################################################################# 843#############################################################################
600 844
601package Crossfire::Client::Widget::VBox; 845package CFClient::UI::VBox;
602 846
847# TODO: wrap into common Box base class
848
603our @ISA = Crossfire::Client::Widget::Container::; 849our @ISA = CFClient::UI::Container::;
604
605use SDL::OpenGL;
606 850
607sub size_request { 851sub size_request {
608 my ($self) = @_; 852 my ($self) = @_;
609 853
610 my @alloc = map [$_->size_request], @{$self->{children}}; 854 my @alloc = map [$_->size_request], @{$self->{children}};
… …
614 (List::Util::sum map $_->[1], @alloc), 858 (List::Util::sum map $_->[1], @alloc),
615 ) 859 )
616} 860}
617 861
618sub size_allocate { 862sub size_allocate {
619 my ($self, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
620 864
621 $self->w ($w); 865 $self->_size_allocate ($x, $y, $w, $h);
622 $self->h ($h);
623 866
624 my $exp; 867 my $children = $self->{children};
625 my @oth; 868
626 # find expand widget 869 my @h = map +($_->size_request)[1], @$children;
627 for (@{$self->{children}}) { 870
628 if ($_->{expand}) { 871 my $req_h = List::Util::sum @h;
872
873 if ($req_h > $h) {
874 # ah well, not enough space
875 $_ *= $h / $req_h for @h;
876 } else {
877 my $exp = List::Util::sum map $_->{expand}, @$children;
629 $exp = $_; 878 $exp ||= 1;
630 last; 879
880 for (0 .. $#$children) {
881 my $child = $children->[$_];
882
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
631 } 884 }
632 push @oth, $_;
633 }
634
635 my ($ow, $oh);
636
637 # get sizes of other widgets
638 for (@oth) {
639 my ($w, $h) = $_->size_request;
640 $oh += $h;
641 if ($ow < $w) { $ow = $w }
642 } 885 }
643 886
644 my $y = 0; 887 my $y = 0;
645 for (@{$self->{children}}) { 888 for (0 .. $#$children) {
646 $_->move (0, $y); 889 my $child = $children->[$_];
647 890 my $h = $h[$_];
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h); 891 $child->size_allocate (0, $y, $w, $h);
892
654 $y += $h; 893 $y += $h;
655 }
656 } 894 }
657} 895}
658 896
659############################################################################# 897#############################################################################
660 898
661package Crossfire::Client::Widget::Label; 899package CFClient::UI::Label;
662 900
663our @ISA = Crossfire::Client::Widget::; 901our @ISA = CFClient::UI::Base::;
664 902
665use SDL::OpenGL; 903use SDL::OpenGL;
666 904
667sub new { 905sub new {
668 my ($class, $x, $y, $z, $height, $text) = @_; 906 my ($class, %arg) = @_;
669 907
908 my $self = $class->SUPER::new (
909 fg => [1, 1, 1],
670 $height ||= $::FONTSIZE; 910 height => $::FONTSIZE,
911 text => "",
912 align => -1,
913 padding => 2,
914 layout => new CFClient::Layout,
915 %arg
916 );
671 917
672 # TODO: color, and make height, xyz etc. optional
673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
674
675 $self->set_text ($text); 918 $self->set_text ($self->{text});
676 919
677 $self 920 $self
921}
922
923sub escape_text {
924 local $_ = $_[1];
925
926 s/&/&amp;/g;
927 s/>/&gt;/g;
928 s/</&lt;/g;
929
930 $_[1]
678} 931}
679 932
680sub set_text { 933sub set_text {
681 my ($self, $text) = @_; 934 my ($self, $text) = @_;
682 935
683 $self->{text} = $text; 936 $self->{text} = $text;
684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 937 $self->{layout}->set_markup ($text);
685 938
939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
686 $self->update; 941 $self->update;
687} 942}
688 943
689sub get_text { 944sub get_text {
690 my ($self, $text) = @_; 945 my ($self, $text) = @_;
… …
693} 948}
694 949
695sub size_request { 950sub size_request {
696 my ($self) = @_; 951 my ($self) = @_;
697 952
698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 953 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height});
955 my ($w, $h) = $self->{layout}->size;
956
957 (
958 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2,
960 )
961}
962
963sub size_allocate {
964 my ($self, $x, $y, $w, $h) = @_;
965
966 $self->_size_allocate ($x, $y, $w, $h) or return;
967
968 delete $self->{texture};
969}
970
971sub update {
972 my ($self) = @_;
973
974 delete $self->{texture};
975 $self->SUPER::update;
976}
977
978sub _draw {
979 my ($self) = @_;
980
981 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
984 new_from_layout CFClient::Texture $self->{layout}
985 };
986
987 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991
992 glColor @{$self->{fg}};
993
994 my $x =
995 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5;
998
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1000 $tex->draw_quad (0, 0);
1001
1002 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND;
1004}
1005
1006#############################################################################
1007
1008package CFClient::UI::Entry;
1009
1010our @ISA = CFClient::UI::Label::;
1011
1012use SDL;
1013use SDL::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
699 ( 1025 @_
700 $self->{texture}{width}, 1026 )
701 $self->{texture}{height}, 1027}
702 ) 1028
1029sub _set_text {
1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051}
1052
1053sub size_request {
1054 my ($self) = @_;
1055
1056 my ($w, $h) = $self->SUPER::size_request;
1057
1058 ($w + 1, $h) # add 1 for cursor
1059}
1060
1061sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065
1066 $self->_set_text ($self->{text});
1067}
1068
1069sub set_text {
1070 my ($self, $text) = @_;
1071
1072 $self->{cursor} = length $text;
1073 $self->_set_text ($text);
1074 $self->update;
1075}
1076
1077sub key_down {
1078 my ($self, $ev) = @_;
1079
1080 my $mod = $ev->key_mod;
1081 my $sym = $ev->key_sym;
1082
1083 my $uni = $ev->key_unicode;
1084
1085 my $text = $self->get_text;
1086
1087 if ($sym == SDLK_BACKSPACE) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) {
1090 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1101 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni;
1103 }
1104
1105 $self->_set_text ($text);
1106 $self->update;
1107}
1108
1109sub focus_in {
1110 my ($self) = @_;
1111
1112 $self->{last_activity} = $::NOW;
1113
1114 $self->SUPER::focus_in;
1115}
1116
1117sub button_down {
1118 my ($self, $ev, $x, $y) = @_;
1119
1120 $self->SUPER::button_down ($ev, $x, $y);
1121
1122 my $idx = $self->{layout}->xy_to_index ($x, $y);
1123
1124 # byte-index to char-index
1125 my $text = $self->{text};
1126 utf8::encode $text;
1127 $self->{cursor} = length substr $text, 0, $idx;
1128
1129 $self->_set_text ($self->{text});
1130 $self->update;
1131}
1132
1133sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_;
1135# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1136}
1137
1138sub _draw {
1139 my ($self) = @_;
1140
1141 local $self->{fg} = $self->{fg};
1142
1143 if ($FOCUS == $self) {
1144 glColor @{$self->{active_bg}};
1145 $self->{fg} = $self->{active_fg};
703 } else { 1146 } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 1147 glColor @{$self->{bg}};
1148 }
705 1149
706 ($w, $h) 1150 glEnable GL_BLEND;
1151 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1152 glBegin GL_QUADS;
1153 glVertex 0 , 0;
1154 glVertex 0 , $self->{h};
1155 glVertex $self->{w}, $self->{h};
1156 glVertex $self->{w}, 0;
1157 glEnd;
1158 glDisable GL_BLEND;
1159
1160 $self->SUPER::_draw;
1161
1162 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1164 glColor @{$self->{fg}};
1165 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1168 glEnd;
1169 }
1170}
1171
1172package CFClient::UI::LineEntry;
1173
1174our @ISA = CFClient::UI::Entry::;
1175
1176use SDL;
1177use SDL::OpenGL;
1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1206
1207sub new {
1208 my $class = shift;
1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
707 } 1217 )
1218}
708 1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
709} 1227}
710 1228
711sub _draw { 1229sub _draw {
712 my ($self) = @_; 1230 my ($self) = @_;
713 1231
714 my $tex = $self->{texture}; 1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
715 1234
716 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
717 glEnable GL_TEXTURE_2D; 1236 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
720 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
721 1245
722 glColor 1, 0, 0, 1; # TODO color 1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
723 1247
724 glBegin GL_QUADS; 1248 glDisable GL_TEXTURE_2D;
725 glTexCoord 0, 0; glVertex 0 , 0; 1249 glDisable GL_BLEND;
726 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 1250
727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 1251 $self->SUPER::_draw;
728 glTexCoord 1, 0; glVertex $tex->{width}, 0; 1252}
729 glEnd; 1253
1254#############################################################################
1255
1256package CFClient::UI::CheckBox;
1257
1258our @ISA = CFClient::UI::DrawBG::;
1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1264use SDL;
1265use SDL::OpenGL;
1266
1267sub new {
1268 my $class = shift;
1269
1270 $class->SUPER::new (
1271 padding => 2,
1272 fg => [1, 1, 1],
1273 active_fg => [1, 1, 0],
1274 state => 0,
1275 can_hover => 1,
1276 @_
1277 )
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{padding} * 2 + 6) x 2
1284}
1285
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down {
1293 my ($self, $ev, $x, $y) = @_;
1294
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1297 $self->{state} = !$self->{state};
1298 $self->emit (changed => $self->{state});
1299 }
1300}
1301
1302sub _draw {
1303 my ($self) = @_;
1304
1305 $self->SUPER::_draw;
1306
1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1308
1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1310
1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1312
1313 glEnable GL_BLEND;
1314 glEnable GL_TEXTURE_2D;
1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1316
1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1318
1319 $tex->draw_quad (0, 0, $s, $s);
1320
1321 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND;
1323}
1324
1325#############################################################################
1326
1327package CFClient::UI::Slider;
1328
1329use strict;
1330
1331use SDL::OpenGL;
1332
1333our @ISA = CFClient::UI::DrawBG::;
1334
1335my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1337 qw(s1_slider.png s1_slider_bg.png);
1338
1339sub new {
1340 my $class = shift;
1341
1342 # range [value, low, high, page]
1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1347 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10],
1351 req_w => 40,
1352 req_h => 13,
1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1356 @_
1357 );
1358
1359 $self
1360}
1361
1362sub size_request {
1363 my ($self) = @_;
1364
1365 my $w = $self->{req_w};
1366 my $h = $self->{req_h};
1367
1368 $self->{vertical} ? ($h, $w) : ($w, $h)
1369}
1370
1371sub button_down {
1372 my ($self, $ev, $x, $y) = @_;
1373
1374 $self->SUPER::button_down ($ev, $x, $y);
1375 $self->mouse_motion ($ev, $x, $y);
1376}
1377
1378sub mouse_motion {
1379 my ($self, $ev, $x, $y) = @_;
1380
1381 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1391 $x = $lo if $x < $lo;
1392 $x = $hi - $page if $x > $hi - $page;
1393 $self->{range}[0] = $x;
1394
1395 $self->emit (changed => $x);
1396 $self->update;
1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1406}
1407
1408sub _draw {
1409 my ($self) = @_;
1410
1411 $self->SUPER::_draw ();
1412
1413 my ($w, $h) = @$self{qw(w h)};
1414
1415 if ($self->{vertical}) {
1416 # draw a vertical slider like a rotated horizontal slider
1417
1418 glRotate 90, 0, 0, 1;
1419 glTranslate 0, -$self->{w}, 0;
1420
1421 ($w, $h) = ($h, $w);
1422 }
1423
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426
1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431
1432 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1434
1435 $w -= $page;
1436 $page &= ~1;
1437 glTranslate $page * 0.5, 0, 0;
1438 $page ||= 2;
1439
1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1442
1443 glEnable GL_BLEND;
1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1445 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447
1448 # draw background
1449 $tex[1]->draw_quad (0, 0, $w, $h);
1450
1451 # draw handle
1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
730 1453
731 glDisable GL_BLEND; 1454 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
733} 1456}
734 1457
735############################################################################# 1458#############################################################################
736 1459
737package Crossfire::Client::Widget::Entry; 1460package CFClient::UI::TextView;
738 1461
739our @ISA = Crossfire::Client::Widget::Label::; 1462our @ISA = CFClient::UI::HBox::;
1463
1464use SDL::OpenGL;
1465
1466sub new {
1467 my $class = shift;
1468
1469 my $self = $class->SUPER::new (
1470 par => [],
1471 @_,
1472 children => [
1473 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1),
1475 ],
1476 );
1477
1478 $self
1479}
1480
1481sub add_paragraph {
1482 my ($self, $color, $text) = @_;
1483
1484 push @{$self->{par}}, [$color, $text];
1485 my $count = scalar @{$self->{par}};
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1487 $self->{children}[1]->update;
1488}
1489
1490sub _draw {
1491 my ($self) = @_;
1492
1493 my $par = $self->{par};
1494
1495 my $bottom = (scalar @$par) - 1;
1496
1497 my $w = $self->{children}[0]{w};
1498 my $y = $self->{h};
1499
1500 glEnable GL_BLEND;
1501 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504
1505 # TODO: everything!
1506 while ($y > 0 && $bottom >= 0) {
1507 my $par = $par->[$bottom--];
1508
1509 my $layout = new CFClient::Layout;
1510
1511 $layout->set_height ($::FONTSIZE);
1512 $layout->set_width ($w);
1513 $layout->set_text ($par->[1]);
1514 my $tex = new_from_layout CFClient::Texture $layout;
1515 $y -= $tex->{h};
1516
1517 glColor @{ $par->[0] };
1518 $tex->draw_quad (0, $y);
1519 }
1520
1521 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND;
1523}
1524
1525#############################################################################
1526
1527package CFClient::UI::MapWidget;
1528
1529use strict;
1530
1531use List::Util qw(min max);
740 1532
741use SDL; 1533use SDL;
742use SDL::OpenGL; 1534use SDL::OpenGL;
743 1535
744sub key_down { 1536our @ISA = CFClient::UI::Base::;
745 my ($self, $ev) = @_;
746 1537
747 my $mod = $ev->key_mod; 1538sub new {
748 my $sym = $ev->key_sym; 1539 my $class = shift;
749 1540
750 my $uni = $ev->key_unicode; 1541 $class->SUPER::new (
751 1542 z => -1,
752 my $text = $self->get_text; 1543 can_focus => 1,
753 1544 list => (glGenLists 1),
754 if ($sym == SDLK_BACKSPACE) { 1545 @_
755 substr $text, -1, 1, '';
756 } elsif ($uni) {
757 $text .= chr $uni;
758 print "$uni <$text>\n";#d#
759 } 1546 )
760
761 $self->set_text ($text);
762} 1547}
763
764sub button_down {
765 my ($self, $ev) = @_;
766
767 $self->focus_in;
768}
769
770sub _draw {
771 my ($self) = @_;
772
773 if ($FOCUS == $self) {
774 glColor 1, 1, 1;
775 } else {
776 glColor 0.7, 0.7, 0.7;
777 }
778
779 glBegin GL_QUADS;
780 glVertex 0 , 0;
781 glVertex 0 , $self->{h} - 1;
782 glVertex $self->{w} - 1, $self->{h} - 1;
783 glVertex $self->{w} - 1, 0;
784 glEnd;
785
786 $self->SUPER::_draw;
787}
788
789#############################################################################
790
791package Crossfire::Client::Widget::MapWidget;
792
793use strict;
794
795use List::Util qw(min max);
796
797use SDL;
798use SDL::OpenGL;
799use SDL::OpenGL::Constants;
800
801our @ISA = Crossfire::Client::Widget::;
802 1548
803sub key_down { 1549sub key_down {
804 print "MAPKEYDOWN\n"; 1550 print "MAPKEYDOWN\n";
805} 1551}
806 1552
807sub key_up { 1553sub key_up {
808} 1554}
809 1555
810sub size_request { 1556sub size_request {
811 ( 1557 (
812 1 + int $::WIDTH / 32, 1558 1 + 32 * int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32, 1559 1 + 32 * int $::HEIGHT / 32,
814 ) 1560 )
815} 1561}
816 1562
1563sub update {
1564 my ($self) = @_;
1565
1566 $self->{need_update} = 1;
1567 $self->SUPER::update;
1568}
1569
817sub _draw { 1570sub draw {
818 my ($self) = @_; 1571 my ($self) = @_;
819 1572
820 my $mx = $::CONN->{mapx}; 1573 $self->{need_update}++;#d#
821 my $my = $::CONN->{mapy}; 1574 if (delete $self->{need_update}) {
1575 glNewList $self->{list}, GL_COMPILE;
822 1576
823 my $map = $::CONN->{map};
824
825 my ($xofs, $yofs);
826
827 my $sw = 1 + int $::WIDTH / 32; 1577 my $sw = int $::WIDTH / 32;
828 my $sh = 1 + int $::HEIGHT / 32; 1578 my $sh = int $::HEIGHT / 32;
829 1579
830 if ($::CONN->{mapw} > $sw) { 1580 if ($::MAP) {
831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1581 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
832 } else {
833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834 }
835 1582
836 if ($::CONN->{maph} > $sh) { 1583 if ($::CFG->{fow_enable}) {
837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1584 if ($::CFG->{fow_smooth}) { # smooth fog of war
838 } else { 1585 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1586 glConvolutionFilter2D
840 } 1587 GL_CONVOLUTION_2D,
841 1588 GL_ALPHA,
842 glEnable GL_TEXTURE_2D; 1589 3, 3,
843 glEnable GL_BLEND; 1590 GL_ALPHA, GL_FLOAT,
844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1591 pack "f*",
845 1592 0.1, 0.1, 0.1,
846 my $sw4 = ($sw + 3) & ~3; 1593 0.1, 0.2, 0.1,
847 my $lighting = "\x00" x ($sw4 * $sh); 1594 0.1, 0.1, 0.1,
848 1595 ;
849 for my $x (0 .. $sw - 1) { 1596 glEnable GL_CONVOLUTION_2D;
850 for my $y (0 .. $sh - 1) {
851
852 my $cell = $map->[$x + $xofs][$y + $yofs]
853 or next;
854
855 my $darkness = $cell->[0] * (1 / 255);
856 if ($darkness < 0) {
857 $darkness = $cell->[1] ? 0.1 : 0;
858 } 1597 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860 1598
861 for my $num (grep $_, @$cell[1,2,3]) { 1599 my $tex = new CFClient::Texture
862 my $tex = $::CONN->{face}[$num]{texture} || next; 1600 w => $w,
1601 h => $h,
1602 data => $data,
1603 internalformat => GL_ALPHA,
1604 format => GL_ALPHA;
863 1605
864 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1606 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
865 1607
866 my $w = $tex->{width}; 1608 glEnable GL_BLEND;
867 my $h = $tex->{height}; 1609 glEnable GL_TEXTURE_2D;
1610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
868 1611
869 my $px = ($x + 1) * 32 - $w; 1612 glColor +($::CFG->{fow_intensity}) x 3, 1;
870 my $py = ($y + 1) * 32 - $h; 1613 $tex->draw_quad (0, 0, $w * 32, $h * 32);
871 1614
872 glBegin GL_QUADS; 1615 glDisable GL_TEXTURE_2D;
873 glTexCoord 0, 0; glVertex $px , $py; 1616 glDisable GL_BLEND;
874 glTexCoord 0, 1; glVertex $px , $py + $h;
875 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876 glTexCoord 1, 0; glVertex $px + $w, $py;
877 glEnd;
878 } 1617 }
879 } 1618 }
880 }
881 1619
882# if (1) { # higher quality darkness 1620 glEndList;
883# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885#
886# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
887#
888# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs;
890# } 1621 }
891 1622
892 $lighting = new Crossfire::Client::Texture 1623 glCallList $self->{list};
893 width => $sw4,
894 height => $sh,
895 data => $lighting,
896 internalformat => GL_ALPHA,
897 format => GL_ALPHA;
898 1624
899 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1625 if ($FOCUS != $self) {
900 glColor 0.45, 0.45, 0.45, 1; 1626 glColor 64/255, 64/255, 64/255;
901 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1627 glLogicOp GL_AND;
902 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1628 glEnable GL_COLOR_LOGIC_OP;
903 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904 glBegin GL_QUADS; 1629 glBegin GL_QUADS;
905 glTexCoord 0, 0; glVertex 0 , 0; 1630 glVertex 0, 0;
906 glTexCoord 0, 1; glVertex 0 , $sh * 32; 1631 glVertex 0, $::HEIGHT;
907 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; 1632 glVertex $::WIDTH, $::HEIGHT;
908 glTexCoord 1, 0; glVertex $sw4 * 32, 0; 1633 glVertex $::WIDTH, 0;
909 glEnd; 1634 glEnd;
910 1635 glDisable GL_COLOR_LOGIC_OP;
911 glDisable GL_TEXTURE_2D; 1636 }
912 glDisable GL_BLEND;
913} 1637}
914 1638
915my %DIR = ( 1639my %DIR = (
916 SDLK_KP8, [1, "north"], 1640 SDLK_KP8, [1, "north"],
917 SDLK_KP9, [2, "northeast"], 1641 SDLK_KP9, [2, "northeast"],
… …
933 1657
934 my $mod = $ev->key_mod; 1658 my $mod = $ev->key_mod;
935 my $sym = $ev->key_sym; 1659 my $sym = $ev->key_sym;
936 1660
937 if ($sym == SDLK_KP5) { 1661 if ($sym == SDLK_KP5) {
938 $::CONN->send ("command stay fire"); 1662 $::CONN->user_send ("command stay fire");
1663 } elsif ($sym == SDLK_a) {
1664 $::CONN->user_send ("command apply");
1665 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console');
939 } elsif (exists $DIR{$sym}) { 1667 } elsif (exists $DIR{$sym}) {
940 if ($mod & KMOD_SHIFT) { 1668 if ($mod & KMOD_SHIFT) {
941 $self->{shft}++; 1669 $self->{shft}++;
942 $::CONN->send ("command fire $DIR{$sym}[0]"); 1670 $::CONN->user_send ("command fire $DIR{$sym}[0]");
943 } elsif ($mod & KMOD_CTRL) { 1671 } elsif ($mod & KMOD_CTRL) {
944 $self->{ctrl}++; 1672 $self->{ctrl}++;
945 $::CONN->send ("command run $DIR{$sym}[0]"); 1673 $::CONN->user_send ("command run $DIR{$sym}[0]");
946 } else { 1674 } else {
947 $::CONN->send ("command $DIR{$sym}[1]"); 1675 $::CONN->user_send ("command $DIR{$sym}[1]");
948 } 1676 }
949 } 1677 }
950} 1678}
951 1679
952sub key_up { 1680sub key_up {
… …
954 1682
955 my $mod = $ev->key_mod; 1683 my $mod = $ev->key_mod;
956 my $sym = $ev->key_sym; 1684 my $sym = $ev->key_sym;
957 1685
958 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1686 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
959 $::CONN->send ("command fire_stop"); 1687 $::CONN->user_send ("command fire_stop");
960 } 1688 }
961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1689 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
962 $::CONN->send ("command run_stop"); 1690 $::CONN->user_send ("command run_stop");
963 } 1691 }
964} 1692}
965 1693
966############################################################################# 1694#############################################################################
967 1695
968package Crossfire::Client::Widget::Animator; 1696package CFClient::UI::Animator;
969 1697
970use SDL::OpenGL; 1698use SDL::OpenGL;
971 1699
972our @ISA = Crossfire::Client::Widget::Bin::; 1700our @ISA = CFClient::UI::Bin::;
973 1701
974sub moveto { 1702sub moveto {
975 my ($self, $x, $y) = @_; 1703 my ($self, $x, $y) = @_;
976 1704
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1705 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2; 1706 $self->{speed} = 0.001;
979 $self->{time} = 1; 1707 $self->{time} = 1;
980 1708
981 ::animation_start $self; 1709 ::animation_start $self;
982} 1710}
983 1711
… …
1005 glPopMatrix; 1733 glPopMatrix;
1006} 1734}
1007 1735
1008############################################################################# 1736#############################################################################
1009 1737
1010package Crossfire::Client::Widget::Toplevel; 1738package CFClient::UI::Flopper;
1011 1739
1740our @ISA = CFClient::UI::Button::;
1741
1742sub new {
1743 my $class = shift;
1744
1745 my $self = $class->SUPER::new (
1746 state => 0,
1747 connect_activate => \&toggle_flopper,
1748 @_
1749 );
1750
1751 if ($self->{state}) {
1752 $self->{state} = 0;
1753 $self->toggle_flopper;
1754 }
1755
1756 $self
1757}
1758
1759sub toggle_flopper {
1760 my ($self) = @_;
1761
1762 # TODO: use animation
1763 if ($self->{state} = !$self->{state}) {
1764 $CFClient::UI::TOPLEVEL->add ($self->{other});
1765 $self->{other}->move (
1766 ($::WIDTH - $self->{other}{w}) * 0.5,
1767 ($::HEIGHT - $self->{other}{h}) * 0.5,
1768 );
1769 } else {
1770 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1771 }
1772}
1773
1774#############################################################################
1775
1776package CFClient::UI::Toplevel;
1777
1012our @ISA = Crossfire::Client::Widget::Container::; 1778our @ISA = CFClient::UI::Container::;
1013 1779
1014sub size_request { 1780sub size_request {
1015 ($::WIDTH, $::HEIGHT) 1781 ($::WIDTH, $::HEIGHT)
1016} 1782}
1017 1783
1018sub size_allocate { 1784sub size_allocate {
1019 my ($self, $w, $h) = @_; 1785 my ($self, $x, $y, $w, $h) = @_;
1020 1786
1021 $self->SUPER::size_allocate ($w, $h); 1787 $self->_size_allocate ($x, $y, $w, $h);
1022 1788
1023 $_->size_allocate ($_->size_request) 1789 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1024 for @{$self->{children}}; 1790 for @{$self->{children}};
1025} 1791}
1026 1792
1793sub translate {
1794 my ($self, $x, $y) = @_;
1795
1796 ($x, $y)
1797}
1798
1027sub update { 1799sub update {
1028 my ($self) = @_; 1800 my ($self) = @_;
1029 1801
1030 $self->size_allocate ($self->size_request); 1802 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1031 ::refresh (); 1803 ::refresh ();
1032} 1804}
1033 1805
1034sub add { 1806sub add {
1035 my ($self, $widget) = @_; 1807 my ($self, $widget) = @_;
1036 1808
1037 $self->SUPER::add ($widget); 1809 $self->SUPER::add ($widget);
1038 1810
1039 $widget->size_allocate ($widget->size_request); 1811 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1040} 1812}
1041 1813
1042sub draw { 1814sub draw {
1043 my ($self) = @_; 1815 my ($self) = @_;
1044 1816
1045 $self->_draw; 1817 $self->_draw;
1046} 1818}
1047 1819
1048############################################################################# 1820#############################################################################
1049 1821
1050package Crossfire::Client::Widget; 1822package CFClient::UI;
1051 1823
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1824$TOPLEVEL = new CFClient::UI::Toplevel;
1053 1825
10541 18261
1055 1827

Diff Legend

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