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.46 by root, Sun Apr 9 22:21:02 2006 UTC vs.
Revision 1.72 by root, Tue Apr 11 18:00:45 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
24} 84}
25 85
26sub move { 86sub move {
27 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 88 $self->{x} = $x;
… …
44 104
45 $self->{w} = $w; 105 $self->{w} = $w;
46 $self->{h} = $h; 106 $self->{h} = $h;
47} 107}
48 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
49sub focus_in { 116sub focus_in {
50 my ($widget) = @_; 117 my ($self) = @_;
51 $FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
52} 124}
53 125
54sub focus_out { 126sub focus_out {
55 my ($widget) = @_; 127 my ($self) = @_;
56}
57 128
129 return unless $FOCUS == $self;
130
131 my $focus = $FOCUS; undef $FOCUS;
132 $focus->update if $focus; #?
133}
134
135sub mouse_motion { }
136sub button_up { }
58sub key_down { 137sub key_down { }
59 my ($widget, $sdlev) = @_;
60}
61
62sub key_up { 138sub key_up { }
63 my ($widget, $sdlev) = @_;
64}
65 139
66sub button_down { 140sub button_down {
67 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
68}
69 142
70sub button_up { 143 $self->focus_in;
71 my ($widget, $sdlev) = @_;
72} 144}
73 145
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 151
80sub draw { 152sub draw {
81 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
82 156
83 glPushMatrix; 157 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 159 $self->_draw;
86 glPopMatrix; 160 glPopMatrix;
161
162 if ($self == $HOVER) {
163 my ($x, $y) = @$self->{qw(x y)};
164
165 glColor 1, 1, 1, 0.1;
166 glEnable GL_BLEND;
167 glBegin GL_QUADS;
168 glVertex $x , $y;
169 glVertex $x + $self->{w}, $y;
170 glVertex $x + $self->{w}, $y + $self->{h};
171 glVertex $x , $y + $self->{h};
172 glEnd;
173 glDisable GL_BLEND;
174 }
87} 175}
88 176
89sub _draw { 177sub _draw {
90 my ($self) = @_; 178 my ($self) = @_;
91 179
… …
131 219
132 $self->{parent}->update 220 $self->{parent}->update
133 if $self->{parent}; 221 if $self->{parent};
134} 222}
135 223
224sub connect {
225 my ($self, $signal, $cb) = @_;
226
227 push @{ $self->{cb}{$signal} }, $cb;
228}
229
230sub emit {
231 my ($self, $signal, @args) = @_;
232
233 $_->($self, @args)
234 for @{$self->{cb}{$signal} || []};
235}
236
136sub DESTROY { 237sub DESTROY {
137 my ($self) = @_; 238 my ($self) = @_;
138 239
139 #$self->deactivate; 240 #$self->deactivate;
140} 241}
141 242
142############################################################################# 243#############################################################################
143 244
144package Crossfire::Client::Widget::Container; 245package CFClient::Widget::DrawBG;
145 246
146our @ISA = Crossfire::Client::Widget::; 247our @ISA = CFClient::Widget::;
248
249use strict;
250use SDL::OpenGL;
147 251
148sub new { 252sub new {
253 my $class = shift;
254
255 # range [value, low, high, page]
256
257 $class->SUPER::new (
258 bg => [0, 0, 0, 0.4],
259 active_bg => [1, 1, 1],
260 @_
261 )
262}
263
264sub _draw {
265 my ($self) = @_;
266
267 my ($w, $h) = @$self{qw(w h)};
268
269 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
270 glBegin GL_QUADS;
271 glVertex 0 , 0;
272 glVertex 0 , $h;
273 glVertex $w, $h;
274 glVertex $w, 0;
275 glEnd;
276}
277
278#############################################################################
279
280package CFClient::Widget::Empty;
281
282our @ISA = CFClient::Widget::;
283
284sub size_request {
285 (0, 0)
286}
287
288sub draw { }
289
290#############################################################################
291
292package CFClient::Widget::Container;
293
294our @ISA = CFClient::Widget::;
295
296sub new {
149 my ($class, @widgets) = @_; 297 my ($class, %arg) = @_;
150 298
299 my $children = delete $arg{children} || [];
300
151 my $self = $class->SUPER::new (children => []); 301 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 302 $self->add ($_) for @$children;
153 303
154 $self 304 $self
155} 305}
156 306
157sub add { 307sub add {
158 my ($self, $chld, $expand) = @_; 308 my ($self, $chld, $expand) = @_;
159 309
160 $chld->{expand} = $expand; 310 $chld->{expand} = $expand;
161 $chld->set_parent ($self); 311 $chld->set_parent ($self);
162 312
163 @{$self->{children}} = 313 $self->{children} = [
164 sort { $a->{z} <=> $b->{z} } 314 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 315 @{$self->{children}}, $chld
316 ];
166 317
167 $self->size_allocate ($self->{w}, $self->{h}) 318 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state" 319 if $self->{w}; #TODO: check for "realised state"
169} 320}
170 321
… …
198 $_->draw for @{$self->{children}}; 349 $_->draw for @{$self->{children}};
199} 350}
200 351
201############################################################################# 352#############################################################################
202 353
203package Crossfire::Client::Widget::Bin; 354package CFClient::Widget::Bin;
204 355
205our @ISA = Crossfire::Client::Widget::Container::; 356our @ISA = CFClient::Widget::Container::;
357
358sub new {
359 my ($class, %arg) = @_;
360
361 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
362
363 $class->SUPER::new (children => [$child], %arg)
364}
365
366sub add {
367 my ($self, $widget) = @_;
368
369 $self->{children} = [];
370
371 $self->SUPER::add ($widget);
372}
373
374sub remove {
375 my ($self, $widget) = @_;
376
377 $self->SUPER::remove ($widget);
378
379 $self->{children} = [new CFClient::Widget::Empty]
380 unless @{$self->{children}};
381}
206 382
207sub child { $_[0]->{children}[0] } 383sub child { $_[0]->{children}[0] }
208 384
209sub size_request { 385sub size_request {
210 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 386 $_[0]{children}[0]->size_request
211} 387}
212 388
213sub size_allocate { 389sub size_allocate {
214 my ($self, $w, $h) = @_; 390 my ($self, $w, $h) = @_;
215 391
392 return unless $self->{w} != $w || $self->{h} != $h;
393
216 $self->SUPER::size_allocate ($w, $h); 394 $self->SUPER::size_allocate ($w, $h);
217 $self->{children}[0]->size_allocate ($w, $h) 395 $self->{children}[0]->size_allocate ($w, $h);
218 if $self->{children}[0]
219} 396}
220 397
221############################################################################# 398#############################################################################
222 399
223package Crossfire::Client::Widget::Toplevel; 400package CFClient::Widget::Window;
224 401
225our @ISA = Crossfire::Client::Widget::Container::; 402our @ISA = CFClient::Widget::Bin::;
403
404use SDL::OpenGL;
405
406sub new {
407 my ($class, %arg) = @_;
408
409 my $self = $class->SUPER::new (%arg);
410}
226 411
227sub update { 412sub update {
228 my ($self) = @_; 413 my ($self) = @_;
229 414
230 ::refresh (); 415 # we want to do this delayed...
231}
232
233sub add {
234 my ($self, $widget) = @_;
235
236 $self->SUPER::add ($widget);
237
238 $widget->size_allocate ($widget->size_request);
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
247use SDL::OpenGL;
248
249sub new {
250 my ($class, $x, $y, $z, $w, $h) = @_;
251
252 my $self = $class->SUPER::new;
253
254 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
255}
256
257sub update {
258 my ($self) = @_;
259
260 $self->render_chld; 416 $self->render_chld;
261 $self->SUPER::update; 417 $self->SUPER::update;
262} 418}
263 419
264sub render_chld { 420sub render_chld {
265 my ($self) = @_; 421 my ($self) = @_;
266 422
267 $self->{texture} = 423 $self->{texture} =
268 Crossfire::Client::Texture->new_from_opengl ( 424 CFClient::Texture->new_from_opengl (
269 $self->{w}, $self->{h}, sub { $self->child->draw } 425 $self->{w}, $self->{h}, sub { $self->child->draw }
270 ); 426 );
271} 427}
272 428
273sub size_allocate { 429sub size_allocate {
274 my ($self, $w, $h) = @_; 430 my ($self, $w, $h) = @_;
431
432 return unless $self->{w} != $w || $self->{h} != $h;
275 433
276 $self->{w} = $w; 434 $self->{w} = $w;
277 $self->{h} = $h; 435 $self->{h} = $h;
278 436
279 $self->child->size_allocate ($w, $h); 437 $self->child->size_allocate ($w, $h);
… …
290 or return; 448 or return;
291 449
292 glEnable GL_BLEND; 450 glEnable GL_BLEND;
293 glEnable GL_TEXTURE_2D; 451 glEnable GL_TEXTURE_2D;
294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
295 glBindTexture GL_TEXTURE_2D, $tex->{name};
296 453
297 glBegin GL_QUADS; 454 $tex->draw_quad (0, 0, $w, $h);
298 glTexCoord 0, 0; glVertex 0, 0;
299 glTexCoord 0, 1; glVertex 0, $h;
300 glTexCoord 1, 1; glVertex $w, $h;
301 glTexCoord 1, 0; glVertex $w, 0;
302 glEnd;
303 455
304 glDisable GL_BLEND; 456 glDisable GL_BLEND;
305 glDisable GL_TEXTURE_2D; 457 glDisable GL_TEXTURE_2D;
306} 458}
307 459
308############################################################################# 460#############################################################################
309 461
310package Crossfire::Client::Widget::Frame; 462package CFClient::Widget::Frame;
311 463
312our @ISA = Crossfire::Client::Widget::Bin::; 464our @ISA = CFClient::Widget::Bin::;
313 465
314use SDL::OpenGL; 466use SDL::OpenGL;
315 467
316sub size_request { 468sub size_request {
317 my ($self) = @_; 469 my ($self) = @_;
… …
324} 476}
325 477
326sub size_allocate { 478sub size_allocate {
327 my ($self, $w, $h) = @_; 479 my ($self, $w, $h) = @_;
328 480
481 return unless $self->{w} != $w || $self->{h} != $h;
482
329 $self->{w} = $w; 483 $self->{w} = $w;
330 $self->{h} = $h; 484 $self->{h} = $h;
331 485
332 $self->child->size_allocate ($w - 4, $h - 4); 486 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->child->move (2, 2); 487 $self->child->move (2, 2);
… …
340 494
341 my ($w, $h) = $chld->size_request; 495 my ($w, $h) = $chld->size_request;
342 496
343 glBegin GL_QUADS; 497 glBegin GL_QUADS;
344 glColor 0, 0, 0; 498 glColor 0, 0, 0;
345 glTexCoord 0, 0; glVertex 0 , 0; 499 glVertex 0 , 0;
346 glTexCoord 0, 1; glVertex 0 , $h + 4; 500 glVertex 0 , $h + 4;
347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 501 glVertex $w + 4 , $h + 4;
348 glTexCoord 1, 0; glVertex $w + 4 , 0; 502 glVertex $w + 4 , 0;
349 glEnd; 503 glEnd;
350 504
351 $chld->draw; 505 $chld->draw;
352} 506}
353 507
354############################################################################# 508#############################################################################
355 509
356package Crossfire::Client::Widget::FancyFrame; 510package CFClient::Widget::FancyFrame;
357 511
358our @ISA = Crossfire::Client::Widget::Bin::; 512our @ISA = CFClient::Widget::Bin::;
359 513
360use SDL::OpenGL; 514use SDL::OpenGL;
361 515
362my @tex = 516my @tex =
363 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 517 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
364 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 518 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
365 519
366sub size_request { 520sub size_request {
367 my ($self) = @_; 521 my ($self) = @_;
368 522
369 my ($w, $h) = $self->SUPER::size_request; 523 my ($w, $h) = $self->SUPER::size_request;
370 524
371 $h += $tex[1]->{height}; 525 $h += $tex[1]->{h};
372 $h += $tex[4]->{height}; 526 $h += $tex[4]->{h};
373 $w += $tex[2]->{width}; 527 $w += $tex[2]->{w};
374 $w += $tex[3]->{width}; 528 $w += $tex[3]->{w};
375 529
376 ($w, $h) 530 ($w, $h)
377} 531}
378 532
379sub size_allocate { 533sub size_allocate {
380 my ($self, $w, $h) = @_; 534 my ($self, $w, $h) = @_;
381 535
536 return unless $self->{w} != $w || $self->{h} != $h;
537
382 $self->SUPER::size_allocate ($w, $h); 538 $self->SUPER::size_allocate ($w, $h);
383 539
384 $h -= $tex[1]->{height}; 540 $h -= $tex[1]->{h};
385 $h -= $tex[4]->{height}; 541 $h -= $tex[4]->{h};
386 $w -= $tex[2]->{width}; 542 $w -= $tex[2]->{w};
387 $w -= $tex[3]->{width}; 543 $w -= $tex[3]->{w};
388 544
389 $h = $h < 0 ? 0 : $h; 545 $h = $h < 0 ? 0 : $h;
390 $w = $w < 0 ? 0 : $w; 546 $w = $w < 0 ? 0 : $w;
391 547
548 my $child = $self->child;
549
392 $self->child->size_allocate ($w, $h); 550 $child->size_allocate ($w, $h);
393 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 551 $child->move ($tex[3]->{w}, $tex[1]->{h});
394} 552}
395 553
396sub _draw { 554sub _draw {
397 my ($self) = @_; 555 my ($self) = @_;
398 556
… …
403 glEnable GL_TEXTURE_2D; 561 glEnable GL_TEXTURE_2D;
404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 562 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
406 564
407 my $top = $tex[1]; 565 my $top = $tex[1];
408 glBindTexture GL_TEXTURE_2D, $top->{name}; 566 $top->draw_quad (0, 0, $w, $top->{h});
409
410 glBegin GL_QUADS;
411 glTexCoord 0, 0; glVertex 0 , 0;
412 glTexCoord 0, 1; glVertex 0 , $top->{height};
413 glTexCoord 1, 1; glVertex $w , $top->{height};
414 glTexCoord 1, 0; glVertex $w , 0;
415 glEnd;
416 567
417 my $left = $tex[3]; 568 my $left = $tex[3];
418 glBindTexture GL_TEXTURE_2D, $left->{name}; 569 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
419
420 glBegin GL_QUADS;
421 glTexCoord 0, 0; glVertex 0 , $top->{height};
422 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
423 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
425 glEnd;
426 570
427 my $right = $tex[2]; 571 my $right = $tex[2];
428 glBindTexture GL_TEXTURE_2D, $right->{name}; 572 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
429
430 glBegin GL_QUADS;
431 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
432 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
433 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
434 glTexCoord 1, 0; glVertex $w , $top->{height};
435 glEnd;
436 573
437 my $bottom = $tex[4]; 574 my $bottom = $tex[4];
438 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 575 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
439
440 glBegin GL_QUADS;
441 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
442 glTexCoord 0, 1; glVertex 0 , $h;
443 glTexCoord 1, 1; glVertex $w , $h;
444 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
445 glEnd;
446 576
447 my $bg = $tex[0]; 577 my $bg = $tex[0];
448 glBindTexture GL_TEXTURE_2D, $bg->{name}; 578 glBindTexture GL_TEXTURE_2D, $bg->{name};
449 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
450 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 580 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
451 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 581 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
452 582
453 my $rep_x = $cw / $bg->{width}; 583 my $rep_x = $cw / $bg->{w};
454 my $rep_y = $ch / $bg->{height}; 584 my $rep_y = $ch / $bg->{h};
455 585
456 glBegin GL_QUADS; 586 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
457 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
458 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
459 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
460 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
461 glEnd;
462 587
463 glDisable GL_BLEND; 588 glDisable GL_BLEND;
464 glDisable GL_TEXTURE_2D; 589 glDisable GL_TEXTURE_2D;
465 590
466 $self->child->draw; 591 $self->child->draw;
467 592
468} 593}
469 594
470############################################################################# 595#############################################################################
471 596
472package Crossfire::Client::Widget::Table; 597package CFClient::Widget::Table;
473 598
474our @ISA = Crossfire::Client::Widget::Bin::; 599our @ISA = CFClient::Widget::;
475 600
476use SDL::OpenGL; 601use SDL::OpenGL;
477 602
478sub add { 603sub add {
479 my ($self, $x, $y, $chld) = @_; 604 my ($self, $x, $y, $chld) = @_;
… …
554 } 679 }
555} 680}
556 681
557############################################################################# 682#############################################################################
558 683
559package Crossfire::Client::Widget::VBox; 684package CFClient::Widget::VBox;
560 685
561our @ISA = Crossfire::Client::Widget::Container::; 686our @ISA = CFClient::Widget::Container::;
562 687
563use SDL::OpenGL; 688use SDL::OpenGL;
564 689
565sub size_request { 690sub size_request {
566 my ($self) = @_; 691 my ($self) = @_;
… …
574} 699}
575 700
576sub size_allocate { 701sub size_allocate {
577 my ($self, $w, $h) = @_; 702 my ($self, $w, $h) = @_;
578 703
704 return unless $self->{w} != $w || $self->{h} != $h;
705
579 $self->w ($w); 706 $self->{w} = $w;
580 $self->h ($h); 707 $self->{h} = $h;
581 708
582 my $exp; 709 return unless $self->{h};
583 my @oth; 710
584 # find expand widget 711 my $children = $self->{children};
585 for (@{$self->{children}}) { 712
586 if ($_->{expand}) { 713 my @h = map +($_->size_request)[1], @$children;
587 $exp = $_; 714
588 last; 715 my $req_h = List::Util::sum @h;
716
717 if ($req_h > $h) {
718 # ah well, not enough space
719 $_ = $h[$_] * $h / $req_h for @h;
720 } else {
721 my @exp = grep $_->{expand}, @$children;
722 @exp = @$children unless @exp;
723
724 my %exp = map +($_ => 1), @exp;
725
726 for (0 .. $#$children) {
727 my $child = $children->[$_];
728
729 my $alloc_h = $h[$_];
730 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
731 $h[$_] = $alloc_h;
589 } 732 }
590 push @oth, $_;
591 }
592
593 my ($ow, $oh);
594
595 # get sizes of other widgets
596 for (@oth) {
597 my ($w, $h) = $_->size_request;
598 $oh += $h;
599 if ($ow < $w) { $ow = $w }
600 } 733 }
601 734
602 my $y = 0; 735 my $y = 0;
603 for (@{$self->{children}}) { 736 for (0 .. $#$children) {
737 my $child = $children->[$_];
738 my $h = $h[$_];
604 $_->move (0, $y); 739 $child->move (0, $y);
605
606 if ($_ == $exp) {
607 $_->size_allocate ($w, $h - $oh);
608 $y += $h - $oh;
609 } else {
610 my ($cw, $h) = $_->size_request;
611 $_->size_allocate ($w, $h); 740 $child->size_allocate ($w, $h);
741
612 $y += $h; 742 $y += $h;
613 }
614 } 743 }
615} 744}
616 745
617############################################################################# 746#############################################################################
618 747
619package Crossfire::Client::Widget::Label; 748package CFClient::Widget::Label;
620 749
621our @ISA = Crossfire::Client::Widget::; 750our @ISA = CFClient::Widget::;
622 751
623use SDL::OpenGL; 752use SDL::OpenGL;
624 753
625sub new { 754sub new {
626 my ($class, $x, $y, $z, $height, $text) = @_; 755 my ($class, %arg) = @_;
627 756
628 # TODO: color, and make height, xyz etc. optional 757 my $self = $class->SUPER::new (
629 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 758 fg => [1, 1, 1],
759 height => $::FONTSIZE,
760 text => "",
761 align => -1,
762 layout => new CFClient::Layout,
763 %arg
764 );
630 765
631 $self->set_text ($text); 766 $self->set_text ($self->{text});
632 767
633 $self 768 $self
769}
770
771sub escape_text {
772 local $_ = $_[1];
773
774 s/&/&amp;/g;
775 s/>/&gt;/g;
776 s/</&lt;/g;
777
778 $_[1]
634} 779}
635 780
636sub set_text { 781sub set_text {
637 my ($self, $text) = @_; 782 my ($self, $text) = @_;
638 783
639 $self->{text} = $text; 784 $self->{text} = $text;
640 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 785 $self->{layout}->set_markup ($text);
641 786
787 delete $self->{texture};
642 $self->update; 788 $self->update;
643} 789}
644 790
645sub get_text { 791sub get_text {
646 my ($self, $text) = @_; 792 my ($self, $text) = @_;
… …
649} 795}
650 796
651sub size_request { 797sub size_request {
652 my ($self) = @_; 798 my ($self) = @_;
653 799
654 ( 800 $self->{layout}->set_width;
801 $self->{layout}->set_height ($self->{height});
802 $self->{layout}->size
803# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
804# (
655 $self->{texture}{width}, 805# $self->{texture}{w},
656 $self->{texture}{height}, 806# $self->{texture}{h},
657 ) 807# )
808# } else {
809# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
810#
811# ($w, $h)
812# }
813}
814
815sub size_allocate {
816 my ($self, $w, $h) = @_;
817
818 return unless $self->{w} != $w || $self->{h} != $h;
819
820 $self->SUPER::size_allocate ($w, $h);
821 delete $self->{texture};
822}
823
824sub update {
825 my ($self) = @_;
826
827 delete $self->{texture};
828 $self->SUPER::update;
658} 829}
659 830
660sub _draw { 831sub _draw {
661 my ($self) = @_; 832 my ($self) = @_;
662 833
663 my $tex = $self->{texture}; 834 my $tex = $self->{texture} ||= do {
835 $self->{layout}->set_width ($self->{w});
836 new_from_layout CFClient::Texture $self->{layout};
837 };
664 838
665 glEnable GL_BLEND; 839 glEnable GL_BLEND;
666 glEnable GL_TEXTURE_2D; 840 glEnable GL_TEXTURE_2D;
667 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
669 glBindTexture GL_TEXTURE_2D, $tex->{name};
670 843
671 glColor 1, 0, 0, 1; # TODO color 844 glColor @{$self->{fg}};
672 845
673 glBegin GL_QUADS; 846 my $x =
674 glTexCoord 0, 0; glVertex 0 , 0; 847 $self->{align} < 0 ? 0
675 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 848 : $self->{align} > 0 ? $self->{w} - $self->{texture}{w}
676 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 849 : ($self->{w} + $self->{texture}{w}) * 0.5;
677 glTexCoord 1, 0; glVertex $tex->{width}, 0; 850
678 glEnd; 851 $tex->draw_quad ($x, 0);
679 852
680 glDisable GL_BLEND; 853 glDisable GL_BLEND;
681 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
682} 855}
683 856
684############################################################################# 857#############################################################################
685 858
686package Crossfire::Client::Widget::TextEntry; 859package CFClient::Widget::Entry;
687 860
688our @ISA = Crossfire::Client::Widget::Label::; 861our @ISA = CFClient::Widget::Label::;
689 862
690use SDL; 863use SDL;
691use SDL::OpenGL; 864use SDL::OpenGL;
692 865
866sub new {
867 my $class = shift;
868
869 $class->SUPER::new (
870 fg => [1, 1, 1],
871 bg => [0, 0, 0, 0.4],
872 active_bg => [1, 1, 1],
873 active_fg => [0, 0, 0],
874 @_
875 )
876}
877
878sub _set_text {
879 my ($self, $text) = @_;
880
881 $self->{last_activity} = $::NOW;
882
883 $self->{text} = $text;
884 $self->{layout}->set_width ($self->{w});
885
886 $text =~ s/./*/g if $self->{hidden};
887
888
889 $self->{layout}->set_markup ($self->escape_text ($text));
890
891 $text = substr $text, 0, $self->{cursor};
892 utf8::encode $text;
893
894 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
895}
896
897sub size_request {
898 my ($self) = @_;
899
900 my ($w, $h) = $self->SUPER::size_request;
901
902 ($w + 1, $h) # add 1 for cursor
903}
904
905sub size_allocate {
906 my ($self, $w, $h) = @_;
907
908 return unless $self->{w} != $w || $self->{h} != $h;
909
910 $self->SUPER::size_allocate ($w, $h);
911
912 $self->_set_text ($self->{text});
913}
914
915sub set_text {
916 my ($self, $text) = @_;
917
918 $self->{cursor} = length $text;
919 $self->_set_text ($text);
920 $self->update;
921}
922
693sub key_down { 923sub key_down {
694 my ($self, $ev) = @_; 924 my ($self, $ev) = @_;
695 925
696 my $mod = $ev->key_mod; 926 my $mod = $ev->key_mod;
697 my $sym = $ev->key_sym; 927 my $sym = $ev->key_sym;
698 928
699 $ev->set_unicode (1);
700 my $uni = $ev->key_unicode; 929 my $uni = $ev->key_unicode;
701 930
702 my $text = $self->get_text; 931 my $text = $self->get_text;
703 932
704 if ($sym == SDLK_BACKSPACE) { 933 if ($sym == SDLK_BACKSPACE) {
705 substr $text, -1, 1, ''; 934 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
706 935 } elsif ($sym == SDLK_DELETE) {
936 substr $text, $self->{cursor}, 1, "";
937 } elsif ($sym == SDLK_LEFT) {
938 --$self->{cursor} if $self->{cursor};
939 } elsif ($sym == SDLK_RIGHT) {
940 ++$self->{cursor} if $self->{cursor} < length $self->{text};
707 } elsif ($uni) { 941 } elsif ($uni) {
708 $text .= chr $uni; 942 substr $text, $self->{cursor}++, 0, chr $uni;
709 } 943 }
944
710 $self->set_text ($text); 945 $self->_set_text ($text);
946 $self->update;
711} 947}
712 948
713############################################################################# 949sub focus_in {
950 my ($self) = @_;
714 951
952 $self->{last_activity} = $::NOW;
953
954 $self->SUPER::focus_in;
955}
956
957sub button_down {
958 my ($self, $ev, $x, $y) = @_;
959
960 $self->SUPER::button_down ($ev, $x, $y);
961
962 my $idx = $self->{layout}->xy_to_index ($x, $y);
963
964 # byte-index to char-index
965 my $text = $self->{layout};
966 utf8::encode $text;
967 $self->{cursor} = length substr $text, 0, $idx;
968
969 $self->_set_text ($self->{text});
970 $self->update;
971}
972
973sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_;
975# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
976}
977
978sub _draw {
979 my ($self) = @_;
980
981 local $self->{fg} = $self->{fg};
982
983 if ($FOCUS == $self) {
984 glColor @{$self->{active_bg}};
985 $self->{fg} = $self->{active_fg};
986 } else {
987 glColor @{$self->{bg}};
988 }
989
990 glBegin GL_QUADS;
991 glVertex 0 , 0;
992 glVertex 0 , $self->{h};
993 glVertex $self->{w}, $self->{h};
994 glVertex $self->{w}, 0;
995 glEnd;
996
997 $self->SUPER::_draw;
998
999 #TODO: force update every cursor change :(
1000 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1001 glColor @{$self->{fg}};
1002 glBegin GL_LINES;
1003 glVertex $self->{cur_x}, $self->{cur_y};
1004 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1005 glEnd;
1006 }
1007}
1008
1009#############################################################################
1010
1011package CFClient::Widget::Slider;
1012
1013use strict;
1014
1015use SDL::OpenGL;
1016use SDL::OpenGL::Constants;
1017
1018our @ISA = CFClient::Widget::DrawBG::;
1019
1020sub size_request {
1021 my ($self) = @_;
1022
1023 my $w = 50;
1024 my $h = 10;
1025
1026 $self->{vertical} ? ($h, $w) : ($w, $h)
1027}
1028
1029sub new {
1030 my $class = shift;
1031
1032 # range [value, low, high, page]
1033
1034 $class->SUPER::new (
1035 fg => [1, 1, 1],
1036 active_fg => [0, 0, 0],
1037 range => [0, 0, 100, 10],
1038 vertical => 1,
1039 @_
1040 )
1041}
1042
1043sub button_down {
1044 my ($self, $ev, $x, $y) = @_;
1045
1046 $self->SUPER::button_down ($ev, $x, $y);
1047 $self->mouse_motion ($ev, $x, $y);
1048}
1049
1050sub mouse_motion {
1051 my ($self, $ev, $x, $y) = @_;
1052
1053 if ($GRAB == $self) {
1054 my ($value, $lo, $hi, $page) = @{$self->{range}};
1055
1056 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1057
1058 $x = $x * ($hi - $lo) / $w + $lo;
1059 $x = $lo if $x < $lo;
1060 $x = $hi - $page if $x > $hi - $page;
1061 $self->{range}[0] = $x;
1062
1063 $self->emit (changed => $x);
1064 $self->update;
1065 }
1066}
1067
1068sub _draw {
1069 my ($self) = @_;
1070
1071 $self->SUPER::_draw ();
1072
1073 my ($w, $h) = @$self{qw(w h)};
1074
1075 if ($self->{vertical}) {
1076 # draw a vertical slider like a rotated horizontal slider
1077
1078 glRotate 90, 0, 0, 1;
1079 glTranslate 0, -$self->{w}, 0;
1080
1081 ($w, $h) = ($h, $w);
1082 }
1083
1084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1086
1087 my ($value, $lo, $hi, $page) = @{$self->{range}};
1088
1089 $page = int $page * $w / ($hi - $lo);
1090 $value = int +($value - $lo) * $w / ($hi - $lo);
1091
1092 $w -= $page;
1093 $page &= ~1;
1094 glTranslate $page * 0.5, 0, 0;
1095
1096 glColor @$fg;
1097 glBegin GL_LINES;
1098 glVertex 0, 0; glVertex 0, $h;
1099 glVertex $w - 1, 0; glVertex $w - 1, $h;
1100 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1101 glEnd;
1102
1103 my $knob_a = $value - $page * 0.5;
1104 my $knob_b = $value + $page * 0.5;
1105
1106 glBegin GL_QUADS;
1107 glColor @$fg;
1108 glVertex $knob_a, 0;
1109 glVertex $knob_a, $h;
1110 glVertex $knob_b, $h;
1111 glVertex $knob_b, 0;
1112
1113 if ($knob_a < $knob_b - 2) {
1114 glColor @$bg;
1115 glVertex $knob_a + 1, 1;
1116 glVertex $knob_a + 1, $h - 1;
1117 glVertex $knob_b - 1, $h - 1;
1118 glVertex $knob_b - 1, 1;
1119 }
1120 glEnd;
1121}
1122
1123#############################################################################
1124
715package Crossfire::Client::Widget::MapWidget; 1125package CFClient::Widget::MapWidget;
716 1126
717use strict; 1127use strict;
718 1128
719use List::Util qw(min max); 1129use List::Util qw(min max);
720 1130
721use SDL; 1131use SDL;
722use SDL::OpenGL; 1132use SDL::OpenGL;
723use SDL::OpenGL::Constants; 1133use SDL::OpenGL::Constants;
724 1134
725our @ISA = Crossfire::Client::Widget::; 1135our @ISA = CFClient::Widget::;
1136
1137sub new {
1138 my $class = shift;
1139
1140 $class->SUPER::new (
1141 z => -1,
1142 list => (glGenLists 1),
1143 @_
1144 )
1145}
726 1146
727sub key_down { 1147sub key_down {
728 print "MAPKEYDOWN\n"; 1148 print "MAPKEYDOWN\n";
729} 1149}
730 1150
731sub key_up { 1151sub key_up {
732} 1152}
733 1153
734sub size_request { 1154sub size_request {
735 1155 (
1156 1 + int $::WIDTH / 32,
1157 1 + int $::HEIGHT / 32,
1158 )
736} 1159}
737 1160
738sub size_allocate { 1161sub update {
1162 my ($self) = @_;
1163
1164 $self->{need_update} = 1;
739} 1165}
740 1166
741sub _draw { 1167sub _draw {
742 my ($self) = @_; 1168 my ($self) = @_;
743 1169
1170 if (delete $self->{need_update}) {
1171 glNewList $self->{list}, GL_COMPILE;
1172
744 my $mx = $::CONN->{mapx}; 1173 my $mx = $::CONN->{mapx};
745 my $my = $::CONN->{mapy}; 1174 my $my = $::CONN->{mapy};
746 1175
747 my $map = $::CONN->{map}; 1176 my $map = $::CONN->{map};
748 1177
749 my ($xofs, $yofs); 1178 my ($xofs, $yofs);
750 1179
751 my $sw = 1 + int $::WIDTH / 32; 1180 my $sw = 1 + int $::WIDTH / 32;
752 my $sh = 1 + int $::HEIGHT / 32; 1181 my $sh = 1 + int $::HEIGHT / 32;
753 1182
754 if ($::CONN->{mapw} > $sw) { 1183 if ($::CONN->{mapw} > $sw) {
755 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1184 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
756 } else { 1185 } else {
757 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1186 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
758 } 1187 }
759 1188
760 if ($::CONN->{maph} > $sh) { 1189 if ($::CONN->{maph} > $sh) {
761 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1190 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
762 } else { 1191 } else {
763 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1192 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
764 } 1193 }
765 1194
766 glEnable GL_TEXTURE_2D; 1195 glEnable GL_TEXTURE_2D;
767 glEnable GL_BLEND; 1196 glEnable GL_BLEND;
768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1197 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
769 1198
770 my $sw4 = ($sw + 3) & ~3; 1199 my $sw4 = ($sw + 3) & ~3;
771 my $lighting = "\x00" x ($sw4 * $sh); 1200 my $darkness = "\x00" x ($sw4 * $sh);
772 1201
773 for my $x (0 .. $sw - 1) { 1202 for my $x (0 .. $sw - 1) {
1203 my $row = $map->[$x + $xofs];
774 for my $y (0 .. $sh - 1) { 1204 for my $y (0 .. $sh - 1) {
775 1205
776 my $cell = $map->[$x + $xofs][$y + $yofs] 1206 my $cell = $row->[$y + $yofs]
777 or next; 1207 or next;
778 1208
779 my $darkness = $cell->[0] * (1 / 255); 1209 my $dark = $cell->[0];
780 if ($darkness < 0) { 1210 if ($dark < 0) {
781 $darkness = 0.15; 1211 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1212 } else {
1213 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
782 } 1214 }
783 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
784 1215
785 for my $num (grep $_, @$cell[1,2,3]) { 1216 for my $num (grep $_, @$cell[1,2,3]) {
786 my $tex = $::CONN->{face}[$num]{texture} || next; 1217 my $tex = $::CONN->{face}[$num]{texture} || next;
1218
1219 my ($w, $h) = @$tex{qw(w h)};
787 1220
788 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1221 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
789
790 my $w = $tex->{width};
791 my $h = $tex->{height};
792
793 my $px = ($x + 1) * 32 - $w;
794 my $py = ($y + 1) * 32 - $h;
795
796 glBegin GL_QUADS;
797 glTexCoord 0, 0; glVertex $px , $py;
798 glTexCoord 0, 1; glVertex $px , $py + $h;
799 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
800 glTexCoord 1, 0; glVertex $px + $w, $py;
801 glEnd; 1222 }
802 } 1223 }
803 } 1224 }
804 }
805 1225
806# if (1) { # higher quality darkness 1226# if (1) { # higher quality darkness
807# $lighting =~ s/(.)/$1$1$1/gs; 1227# $lighting =~ s/(.)/$1$1$1/gs;
808# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1228# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
809# 1229#
… …
811# 1231#
812# $lighting = $pb->get_pixels; 1232# $lighting = $pb->get_pixels;
813# $lighting =~ s/(.)../$1/gs; 1233# $lighting =~ s/(.)../$1/gs;
814# } 1234# }
815 1235
816 $lighting = new Crossfire::Client::Texture
817 width => $sw4,
818 height => $sh,
819 data => $lighting,
820 internalformat => GL_ALPHA4,
821 format => GL_ALPHA;
822
823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
824 glColor 0, 0, 0, 0.75;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 glBindTexture GL_TEXTURE_2D, $lighting->{name};
827 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
828 glBegin GL_QUADS;
829 glTexCoord 0, 0; glVertex 0 , 0;
830 glTexCoord 0, 1; glVertex 0 , $sh * 32;
831 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
832 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
833 glEnd;
834 1238
1239 $darkness = new CFClient::Texture
1240 width => $sw4,
1241 height => $sh,
1242 data => $darkness,
1243 internalformat => GL_ALPHA,
1244 format => GL_ALPHA;
1245
1246 glColor 0.45, 0.45, 0.45, 1;
1247 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1248
835 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
836 glDisable GL_BLEND; 1250 glDisable GL_BLEND;
1251
1252 glEndList;
1253 }
1254
1255 glCallList $self->{list};
837} 1256}
838 1257
839my %DIR = ( 1258my %DIR = (
840 SDLK_KP8, [1, "north"], 1259 SDLK_KP8, [1, "north"],
841 SDLK_KP9, [2, "northeast"], 1260 SDLK_KP9, [2, "northeast"],
… …
887 } 1306 }
888} 1307}
889 1308
890############################################################################# 1309#############################################################################
891 1310
892package Crossfire::Client::Widget::Animator; 1311package CFClient::Widget::Animator;
893 1312
894use SDL::OpenGL; 1313use SDL::OpenGL;
895 1314
896our @ISA = Crossfire::Client::Widget::Bin::; 1315our @ISA = CFClient::Widget::Bin::;
897 1316
898sub moveto { 1317sub moveto {
899 my ($self, $x, $y) = @_; 1318 my ($self, $x, $y) = @_;
900 1319
901 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1320 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
902 $self->{speed} = 0.2; 1321 $self->{speed} = 0.001;
903 $self->{time} = 1; 1322 $self->{time} = 1;
904 1323
905 ::animation_start $self; 1324 ::animation_start $self;
906} 1325}
907 1326
… …
922 1341
923sub _draw { 1342sub _draw {
924 my ($self) = @_; 1343 my ($self) = @_;
925 1344
926 glPushMatrix; 1345 glPushMatrix;
927 glRotate $self->{time} * 10000, 0, 1, 0; 1346 glRotate $self->{time} * 1000, 0, 1, 0;
928 $self->{children}[0]->draw; 1347 $self->{children}[0]->draw;
929 glPopMatrix; 1348 glPopMatrix;
930} 1349}
931 1350
9321; 1351#############################################################################
933 1352
1353package CFClient::Widget::Toplevel;
1354
1355our @ISA = CFClient::Widget::Container::;
1356
1357sub size_request {
1358 ($::WIDTH, $::HEIGHT)
1359}
1360
1361sub size_allocate {
1362 my ($self, $w, $h) = @_;
1363
1364 $self->SUPER::size_allocate ($w, $h);
1365
1366 $_->size_allocate ($_->size_request)
1367 for @{$self->{children}};
1368}
1369
1370sub translate {
1371 my ($self, $x, $y) = @_;
1372
1373 ($x, $y)
1374}
1375
1376sub update {
1377 my ($self) = @_;
1378
1379 $self->size_allocate ($self->size_request);
1380 ::refresh ();
1381}
1382
1383sub add {
1384 my ($self, $widget) = @_;
1385
1386 $self->SUPER::add ($widget);
1387
1388 $widget->size_allocate ($widget->size_request);
1389}
1390
1391sub draw {
1392 my ($self) = @_;
1393
1394 $self->_draw;
1395}
1396
1397#############################################################################
1398
1399package CFClient::Widget;
1400
1401$TOPLEVEL = new CFClient::Widget::Toplevel;
1402
14031
1404

Diff Legend

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