Another huge commit!!!

First, check on the new files, which are listed below.
The new butspace.h is a local include, only to be used for the buttons
drawn in the buttonswindow.

- editbuts, animbuts, gamebuts, displaybuts, paintbuts,  work now
- i quite completely reorganized it, it's now nicely telling you what
  context it is in
- sorting error in panel align fixed (tabs were flipping)
- align works correctly automatic when you click around in Blender
- editsca.c renamed to buttons_logic.h
- button names are truncated from the right for allmost all buttons
  (except text buttons and number buttons)
- while dragging panels, you cannot move them outside window anymore

And of course fixed loads of little bugs I encountered while testing
it all. This is a version I really need good test & feedback for.

Next step: restoring material/lamp/texture/world

1 files changed, 52 insertions, 382 deletions

diff --git a/source/blender/include/BIF_butspace.h b/source/blender/include/BIF_butspace.h
index b2c9aec0f83..9023a88310a 100644
--- a/source/blender/include/BIF_butspace.h
+++ b/source/blender/include/BIF_butspace.h
@@ -32,394 +32,64 @@
 #ifndef BIF_BUTSPACE_H
 #define BIF_BUTSPACE_H
 
-/* all internal calls and event codes for buttons space */
+/* all internal/external calls and event codes for buttons space */
+/* should be split in 2 parts... */
+
 struct Base;
 struct ID;
 
-extern void render_panels(void);
-extern void do_render_panels(unsigned short event);
-
+/* external, butspace.c */
 extern void do_butspace(unsigned short event);
-
 extern void redraw_test_buttons(struct Base *new);
 
