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.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC

… …
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10our $FOCUS; # the widget with current focus
11#our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
… …
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24 23
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
40 $self->{y} = $y; 27 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 28 $self->{z} = $z if defined $z;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42 $self->w ($w);
43 $self->h ($h);
50} 44}
51 45
52sub focus_in { 46sub focus_in {
53 my ($widget) = @_; 47 my ($widget) = @_;
54 $FOCUS = $widget; 48 $FOCUS = $widget;
… …
72 66
73sub button_up { 67sub button_up {
74 my ($widget, $sdlev) = @_; 68 my ($widget, $sdlev) = @_;
75} 69}
76 70
77sub w { $_[0]->{w} } 71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 76
83sub draw { 77sub draw {
… …
88 $self->_draw; 82 $self->_draw;
89 glPopMatrix; 83 glPopMatrix;
90} 84}
91 85
92sub _draw { 86sub _draw {
93 my ($widget) = @_; 87 my ($self) = @_;
88
89 warn "no draw defined for $self\n";
94} 90}
95 91
96sub bbox { 92sub bbox {
97 my ($self) = @_; 93 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 94 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 98 $self->{x} = $w,
103 $self->{y} = $h 99 $self->{y} = $h
104 ) 100 )
105} 101}
106 102
103sub find_widget {
104 my ($self, $x, $y) = @_;
105
106 return $self
107 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
108 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
109
110 ()
111}
112
107sub del_parent { $_[0]->{parent} = undef } 113sub del_parent { $_[0]->{parent} = undef }
108 114
109sub set_parent { 115sub set_parent {
110 my ($self, $par) = @_; 116 my ($self, $par) = @_;
111 117
… …
132 138
133package Crossfire::Client::Widget::Container; 139package Crossfire::Client::Widget::Container;
134 140
135our @ISA = Crossfire::Client::Widget::; 141our @ISA = Crossfire::Client::Widget::;
136 142
137use SDL::OpenGL; 143sub new {
144 my ($class, @widgets) = @_;
138 145
139sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 146 my $self = $class->SUPER::new (children => []);
140sub get { $_[0]->{child} } 147 $self->add ($_) for @widgets;
148
149 $self
150}
151
152sub add {
153 my ($self, $chld, $expand) = @_;
154
155 $chld->{expand} = $expand;
156 $chld->set_parent ($self);
157
158 @{$self->{children}} =
159 sort { $a->{z} <=> $b->{z} }
160 @{$self->{children}}, $chld;
161
162 $self->size_allocate ($self->{w}, $self->{h});
163}
164
141sub remove { 165sub remove {
166 my ($self, $widget) = @_;
167
168 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
169
170 $self->size_allocate ($self->{w}, $self->{h});
171}
172
173sub find_widget {
174 my ($self, $x, $y) = @_;
175
176 my $res;
177
178 for (@{ $self->{children} }) {
179 $res = $_->find_widget ($x, $y)
180 and return $res;
181 }
182
183 ()
184}
185
186sub size_request {
187 my ($self) = @_;
188
189 my ($hs, $ws) = (0, 0);
190 for (@{$self->{children} || []}) {
191 my ($w, $h) = $_->size_request;
192 $hs += $h;
193 if ($ws < $w) { $ws = $w }
194 }
195
196 return ($ws, $hs);
197}
198
199sub _draw {
200 my ($self) = @_;
201
202 $_->draw for @{$self->{children}};
203}
204
205package Crossfire::Client::Widget::Bin;
206
207our @ISA = Crossfire::Client::Widget::Container::;
208
209sub get { $_[0]->{children}[0] }
210
211sub size_request {
212 $_[0]{children}[0]->size_request if $_[0]{children}[0];
213}
214
215sub size_allocate {
142 my ($self, $chld) = @_; 216 my ($self, $w, $h) = @_;
143 delete $self->{child} 217 $self->SUPER::size_allocate ($w, $h);
144 if $self->{child} == $chld; 218 $self->{children}[0]->size_allocate ($w, $h)
219 if $self->{children}[0]
145} 220}
146
147sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
148
149sub _draw { die "Containers can't be drawn!" }
150 221
151package Crossfire::Client::Widget::Toplevel; 222package Crossfire::Client::Widget::Toplevel;
152 223
224our @ISA = Crossfire::Client::Widget::Container::;
225
226sub update {
227 my ($self) = @_;
228
229 ::refresh ();
230}
231
232package Crossfire::Client::Widget::Window;
233
153our @ISA = Crossfire::Client::Widget::; 234our @ISA = Crossfire::Client::Widget::Bin::;
154 235
155use SDL::OpenGL; 236use SDL::OpenGL;
156 237
157sub add { 238sub add {
158 my ($self, $chld) = @_; 239 my ($self, $chld) = @_;
159 240 warn "ADD $chld\n";
160 push @{$self->{childs}}, $chld;
161 @{$self->{childs}} =
162 sort { $a->{z} <=> $b->{z} }
163 @{$self->{childs}};
164
165 $chld->set_parent ($self);
166}
167
168sub remove {
169 my ($self, $chld) = @_;
170 @{$self->{childs}} =
171 sort { $a->{z} <=> $b->{z} }
172 grep { $_ && $_ != $_[0] }
173 @{$self->{childs}}
174}
175
176sub update {
177 my ($self) = @_;
178 ::refresh ();
179}
180
181sub _draw {
182 my ($self) = @_;
183
184 $_->draw for @{$self->{childs}};
185}
186
187package Crossfire::Client::Widget::Window;
188
189our @ISA = Crossfire::Client::Widget::Container::;
190
191use SDL::OpenGL;
192
193sub add {
194 my ($self, $chld) = @_;
195 $self->SUPER::add ($chld); 241 $self->SUPER::add ($chld);
196 $chld->set_parent ($self); 242 $chld->set_parent ($self);
197 $self->update; #TODO: Move this to the size_request event propably?
198} 243}
199 244
200sub remove { 245sub remove {
201 my ($self) = @_; 246 my ($self) = @_;
202 # TODO FIXME: removing a child from a window will crash, see render_chld 247 # TODO FIXME: removing a child from a window will crash, see render_chld
203 $self->update; 248 # $self->update;
204} 249}
205 250
206sub update { 251sub update {
207 my ($self) = @_; 252 my ($self) = @_;
208 $self->render_chld; 253 $self->render_chld;
… …
211sub render_chld { 256sub render_chld {
212 my ($self) = @_; 257 my ($self) = @_;
213 my $chld = $self->get; 258 my $chld = $self->get;
214 my ($w, $h) = $self->size_request; 259 my ($w, $h) = $self->size_request;
215 260
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
216 $self->{texture} = 264 $self->{texture} =
217 Crossfire::Client::Texture->new_from_opengl ( 265 Crossfire::Client::Texture->new_from_opengl (
218 $w, $h, sub { $chld->draw } 266 $w, $h, sub { $chld->draw }
219 ); 267 );
220 $self->{texture}->upload; 268 $self->{texture}->upload;
221} 269}
222 270
223sub size_request { 271sub size_request {
224 my ($self) = @_; 272 my ($self) = @_;
225 my $chld = $self->get 273 ($self->w, $self->h)
226 or return (0, 0); 274}
227 $chld->size_request 275
276sub size_allocate {
277 my ($self, $w, $h) = @_;
278
279 $self->w ($w);
280 $self->h ($h);
281 $self->get->size_allocate ($w, $h);
282
283 $self->update; #TODO: Move this to the size_request event propably?
228} 284}
229 285
230sub _draw { 286sub _draw {
231 my ($self) = @_; 287 my ($self) = @_;
232 288
233 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 289 my ($w, $h) = ($self->w, $self->h);
234 290
235 my $tex = $self->{texture} 291 my $tex = $self->{texture}
236 or return; 292 or return;
237 293
238 glEnable GL_BLEND; 294 glEnable GL_BLEND;
239 glEnable GL_TEXTURE_2D; 295 glEnable GL_TEXTURE_2D;
240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241 glBindTexture GL_TEXTURE_2D, $tex->{name}; 297 glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243 glColor 1, 0, 1;
244 298
245 glBegin GL_QUADS; 299 glBegin GL_QUADS;
246 glTexCoord 0, 0; glVertex 0, 0; 300 glTexCoord 0, 0; glVertex 0, 0;
247 glTexCoord 0, 1; glVertex 0, $h; 301 glTexCoord 0, 1; glVertex 0, $h;
248 glTexCoord 1, 1; glVertex $w, $h; 302 glTexCoord 1, 1; glVertex $w, $h;
… …
253 glDisable GL_TEXTURE_2D; 307 glDisable GL_TEXTURE_2D;
254} 308}
255 309
256package Crossfire::Client::Widget::Frame; 310package Crossfire::Client::Widget::Frame;
257 311
258our @ISA = Crossfire::Client::Widget::Container::; 312our @ISA = Crossfire::Client::Widget::Bin::;
259 313
260use SDL::OpenGL; 314use SDL::OpenGL;
261 315
262sub size_request { 316sub size_request {
263 my ($self) = @_; 317 my ($self) = @_;
… …
265 or return (0, 0); 319 or return (0, 0);
266 320
267 $chld->move (2, 2); 321 $chld->move (2, 2);
268 322
269 map { $_ + 4 } $chld->size_request; 323 map { $_ + 4 } $chld->size_request;
324}
325
326sub size_allocate {
327 my ($self, $w, $h) = @_;
328
329 $self->w ($w);
330 $self->h ($h);
331
332 $self->get->size_allocate ($w - 4, $h - 4);
333 $self->get->move (2, 2);
270} 334}
271 335
272sub _draw { 336sub _draw {
273 my ($self) = @_; 337 my ($self) = @_;
274 338
… …
291 355
292our @ISA = Crossfire::Client::Widget::Frame::; 356our @ISA = Crossfire::Client::Widget::Frame::;
293 357
294use SDL::OpenGL; 358use SDL::OpenGL;
295 359
296#TODO: implement themed frame 360sub new {
361 my ($self, $theme) = @_;
362 $self = $self->SUPER::new;
363
364 $self->{txts} = [
365 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
366 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
367 ];
368 $self
369}
370
371sub size_request {
372 my ($self) = @_;
373 my ($w, $h) = $self->get->size_request;
374
375 $h += $self->{txts}->[1]->{height};
376 $h += $self->{txts}->[4]->{height};
377 $w += $self->{txts}->[2]->{width};
378 $w += $self->{txts}->[3]->{width};
379
380 ($w, $h)
381}
382
383sub size_allocate {
384 my ($self, $w, $h) = @_;
385
386 $self->w ($w);
387 $self->h ($h);
388 $h -= $self->{txts}->[1]->{height};
389 $h -= $self->{txts}->[4]->{height};
390 $w -= $self->{txts}->[2]->{width};
391 $w -= $self->{txts}->[3]->{width};
392
393 $h = $h < 0 ? 0 : $h;
394 $w = $w < 0 ? 0 : $w;
395 warn "CHILD:$w $h\n";
396 $self->get->size_allocate ($w, $h);
397 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
398}
399
400sub _draw {
401 my ($self) = @_;
402
403 my ($w, $h) = ($self->w, $self->h);
404 my ($cw, $ch) = ($self->get->w, $self->get->h);
405
406 glEnable GL_BLEND;
407 glEnable GL_TEXTURE_2D;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
410
411 my $top = $self->{txts}->[1];
412 glBindTexture GL_TEXTURE_2D, $top->{name};
413
414 glBegin GL_QUADS;
415 glTexCoord 0, 0; glVertex 0 , 0;
416 glTexCoord 0, 1; glVertex 0 , $top->{height};
417 glTexCoord 1, 1; glVertex $w , $top->{height};
418 glTexCoord 1, 0; glVertex $w , 0;
419 glEnd;
420
421 my $left = $self->{txts}->[3];
422 glBindTexture GL_TEXTURE_2D, $left->{name};
423
424 glBegin GL_QUADS;
425 glTexCoord 0, 0; glVertex 0 , $top->{height};
426 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
427 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
428 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
429 glEnd;
430
431 my $right = $self->{txts}->[2];
432 glBindTexture GL_TEXTURE_2D, $right->{name};
433
434 glBegin GL_QUADS;
435 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
436 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
437 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
438 glTexCoord 1, 0; glVertex $w , $top->{height};
439 glEnd;
440
441 my $bottom = $self->{txts}->[4];
442 glBindTexture GL_TEXTURE_2D, $bottom->{name};
443
444 glBegin GL_QUADS;
445 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
446 glTexCoord 0, 1; glVertex 0 , $h;
447 glTexCoord 1, 1; glVertex $w , $h;
448 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
449 glEnd;
450
451 my $bg = $self->{txts}->[0];
452 glBindTexture GL_TEXTURE_2D, $bg->{name};
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
454 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
455 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
456
457 my $rep_x = $cw / $bg->{width};
458 my $rep_y = $ch / $bg->{height};
459
460 glBegin GL_QUADS;
461 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
462 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
463 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
464 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
465 glEnd;
466
467 glDisable GL_BLEND;
468 glDisable GL_TEXTURE_2D;
469
470 $self->get->draw;
471
472}
297 473
298package Crossfire::Client::Widget::Table; 474package Crossfire::Client::Widget::Table;
299 475
300our @ISA = Crossfire::Client::Widget::Container::; 476our @ISA = Crossfire::Client::Widget::Bin::;
301 477
302use SDL::OpenGL; 478use SDL::OpenGL;
303 479
304sub add { 480sub add {
305 my ($self, $x, $y, $chld) = @_; 481 my ($self, $x, $y, $chld) = @_;
306 my $old_chld = $self->{childs}[$y][$x]; 482 my $old_chld = $self->{children}[$y][$x];
307 483
308 $self->{childs}[$y][$x] = $chld; 484 $self->{children}[$y][$x] = $chld;
309 $chld->set_parent ($self); 485 $chld->set_parent ($self);
310 $self->update; 486 $self->update;
311} 487}
312 488
313sub max_row_height { 489sub max_row_height {
314 my ($self, $row) = @_; 490 my ($self, $row) = @_;
315 491
316 my $hs = 0; 492 my $hs = 0;
317 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 493 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
318 my $c = $self->{childs}->[$row]->[$xi]; 494 my $c = $self->{children}->[$row]->[$xi];
319 if ($c) { 495 if ($c) {
320 my ($w, $h) = $c->size_request; 496 my ($w, $h) = $c->size_request;
321 if ($hs < $h) { $hs = $h } 497 if ($hs < $h) { $hs = $h }
322 } 498 }
323 } 499 }
… …
326 502
327sub max_col_width { 503sub max_col_width {
328 my ($self, $col) = @_; 504 my ($self, $col) = @_;
329 505
330 my $ws = 0; 506 my $ws = 0;
331 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 507 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
332 my $c = ($self->{childs}->[$yi] || [])->[$col]; 508 my $c = ($self->{children}->[$yi] || [])->[$col];
333 if ($c) { 509 if ($c) {
334 my ($w, $h) = $c->size_request; 510 my ($w, $h) = $c->size_request;
335 if ($ws < $w) { $ws = $w } 511 if ($ws < $w) { $ws = $w }
336 } 512 }
337 } 513 }
… …
341sub size_request { 517sub size_request {
342 my ($self) = @_; 518 my ($self) = @_;
343 519
344 my ($hs, $ws) = (0, 0); 520 my ($hs, $ws) = (0, 0);
345 521
346 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 522 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347 $hs += $self->max_row_height ($yi); 523 $hs += $self->max_row_height ($yi);
348 } 524 }
349 525
350 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 526 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351 my $wm = 0; 527 my $wm = 0;
352 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 528 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353 $wm += $self->max_col_width ($xi) 529 $wm += $self->max_col_width ($xi)
354 } 530 }
355 if ($ws < $wm) { $ws = $wm } 531 if ($ws < $wm) { $ws = $wm }
356 } 532 }
357 533
… …
360 536
361sub _draw { 537sub _draw {
362 my ($self) = @_; 538 my ($self) = @_;
363 539
364 my $y = 0; 540 my $y = 0;
365 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 541 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366 my $x = 0; 542 my $x = 0;
367 543
368 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369 545
370 my $c = $self->{childs}->[$yi]->[$xi]; 546 my $c = $self->{children}->[$yi]->[$xi];
371 if ($c) { 547 if ($c) {
372 $c->move ($x, $y, 0); #TODO: Move to size_request 548 $c->move ($x, $y, 0); #TODO: Move to size_request
373 $c->draw if $c; 549 $c->draw if $c;
374 } 550 }
375 551
… …
384 560
385our @ISA = Crossfire::Client::Widget::Container::; 561our @ISA = Crossfire::Client::Widget::Container::;
386 562
387use SDL::OpenGL; 563use SDL::OpenGL;
388 564
389sub add { 565sub size_allocate {
390 my ($self, $chld) = @_; 566 my ($self, $w, $h) = @_;
391 push @{$self->{childs}}, $chld;
392 $chld->set_parent ($self);
393 $self->update;
394}
395 567
396sub size_request { 568 $self->w ($w);
397 my ($self) = @_; 569 $self->h ($h);
398 570
399 my ($hs, $ws) = (0, 0); 571 my $exp;
572 my @oth;
573 # find expand widget
400 for (@{$self->{childs} || []}) { 574 for (@{$self->{children}}) {
575 if ($_->{expand}) {
576 $exp = $_;
577 last;
578 }
579 push @oth, $_;
580 }
581
582 my ($ow, $oh);
583
584 # get sizes of other widgets
585 for (@oth) {
401 my ($w, $h) = $_->size_request; 586 my ($w, $h) = $_->size_request;
402 $hs += $h; 587 $oh += $h;
403 if ($ws < $w) { $ws = $w } 588 if ($ow < $w) { $ow = $w }
404 } 589 }
405 590
406 return ($ws, $hs); 591 my $y = 0;
592 for (@{$self->{children}}) {
593 $_->move (0, $y);
594
595 if ($_ == $exp) {
596 $_->size_allocate ($w, $h - $oh);
597 $y += $h - $oh;
598 } else {
599 my ($cw, $h) = $_->size_request;
600 $_->size_allocate ($w, $h);
601 $y += $h;
602 }
603 }
407} 604}
408 605
409sub _draw { 606sub _draw {
410 my ($self) = @_; 607 my ($self) = @_;
411 608
412 my ($x, $y); 609 my ($x, $y);
413 for (@{$self->{childs} || []}) { 610 for (@{$self->{children} || []}) {
414 $_->move (0, $y, 0); #TODO: move to size_request
415 $_->draw; 611 $_->draw;
416 my ($w, $h) = $_->size_request;
417 $y += $h; 612 $y += $_->h;
418 } 613 }
419} 614}
420 615
421package Crossfire::Client::Widget::Label; 616package Crossfire::Client::Widget::Label;
422 617
… …
468 glEnable GL_TEXTURE_2D; 663 glEnable GL_TEXTURE_2D;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
471 glBindTexture GL_TEXTURE_2D, $tex->{name}; 666 glBindTexture GL_TEXTURE_2D, $tex->{name};
472 667
473 glColor 1, 1, 1, 0.6; # TODO color 668 glColor 1, 0, 0, 1; # TODO color
474 669
475 glBegin GL_QUADS; 670 glBegin GL_QUADS;
476 glTexCoord 0, 0; glVertex 0 , 0; 671 glTexCoord 0, 0; glVertex 0 , 0;
477 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
478 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
508 $text .= chr $uni; 703 $text .= chr $uni;
509 } 704 }
510 $self->set_text ($text); 705 $self->set_text ($text);
511} 706}
512 707
513
514# XXX: TextView isn't neccessary with pango multiline text rendering
515package Crossfire::Client::Widget::TextView;
516
517use strict;
518
519our @ISA = qw/Crossfire::Client::Widget/;
520
521use SDL::OpenGL;
522use SDL::OpenGL::Constants;
523
524sub new {
525 my ($class, $text, $h) = @_;
526 my $self = $class->SUPER::new ();
527
528 $self->{txt_height} = $h;
529 @{$self->{lines}} = split /\r?\n/, $text;
530
531 for (split /\r?\n/, $text) {
532 $self->add_line ($_);
533 }
534 $self
535}
536
537#sub render_lines {
538# my ($self) = @_;
539#
540# $self->{txt_lines} = [];
541#
542# for (@{$self->{lines}}) {
543# push @{$self->{txt_lines}},
544# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
545# }
546#}
547
548sub add_line {
549 my ($self, $line) = @_;
550 push @{$self->{lines}}, $line;
551
552 push @{$self->{txt_lines}},
553 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
554}
555
556sub size_request {
557 my ($self) = @_;
558
559 my $w = 0;
560 my $h = 0;
561
562 for (@{$self->{txt_lines}}) {
563 if ($w < $_->{width}) { $w = $_->{width} }
564 $h += $_->{height};
565 }
566
567 return ($w, $h);
568}
569
570sub draw_line {
571 my ($self, $tex, $y) = @_;
572
573 glBindTexture GL_TEXTURE_2D, $tex->{name};
574
575 glColor 1, 0, 1;
576
577 glBegin GL_QUADS;
578 glTexCoord 0, 0; glVertex 0 , $y;
579 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
580 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
581 glTexCoord 1, 0; glVertex $tex->{width}, $y;
582 glEnd;
583}
584
585sub _draw {
586 my ($self) = @_;
587
588 glEnable GL_BLEND;
589 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
591
592 my $l = 0;
593 for (@{$self->{txt_lines}}) {
594 $self->draw_line ($_, $l);
595 $l += $_->{height};
596 }
597
598 glDisable GL_BLEND;
599 glDisable GL_TEXTURE_2D;
600}
601
602package Crossfire::Client::Widget::MapWidget; 708package Crossfire::Client::Widget::MapWidget;
603 709
604use strict; 710use strict;
605 711
606use List::Util qw(min max); 712use List::Util qw(min max);
… …
614sub key_down { 720sub key_down {
615 print "MAPKEYDOWN\n"; 721 print "MAPKEYDOWN\n";
616} 722}
617 723
618sub key_up { 724sub key_up {
725}
726
727sub size_request {
728
729}
730
731sub size_allocate {
619} 732}
620 733
621sub _draw { 734sub _draw {
622 my ($self) = @_; 735 my ($self) = @_;
623 736
… …
643 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 756 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
644 } 757 }
645 758
646 glEnable GL_TEXTURE_2D; 759 glEnable GL_TEXTURE_2D;
647 glEnable GL_BLEND; 760 glEnable GL_BLEND;
648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
762
763 my $sw4 = ($sw + 3) & ~3;
764 my $lighting = "\x00" x ($sw4 * $sh);
649 765
650 for my $x (0 .. $sw - 1) { 766 for my $x (0 .. $sw - 1) {
651 for my $y (0 .. $sh - 1) { 767 for my $y (0 .. $sh - 1) {
652 768
653 my $cell = $map->[$x + $xofs][$y + $yofs] 769 my $cell = $map->[$x + $xofs][$y + $yofs]
654 or next; 770 or next;
655 771
656 my $darkness = $cell->[0] * (1 / 255); 772 my $darkness = $cell->[0] * (1 / 255);
657 if ($darkness < 0) { 773 if ($darkness < 0) {
658 glColor 0.3, 0.3, 0.3; 774 $darkness = 0.15;
659 } else {
660 glColor $darkness, $darkness, $darkness;
661 } 775 }
776 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
662 777
663 for my $num (grep $_, @$cell[1,2,3]) { 778 for my $num (grep $_, @$cell[1,2,3]) {
664 my $tex = $::CONN->{face}[$num]{texture} || next; 779 my $tex = $::CONN->{face}[$num]{texture} || next;
665 780
666 glBindTexture GL_TEXTURE_2D, $tex->{name}; 781 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
678 glTexCoord 1, 0; glVertex $px + $w, $py; 793 glTexCoord 1, 0; glVertex $px + $w, $py;
679 glEnd; 794 glEnd;
680 } 795 }
681 } 796 }
682 } 797 }
798
799# if (1) { # higher quality darkness
800# $lighting =~ s/(.)/$1$1$1/gs;
801# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
802#
803# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
804#
805# $lighting = $pb->get_pixels;
806# $lighting =~ s/(.)../$1/gs;
807# }
808
809 $lighting = new Crossfire::Client::Texture
810 width => $sw4,
811 height => $sh,
812 data => $lighting,
813 internalformat => GL_ALPHA4,
814 format => GL_ALPHA;
815
816 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
817 glColor 0, 0, 0, 0.75;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
819 glBindTexture GL_TEXTURE_2D, $lighting->{name};
820 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
821 glBegin GL_QUADS;
822 glTexCoord 0, 0; glVertex 0 , 0;
823 glTexCoord 0, 1; glVertex 0 , $sh * 32;
824 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
825 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
826 glEnd;
683 827
684 glDisable GL_TEXTURE_2D; 828 glDisable GL_TEXTURE_2D;
685 glDisable GL_BLEND; 829 glDisable GL_BLEND;
686} 830}
687 831
… …
734 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 878 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
735 $::CONN->send ("command run_stop"); 879 $::CONN->send ("command run_stop");
736 } 880 }
737} 881}
738 882
883package Crossfire::Client::Widget::Animator;
884
885use SDL::OpenGL;
886
887our @ISA = Crossfire::Client::Widget::Bin::;
888
889sub moveto {
890 my ($self, $x, $y) = @_;
891
892 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
893 $self->{speed} = 0.2;
894 $self->{time} = 1;
895
896 ::animation_start $self;
897}
898
899sub animate {
900 my ($self, $interval) = @_;
901
902 $self->{time} -= $interval * $self->{speed};
903 if ($self->{time} <= 0) {
904 $self->{time} = 0;
905 ::animation_stop $self;
906 }
907
908 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
909
910 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
911 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
912}
913
914sub _draw {
915 my ($self) = @_;
916
917 glPushMatrix;
918 glRotate $self->{time} * 10000, 0, 1, 0;
919 $self->{children}[0]->draw;
920 glPopMatrix;
921}
922
7391; 9231;
740 924

Diff Legend

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