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.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.41 by root, Sun Apr 9 21:50:21 2006 UTC

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

Diff Legend

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