-void test_meshpoin_but(char *name, struct ID **idpp);
-void test_obpoin_but(char *name, struct ID **idpp);
-void test_scenepoin_but(char *name, struct ID **idpp);
-void test_matpoin_but(char *name, struct ID **idpp);
-void test_scriptpoin_but(char *name, struct ID **idpp);
-void test_actionpoin_but(char *name, ID **idpp);
-
-
-/* -------------- event defines ------------ */
-
-
-#define B_DIFF			1	
-
-/* *********************** */
-#define B_VIEWBUTS		1100
-
-#define B_LOADBGPIC		1001
-#define B_BLENDBGPIC	1002
-#define B_BGPICBROWSE	1003
-#define B_BGPICTEX		1004
-#define B_BGPICCLEAR	1005
-#define B_BGPICTEXCLEAR	1006
-
-/* *********************** */
-#define B_LAMPBUTS		1200
-
-#define B_LAMPREDRAW	1101
-#define B_COLLAMP		1102
-#define B_TEXCLEARLAMP	1103
-#define B_SBUFF			1104
-
-/* *********************** */
-#define B_MATBUTS		1300
-
-#define B_MATCOL		1201
-#define B_SPECCOL		1202
-#define B_MIRCOL		1203
-#define B_ACTCOL		1204
-#define B_MATFROM		1205
-#define B_MATPRV		1206
-#define B_MTEXCOL		1207
-#define B_TEXCLEAR		1208
-#define B_MATPRV_DRAW	1209
-#define B_MTEXPASTE		1210
-#define B_MTEXCOPY		1211
-#define B_MATLAY		1212
-
-/* *********************** */
-#define B_TEXBUTS		1400
-
-#define B_TEXTYPE		1301
-#define B_DEFTEXVAR		1302
-#define B_LOADTEXIMA	1303
-#define B_NAMEIMA		1304
-#define B_TEXCHANNEL	1305
-#define B_TEXREDR_PRV	1306
-#define B_TEXIMABROWSE	1307
-#define B_IMAPTEST		1308
-#define B_RELOADIMA		1309
-#define B_LOADPLUGIN	1310
-#define B_NAMEPLUGIN	1311
-#define B_COLORBAND		1312
-#define B_ADDCOLORBAND	1313
-#define B_DELCOLORBAND	1314
-#define B_CALCCBAND		1315
-#define B_CALCCBAND2	1316
-#define B_DOCOLORBAND	1317
-#define B_REDRAWCBAND	1318
-#define B_BANDCOL		1319
-#define B_LOADTEXIMA1	1320
-#define B_PLUGBUT		1321
-
-/* plugbut reserves 24 buttons at least! */
-
-#define B_ENV_MAKE		1350
-#define B_ENV_FREE		1351
-#define B_ENV_DELETE	1352
-#define B_ENV_SAVE		1353
-#define B_ENV_OB		1354
-
-#define B_PACKIMA		1355
-#define B_TEXSETFRAMES	1356
-
-#define B_ENV_FREE_ALL	1357
-
-/* *********************** */
-#define B_ANIMBUTS		1500
-
-#define B_RECALCPATH	1401
-#define B_MUL_IPO		1402
-#define B_AUTOTIMEOFS	1403
-#define B_FRAMEMAP		1404
-#define B_NEWEFFECT		1405
-#define B_PREVEFFECT	1406
-#define B_NEXTEFFECT	1407
-#define B_CHANGEEFFECT	1408
-#define B_CALCEFFECT	1409
-#define B_DELEFFECT		1410
-#define B_RECALCAL		1411
-#define B_SETSPEED		1412
-#define B_PRINTSPEED	1413
-#define B_PRINTLEN		1414
-#define B_RELKEY		1415
-
-	/* this has MAX_EFFECT settings! Next free define is 1450... */
-#define B_SELEFFECT	1430	
-
-
-/* *********************** */
-#define B_WORLDBUTS		1600
-
-#define B_TEXCLEARWORLD	1501
-
-/* *********************** */
-#define B_RENDERBUTS	1700
-
-#define B_FS_PIC		1601
-#define B_FS_BACKBUF	1602
-
-#define B_FS_FTYPE		1604
-#define B_DORENDER		1605
-#define B_DOANIM		1606
-#define B_PLAYANIM		1607
-#define B_PR_PAL		1608
-#define B_PR_FULL		1609
-#define B_PR_PRV		1610
-#define B_PR_CDI		1611
-#define B_PR_PAL169		1612
-#define B_PR_D2MAC		1613
-#define B_PR_MPEG		1614
-#define B_REDRAWDISP	1615
-#define B_SETBROWSE		1616
-#define B_CLEARSET		1617
-#define B_PR_PRESET		1618
-#define B_PR_PANO		1619
-#define B_PR_NTSC		1620
-
-#define B_IS_FTYPE		1622
-#define B_IS_BACKBUF	1623
-#define B_PR_PC			1624
-
-#define B_PR_PANO360    1627
-#define B_PR_HALFFIELDS	1628
-#define B_NEWRENDERPIPE 1629
-#define B_R_SCALE       1630
-#define B_G_SCALE       1631
-#define B_B_SCALE       1632
-#define B_USE_R_SCALE   1633
-#define B_USE_G_SCALE   1634
-#define B_USE_B_SCALE   1635
-#define B_EDGECOLSLI    1636
-#define B_GAMMASLI      1637
-
-#define B_FILETYPEMENU  1638
-#define B_SELECTCODEC   1639
-#define B_RTCHANGED		1640
-
-#ifdef __NLA
-/* *********************** */
-enum {
-	B_ARMATUREBUTS	=	1800,
-	B_POSE			=	1701
-};
-#endif
-
-/* *********************** */
-#define B_COMMONEDITBUTS	2049
-
-#define B_MATWICH		2003
-#define B_MATNEW		2004
-#define B_MATDEL		2005
-#define B_MATASS		2006
-#define B_MATSEL		2007
-#define B_MATDESEL		2008
-#define B_HIDE			2009
-#define B_REVEAL		2010
-#define B_SELSWAP		2011
-#define B_SETSMOOTH		2012
-#define B_SETSOLID		2013
-#define B_AUTOTEX		2014
-#define B_DOCENTRE		2015
-#define B_DOCENTRENEW	2016
-#define B_DOCENTRECURSOR	2017
-
-	/* 32 values! */
-#define B_OBLAY			2018
-
-#define B_MESHBUTS		2100
-
-#define B_FLIPNORM		2050
-#define B_SPIN			2051
-#define B_SPINDUP		2052
-#define B_EXTR			2053
-#define B_SCREW			2054
-#define B_EXTREP		2055
-#define B_SPLIT			2056
-#define B_REMDOUB		2057
-#define B_SUBDIV		2058
-#define B_FRACSUBDIV	2059
-#define B_XSORT			2060
-#define B_HASH			2061
-#define B_DELSTICKY		2062
-#define B_DELVERTCOL	2063
-#define B_MAKE_TFACES	2064
-#define B_TOSPHERE		2065
-#define B_DEL_TFACES	2066
-#define B_NEWVGROUP		2067
-#define B_DELVGROUP		2068
-#define B_ASSIGNVGROUP	2069
-#define B_REMOVEVGROUP	2070
-#define B_SELVGROUP		2071	
-#define B_DESELVGROUP	2072
-#define B_DECIM_FACES	2073
-#define B_DECIM_CANCEL	2074
-#define B_DECIM_APPLY	2075
-#define B_AUTOVGROUP	2076
-#define B_SLOWERDRAW	2077
-#define B_FASTERDRAW	2078
-#define B_VERTEXNOISE	2079
-#define B_VERTEXSMOOTH	2080
-#define B_MAKESTICKY	2082
-#define B_MAKEVERTCOL	2083
-
-/* *********************** */
-#define B_CURVEBUTS		2200
-
-#define B_CONVERTPOLY	2101
-#define B_CONVERTBEZ	2102
-#define B_CONVERTBSPL	2103
-#define B_CONVERTCARD	2104
-#define B_CONVERTNURB	2105
-#define B_UNIFU			2106
-#define B_ENDPU			2107
-#define B_BEZU			2108
-#define B_UNIFV			2109
-#define B_ENDPV			2110
-#define B_BEZV			2111
-#define B_SETWEIGHT		2112
-#define B_SETW1			2113
-#define B_SETW2			2114
-#define B_SETW3			2115
-#define B_SETORDER		2116
-#define B_MAKEDISP		2117
-#define B_SUBDIVCURVE	2118
-#define B_SPINNURB		2119
-#define B_CU3D			2120
-#define B_SETRESOLU		2121
-#define B_SETW4			2122
-
-
-/* *********************** */
-#define B_FONTBUTS		2300
-
-#define B_MAKEFONT		2201
-#define B_TOUPPER		2202
-#define B_SETFONT		2203
-#define B_LOADFONT		2204
-#define B_TEXTONCURVE	2205
-#define B_PACKFONT		2206
-
-/* *********************** */
-#define B_IKABUTS		2400
-
-#define B_IKASETREF		2301
-#define B_IKARECALC		2302
-
-/* *********************** */
-#define B_CAMBUTS		2500
-
-/* *********************** */
-#define B_MBALLBUTS		2600
-
-#define B_RECALCMBALL	2501
-
-/* *********************** */
-#define B_LATTBUTS		2700
-
-#define B_RESIZELAT		2601
-#define B_DRAWLAT		2602
-#define B_LATTCHANGED	2603
-
-/* *********************** */
-#define B_GAMEBUTS		2800
-
-/* in editsca.c */
-
-/* *********************** */
-#define B_FPAINTBUTS	2900
-
-#define B_VPCOLSLI		2801
-#define B_VPGAMMA		2802
-
-#define B_COPY_TF_MODE	2804
-#define B_COPY_TF_UV	2805
-#define B_COPY_TF_COL	2806
-#define B_REDR_3D_IMA	2807
-#define B_SET_VCOL		2808
-
-#define B_COPY_TF_TEX	2814
-#define B_TFACE_HALO	2815
-#define B_TFACE_BILLB	2816
-
-#define B_SHOWTEX		2832
-#define B_ASSIGNMESH	2833
-
-
-/* *********************** */
-#define B_RADIOBUTS		3000
-
-#define B_RAD_GO		2901
-#define B_RAD_INIT		2902
-#define B_RAD_LIMITS	2903
-#define B_RAD_FAC		2904
-#define B_RAD_NODELIM	2905
-#define B_RAD_NODEFILT	2906
-#define B_RAD_FACEFILT	2907
-#define B_RAD_ADD		2908
-#define B_RAD_DELETE	2909
-#define B_RAD_COLLECT	2910
-#define B_RAD_SHOOTP	2911
-#define B_RAD_SHOOTE	2912
-#define B_RAD_REPLACE	2913
-#define B_RAD_DRAW		2914
-#define B_RAD_FREE		2915
-#define B_RAD_ADDMESH	2916
-
-/* *********************** */
-#define B_SCRIPTBUTS	3100
-
-#define B_SCRIPT_ADD	3001
-#define B_SCRIPT_DEL	3002
-#define B_SCRIPT_TYPE	3003
-
-/* Scene script buttons */
-#define B_SSCRIPT_ADD	3004
-#define B_SSCRIPT_DEL	3005
-#define B_SSCRIPT_TYPE	3006
-
-/* *********************** */
-#define B_SOUNDBUTS		3200
-enum B_SOUND_BUTTONS {
-	B_SOUND_CHANGED = 3101,
-		B_SOUND_REDRAW,
-		B_SOUND_VOLUME,
-		B_SOUND_PANNING,
-		B_SOUND_PITCH,
-		B_SOUND_LOAD_SAMPLE,
-		B_SOUND_MENU_SAMPLE,
-		B_SOUND_NAME_SAMPLE,
-		B_SOUND_UNLINK_SAMPLE,
-		B_SOUND_RELOAD_SAMPLE,
-		B_SOUND_UNPACK_SAMPLE,
-		B_SOUND_PLAY_SAMPLE,
-		B_SOUND_COPY_SOUND,
-		B_SOUND_LOOPSTART,
-		B_SOUND_LOOPEND,
-		B_SOUND_BIDIRECTIONAL,
-		B_SOUND_RECALC,
-		B_SOUND_RATECHANGED,
-		B_SOUND_MIXDOWN
-};
-
-/* *********************** */
-#define B_CONSTRAINTBUTS	3300
-enum {
-	B_CONSTRAINT_REDRAW = 3201,
-	B_CONSTRAINT_ADD,
-	B_CONSTRAINT_DEL,
-	B_CONSTRAINT_TEST,
-	B_CONSTRAINT_CHANGETYPE,
-	B_CONSTRAINT_CHANGENAME,
-	B_CONSTRAINT_CHANGETARGET
-};
-
-/* *********************** */
-/*  BUTTON BUT: > 4000	   */
-/*  BUTTON 4001-4032: layers */
+/* buts->mainb old */
+#define BUTS_VIEW			0
+#define BUTS_LAMP			1
+#define BUTS_MAT			2
+#define BUTS_TEX			3
+#define BUTS_ANIM			4
+#define BUTS_WORLD			5
+#define BUTS_RENDER			6
+#define BUTS_EDIT			7
+#define BUTS_GAME			8
+#define BUTS_FPAINT			9
+#define BUTS_RADIO			10
+#define BUTS_SCRIPT			11
+#define BUTS_SOUND			12
+#define BUTS_CONSTRAINT		13
+
+/* warning: the values of these defines are used in sbuts->tabs[7] */
+/* buts->mainb new */
+#define CONTEXT_SCENE	0
+#define CONTEXT_OBJECT	1
+#define CONTEXT_TYPES	2
+#define CONTEXT_SHADING	3
+#define CONTEXT_EDITING	4
+#define CONTEXT_SCRIPT	5
+#define CONTEXT_LOGIC	6
+
+/* buts->tab new */
+#define TAB_SCENE_RENDER	0
+#define TAB_SCENE_WORLD		1
+#define TAB_SCENE_ANIM		2
+#define TAB_SCENE_SOUND		3
+
+#define TAB_SHADING_MAT 	0
+#define TAB_SHADING_TEX 	1
+#define TAB_SHADING_RAD 	2
+#define TAB_SHADING_WORLD	3
+#define TAB_SHADING_LAMP	4
+
+/* buts->scaflag */		
+#define BUTS_SENS_SEL		1
+#define BUTS_SENS_ACT		2
+#define BUTS_SENS_LINK		4
+#define BUTS_CONT_SEL		8
+#define BUTS_CONT_ACT		16
+#define BUTS_CONT_LINK		32
+#define BUTS_ACT_SEL		64
+#define BUTS_ACT_ACT		128
+#define BUTS_ACT_LINK		256