diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 270 |
1 files changed, 136 insertions, 134 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 8e218e405b6..8814a044901 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -70,7 +70,7 @@ static wmKeyMapItem *wm_keymap_item_copy(wmKeyMapItem *kmi) kmin->prev= kmin->next= NULL; kmin->flag &= ~KMI_UPDATE; - if(kmin->properties) { + if (kmin->properties) { kmin->ptr= MEM_callocN(sizeof(PointerRNA), "UserKeyMapItemPtr"); WM_operator_properties_create(kmin->ptr, kmin->idname); @@ -84,7 +84,7 @@ static wmKeyMapItem *wm_keymap_item_copy(wmKeyMapItem *kmi) static void wm_keymap_item_free(wmKeyMapItem *kmi) { /* not kmi itself */ - if(kmi->ptr) { + if (kmi->ptr) { WM_operator_properties_free(kmi->ptr); MEM_freeN(kmi->ptr); } @@ -98,14 +98,14 @@ static void wm_keymap_item_properties_set(wmKeyMapItem *kmi) static int wm_keymap_item_equals_result(wmKeyMapItem *a, wmKeyMapItem *b) { - if(strcmp(a->idname, b->idname) != 0) + if (strcmp(a->idname, b->idname) != 0) return 0; - if(!((a->ptr==NULL && b->ptr==NULL) || + if (!((a->ptr==NULL && b->ptr==NULL) || (a->ptr && b->ptr && IDP_EqualsProperties(a->ptr->data, b->ptr->data)))) return 0; - if((a->flag & KMI_INACTIVE) != (b->flag & KMI_INACTIVE)) + if ((a->flag & KMI_INACTIVE) != (b->flag & KMI_INACTIVE)) return 0; return (a->propvalue == b->propvalue); @@ -144,9 +144,9 @@ static wmKeyMapDiffItem *wm_keymap_diff_item_copy(wmKeyMapDiffItem *kmdi) wmKeyMapDiffItem *kmdin = MEM_dupallocN(kmdi); kmdin->next = kmdin->prev = NULL; - if(kmdi->add_item) + if (kmdi->add_item) kmdin->add_item = wm_keymap_item_copy(kmdi->add_item); - if(kmdi->remove_item) + if (kmdi->remove_item) kmdin->remove_item = wm_keymap_item_copy(kmdi->remove_item); return kmdin; @@ -154,11 +154,11 @@ static wmKeyMapDiffItem *wm_keymap_diff_item_copy(wmKeyMapDiffItem *kmdi) static void wm_keymap_diff_item_free(wmKeyMapDiffItem *kmdi) { - if(kmdi->remove_item) { + if (kmdi->remove_item) { wm_keymap_item_free(kmdi->remove_item); MEM_freeN(kmdi->remove_item); } - if(kmdi->add_item) { + if (kmdi->add_item) { wm_keymap_item_free(kmdi->add_item); MEM_freeN(kmdi->add_item); } @@ -205,7 +205,7 @@ void WM_keyconfig_free(wmKeyConfig *keyconf) { wmKeyMap *km; - while((km= keyconf->keymaps.first)) { + while ((km= keyconf->keymaps.first)) { WM_keymap_free(km); BLI_freelinkN(&keyconf->keymaps, km); } @@ -217,8 +217,8 @@ static wmKeyConfig *wm_keyconfig_list_find(ListBase *lb, char *idname) { wmKeyConfig *kc; - for(kc= lb->first; kc; kc= kc->next) - if(0==strncmp(idname, kc->idname, KMAP_MAX_NAME)) + for (kc= lb->first; kc; kc= kc->next) + if (0==strncmp(idname, kc->idname, KMAP_MAX_NAME)) return kc; return NULL; @@ -230,7 +230,7 @@ static wmKeyConfig *WM_keyconfig_active(wmWindowManager *wm) /* first try from preset */ keyconf= wm_keyconfig_list_find(&wm->keyconfigs, U.keyconfigstr); - if(keyconf) + if (keyconf) return keyconf; /* otherwise use default */ @@ -275,12 +275,12 @@ static wmKeyMap *wm_keymap_copy(wmKeyMap *keymap) keymapn->items.first= keymapn->items.last= NULL; keymapn->flag &= ~(KEYMAP_UPDATE|KEYMAP_EXPANDED); - for(kmdi=keymap->diff_items.first; kmdi; kmdi=kmdi->next) { + for (kmdi=keymap->diff_items.first; kmdi; kmdi=kmdi->next) { kmdin= wm_keymap_diff_item_copy(kmdi); BLI_addtail(&keymapn->items, kmdin); } - for(kmi=keymap->items.first; kmi; kmi=kmi->next) { + for (kmi=keymap->items.first; kmi; kmi=kmi->next) { kmin= wm_keymap_item_copy(kmi); BLI_addtail(&keymapn->items, kmin); } @@ -293,10 +293,10 @@ void WM_keymap_free(wmKeyMap *keymap) wmKeyMapItem *kmi; wmKeyMapDiffItem *kmdi; - for(kmdi=keymap->diff_items.first; kmdi; kmdi=kmdi->next) + for (kmdi=keymap->diff_items.first; kmdi; kmdi=kmdi->next) wm_keymap_diff_item_free(kmdi); - for(kmi=keymap->items.first; kmi; kmi=kmi->next) + for (kmi=keymap->items.first; kmi; kmi=kmi->next) wm_keymap_item_free(kmi); BLI_freelistN(&keymap->diff_items); @@ -309,7 +309,7 @@ static void keymap_event_set(wmKeyMapItem *kmi, short type, short val, int modif kmi->val= val; kmi->keymodifier= keymodifier; - if(modifier == KM_ANY) { + if (modifier == KM_ANY) { kmi->shift= kmi->ctrl= kmi->alt= kmi->oskey= KM_ANY; } else { @@ -325,7 +325,8 @@ static void keymap_item_set_id(wmKeyMap *keymap, wmKeyMapItem *kmi) keymap->kmi_id++; if ((keymap->flag & KEYMAP_USER) == 0) { kmi->id = keymap->kmi_id; - } else { + } + else { kmi->id = -keymap->kmi_id; // User defined keymap entries have negative ids } } @@ -335,10 +336,10 @@ wmKeyMapItem *WM_keymap_verify_item(wmKeyMap *keymap, const char *idname, int ty { wmKeyMapItem *kmi; - for(kmi = keymap->items.first; kmi; kmi = kmi->next) - if(strncmp(kmi->idname, idname, OP_MAX_TYPENAME)==0) + for (kmi = keymap->items.first; kmi; kmi = kmi->next) + if (strncmp(kmi->idname, idname, OP_MAX_TYPENAME)==0) break; - if(kmi==NULL) { + if (kmi==NULL) { kmi = MEM_callocN(sizeof(wmKeyMapItem), "keymap entry"); BLI_addtail(&keymap->items, kmi); @@ -380,8 +381,8 @@ wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap, const char *idname, int type, void WM_keymap_remove_item(wmKeyMap *keymap, wmKeyMapItem *kmi) { - if(BLI_findindex(&keymap->items, kmi) != -1) { - if(kmi->ptr) { + if (BLI_findindex(&keymap->items, kmi) != -1) { + if (kmi->ptr) { WM_operator_properties_free(kmi->ptr); MEM_freeN(kmi->ptr); } @@ -401,7 +402,7 @@ static void wm_keymap_addon_add(wmKeyMap *keymap, wmKeyMap *addonmap) { wmKeyMapItem *kmi, *kmin; - for(kmi=addonmap->items.first; kmi; kmi=kmi->next) { + for (kmi=addonmap->items.first; kmi; kmi=kmi->next) { kmin = wm_keymap_item_copy(kmi); keymap_item_set_id(keymap, kmin); BLI_addhead(&keymap->items, kmin); @@ -412,8 +413,8 @@ static wmKeyMapItem *wm_keymap_find_item_equals(wmKeyMap *km, wmKeyMapItem *need { wmKeyMapItem *kmi; - for(kmi=km->items.first; kmi; kmi=kmi->next) - if(wm_keymap_item_equals(kmi, needle)) + for (kmi=km->items.first; kmi; kmi=kmi->next) + if (wm_keymap_item_equals(kmi, needle)) return kmi; return NULL; @@ -423,8 +424,8 @@ static wmKeyMapItem *wm_keymap_find_item_equals_result(wmKeyMap *km, wmKeyMapIte { wmKeyMapItem *kmi; - for(kmi=km->items.first; kmi; kmi=kmi->next) - if(wm_keymap_item_equals_result(kmi, needle)) + for (kmi=km->items.first; kmi; kmi=kmi->next) + if (wm_keymap_item_equals_result(kmi, needle)) return kmi; return NULL; @@ -435,16 +436,16 @@ static void wm_keymap_diff(wmKeyMap *diff_km, wmKeyMap *from_km, wmKeyMap *to_km wmKeyMapItem *kmi, *to_kmi, *orig_kmi; wmKeyMapDiffItem *kmdi; - for(kmi=from_km->items.first; kmi; kmi=kmi->next) { + for (kmi=from_km->items.first; kmi; kmi=kmi->next) { to_kmi = WM_keymap_item_find_id(to_km, kmi->id); - if(!to_kmi) { + if (!to_kmi) { /* remove item */ kmdi = MEM_callocN(sizeof(wmKeyMapDiffItem), "wmKeyMapDiffItem"); kmdi->remove_item = wm_keymap_item_copy(kmi); BLI_addtail(&diff_km->diff_items, kmdi); } - else if(to_kmi && !wm_keymap_item_equals(kmi, to_kmi)) { + else if (to_kmi && !wm_keymap_item_equals(kmi, to_kmi)) { /* replace item */ kmdi = MEM_callocN(sizeof(wmKeyMapDiffItem), "wmKeyMapDiffItem"); kmdi->remove_item = wm_keymap_item_copy(kmi); @@ -453,21 +454,21 @@ static void wm_keymap_diff(wmKeyMap *diff_km, wmKeyMap *from_km, wmKeyMap *to_km } /* sync expanded flag back to original so we don't loose it on repatch */ - if(to_kmi) { + if (to_kmi) { orig_kmi = WM_keymap_item_find_id(orig_km, kmi->id); - if(!orig_kmi) + if (!orig_kmi) orig_kmi = wm_keymap_find_item_equals(addon_km, kmi); - if(orig_kmi) { + if (orig_kmi) { orig_kmi->flag &= ~KMI_EXPANDED; orig_kmi->flag |= (to_kmi->flag & KMI_EXPANDED); } } } - for(kmi=to_km->items.first; kmi; kmi=kmi->next) { - if(kmi->id < 0) { + for (kmi=to_km->items.first; kmi; kmi=kmi->next) { + if (kmi->id < 0) { /* add item */ kmdi = MEM_callocN(sizeof(wmKeyMapDiffItem), "wmKeyMapDiffItem"); kmdi->add_item = wm_keymap_item_copy(kmi); @@ -481,23 +482,23 @@ static void wm_keymap_patch(wmKeyMap *km, wmKeyMap *diff_km) wmKeyMapDiffItem *kmdi; wmKeyMapItem *kmi_remove, *kmi_add; - for(kmdi=diff_km->diff_items.first; kmdi; kmdi=kmdi->next) { + for (kmdi=diff_km->diff_items.first; kmdi; kmdi=kmdi->next) { /* find item to remove */ kmi_remove = NULL; - if(kmdi->remove_item) { + if (kmdi->remove_item) { kmi_remove = wm_keymap_find_item_equals(km, kmdi->remove_item); - if(!kmi_remove) + if (!kmi_remove) kmi_remove = wm_keymap_find_item_equals_result(km, kmdi->remove_item); } /* add item */ - if(kmdi->add_item) { + if (kmdi->add_item) { /* only if nothing to remove or item to remove found */ - if(!kmdi->remove_item || kmi_remove) { + if (!kmdi->remove_item || kmi_remove) { kmi_add = wm_keymap_item_copy(kmdi->add_item); kmi_add->flag |= KMI_USER_MODIFIED; - if(kmi_remove) { + if (kmi_remove) { kmi_add->flag &= ~KMI_EXPANDED; kmi_add->flag |= (kmi_remove->flag & KMI_EXPANDED); kmi_add->id = kmi_remove->id; @@ -511,7 +512,7 @@ static void wm_keymap_patch(wmKeyMap *km, wmKeyMap *diff_km) } /* remove item */ - if(kmi_remove) { + if (kmi_remove) { wm_keymap_item_free(kmi_remove); BLI_freelinkN(&km->items, kmi_remove); } @@ -525,14 +526,14 @@ static wmKeyMap *wm_keymap_patch_update(ListBase *lb, wmKeyMap *defaultmap, wmKe /* remove previous keymap in list, we will replace it */ km = WM_keymap_list_find(lb, defaultmap->idname, defaultmap->spaceid, defaultmap->regionid); - if(km) { + if (km) { expanded = (km->flag & (KEYMAP_EXPANDED|KEYMAP_CHILDREN_EXPANDED)); WM_keymap_free(km); BLI_freelinkN(lb, km); } /* copy new keymap from an existing one */ - if(usermap && !(usermap->flag & KEYMAP_DIFF)) { + if (usermap && !(usermap->flag & KEYMAP_DIFF)) { /* for compatibiltiy with old user preferences with non-diff * keymaps we override the original entirely */ wmKeyMapItem *kmi, *orig_kmi; @@ -540,12 +541,12 @@ static wmKeyMap *wm_keymap_patch_update(ListBase *lb, wmKeyMap *defaultmap, wmKe km = wm_keymap_copy(usermap); /* try to find corresponding id's for items */ - for(kmi=km->items.first; kmi; kmi=kmi->next) { + for (kmi=km->items.first; kmi; kmi=kmi->next) { orig_kmi = wm_keymap_find_item_equals(defaultmap, kmi); - if(!orig_kmi) + if (!orig_kmi) orig_kmi = wm_keymap_find_item_equals_result(defaultmap, kmi); - if(orig_kmi) + if (orig_kmi) kmi->id = orig_kmi->id; else kmi->id = -(km->kmi_id++); @@ -557,16 +558,16 @@ static wmKeyMap *wm_keymap_patch_update(ListBase *lb, wmKeyMap *defaultmap, wmKe km = wm_keymap_copy(defaultmap); /* add addon keymap items */ - if(addonmap) + if (addonmap) wm_keymap_addon_add(km, addonmap); /* tag as being user edited */ - if(usermap) + if (usermap) km->flag |= KEYMAP_USER_MODIFIED; km->flag |= KEYMAP_USER|expanded; /* apply user changes of diff keymap */ - if(usermap && (usermap->flag & KEYMAP_DIFF)) + if (usermap && (usermap->flag & KEYMAP_DIFF)) wm_keymap_patch(km, usermap); /* add to list */ @@ -582,14 +583,14 @@ static void wm_keymap_diff_update(ListBase *lb, wmKeyMap *defaultmap, wmKeyMap * /* create temporary default + addon keymap for diff */ origmap = defaultmap; - if(addonmap) { + if (addonmap) { defaultmap = wm_keymap_copy(defaultmap); wm_keymap_addon_add(defaultmap, addonmap); } /* remove previous diff keymap in list, we will replace it */ prevmap = WM_keymap_list_find(lb, km->idname, km->spaceid, km->regionid); - if(prevmap) { + if (prevmap) { WM_keymap_free(prevmap); BLI_freelinkN(lb, prevmap); } @@ -597,12 +598,12 @@ static void wm_keymap_diff_update(ListBase *lb, wmKeyMap *defaultmap, wmKeyMap * /* create diff keymap */ diffmap= wm_keymap_new(km->idname, km->spaceid, km->regionid); diffmap->flag |= KEYMAP_DIFF; - if(defaultmap->flag & KEYMAP_MODAL) + if (defaultmap->flag & KEYMAP_MODAL) diffmap->flag |= KEYMAP_MODAL; wm_keymap_diff(diffmap, defaultmap, km, origmap, addonmap); /* add to list if not empty */ - if(diffmap->diff_items.first) { + if (diffmap->diff_items.first) { BLI_addtail(lb, diffmap); } else { @@ -611,7 +612,7 @@ static void wm_keymap_diff_update(ListBase *lb, wmKeyMap *defaultmap, wmKeyMap * } /* free temporary default map */ - if(addonmap) { + if (addonmap) { WM_keymap_free(defaultmap); MEM_freeN(defaultmap); } @@ -627,9 +628,9 @@ wmKeyMap *WM_keymap_list_find(ListBase *lb, const char *idname, int spaceid, int { wmKeyMap *km; - for(km= lb->first; km; km= km->next) - if(km->spaceid==spaceid && km->regionid==regionid) - if(0==strncmp(idname, km->idname, KMAP_MAX_NAME)) + for (km= lb->first; km; km= km->next) + if (km->spaceid==spaceid && km->regionid==regionid) + if (0==strncmp(idname, km->idname, KMAP_MAX_NAME)) return km; return NULL; @@ -639,7 +640,7 @@ wmKeyMap *WM_keymap_find(wmKeyConfig *keyconf, const char *idname, int spaceid, { wmKeyMap *km= WM_keymap_list_find(&keyconf->keymaps, idname, spaceid, regionid); - if(km==NULL) { + if (km==NULL) { km= wm_keymap_new(idname, spaceid, regionid); BLI_addtail(&keyconf->keymaps, km); @@ -666,12 +667,12 @@ wmKeyMap *WM_modalkeymap_add(wmKeyConfig *keyconf, const char *idname, EnumPrope km->flag |= KEYMAP_MODAL; km->modal_items= items; - if(!items) { + if (!items) { /* init modal items from default config */ wmWindowManager *wm = G.main->wm.first; wmKeyMap *defaultkm= WM_keymap_list_find(&wm->defaultconf->keymaps, km->idname, 0, 0); - if(defaultkm) { + if (defaultkm) { km->modal_items = defaultkm->modal_items; km->poll = defaultkm->poll; } @@ -684,9 +685,9 @@ wmKeyMap *WM_modalkeymap_get(wmKeyConfig *keyconf, const char *idname) { wmKeyMap *km; - for(km= keyconf->keymaps.first; km; km= km->next) - if(km->flag & KEYMAP_MODAL) - if(0==strncmp(idname, km->idname, KMAP_MAX_NAME)) + for (km= keyconf->keymaps.first; km; km= km->next) + if (km->flag & KEYMAP_MODAL) + if (0==strncmp(idname, km->idname, KMAP_MAX_NAME)) break; return km; @@ -713,7 +714,7 @@ void WM_modalkeymap_assign(wmKeyMap *km, const char *opname) { wmOperatorType *ot= WM_operatortype_find(opname, 0); - if(ot) + if (ot) ot->modalkeymap = km; else printf("error: modalkeymap_assign, unknown operator %s\n", opname); @@ -724,7 +725,7 @@ void WM_modalkeymap_assign(wmKeyMap *km, const char *opname) const char *WM_key_event_string(short type) { const char *name= NULL; - if(RNA_enum_name(event_type_items, (int)type, &name)) + if (RNA_enum_name(event_type_items, (int)type, &name)) return name; return ""; @@ -742,21 +743,22 @@ char *WM_keymap_item_to_string(wmKeyMapItem *kmi, char *str, int len) kmi->oskey == KM_ANY) { strcat(buf, "Any "); - } else { - if(kmi->shift) + } + else { + if (kmi->shift) strcat(buf, "Shift "); - if(kmi->ctrl) + if (kmi->ctrl) strcat(buf, "Ctrl "); - if(kmi->alt) + if (kmi->alt) strcat(buf, "Alt "); - if(kmi->oskey) + if (kmi->oskey) strcat(buf, "Cmd "); } - if(kmi->keymodifier) { + if (kmi->keymodifier) { strcat(buf, WM_key_event_string(kmi->keymodifier)); strcat(buf, " "); } @@ -777,25 +779,25 @@ static wmKeyMapItem *wm_keymap_item_find_handlers( wmKeyMapItem *kmi; /* find keymap item in handlers */ - for(handler=handlers->first; handler; handler=handler->next) { + for (handler=handlers->first; handler; handler=handler->next) { keymap= WM_keymap_active(wm, handler->keymap); - if(keymap && (!keymap->poll || keymap->poll((bContext*)C))) { - for(kmi=keymap->items.first; kmi; kmi=kmi->next) { + if (keymap && (!keymap->poll || keymap->poll((bContext*)C))) { + for (kmi=keymap->items.first; kmi; kmi=kmi->next) { - if(strcmp(kmi->idname, opname) == 0 && WM_key_event_string(kmi->type)[0]) { + if (strcmp(kmi->idname, opname) == 0 && WM_key_event_string(kmi->type)[0]) { if (hotkey) if (!ISHOTKEY(kmi->type)) continue; - if(compare_props) { - if(kmi->ptr && IDP_EqualsProperties(properties, kmi->ptr->data)) { - if(keymap_r) *keymap_r= keymap; + if (compare_props) { + if (kmi->ptr && IDP_EqualsProperties(properties, kmi->ptr->data)) { + if (keymap_r) *keymap_r= keymap; return kmi; } } else { - if(keymap_r) *keymap_r= keymap; + if (keymap_r) *keymap_r= keymap; return kmi; } } @@ -804,7 +806,7 @@ static wmKeyMapItem *wm_keymap_item_find_handlers( } /* ensure un-initialized keymap is never used */ - if(keymap_r) *keymap_r= NULL; + if (keymap_r) *keymap_r= NULL; return NULL; } @@ -818,39 +820,39 @@ static wmKeyMapItem *wm_keymap_item_find_props( wmKeyMapItem *found= NULL; /* look into multiple handler lists to find the item */ - if(win) + if (win) found= wm_keymap_item_find_handlers(C, &win->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r); - if(sa && found==NULL) + if (sa && found==NULL) found= wm_keymap_item_find_handlers(C, &sa->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r); - if(found==NULL) { - if(ELEM(opcontext, WM_OP_EXEC_REGION_WIN, WM_OP_INVOKE_REGION_WIN)) { - if(sa) { + if (found==NULL) { + if (ELEM(opcontext, WM_OP_EXEC_REGION_WIN, WM_OP_INVOKE_REGION_WIN)) { + if (sa) { if (!(ar && ar->regiontype == RGN_TYPE_WINDOW)) ar= BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if(ar) + if (ar) found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r); } } - else if(ELEM(opcontext, WM_OP_EXEC_REGION_CHANNELS, WM_OP_INVOKE_REGION_CHANNELS)) { + else if (ELEM(opcontext, WM_OP_EXEC_REGION_CHANNELS, WM_OP_INVOKE_REGION_CHANNELS)) { if (!(ar && ar->regiontype == RGN_TYPE_CHANNELS)) ar= BKE_area_find_region_type(sa, RGN_TYPE_CHANNELS); - if(ar) + if (ar) found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r); } - else if(ELEM(opcontext, WM_OP_EXEC_REGION_PREVIEW, WM_OP_INVOKE_REGION_PREVIEW)) { + else if (ELEM(opcontext, WM_OP_EXEC_REGION_PREVIEW, WM_OP_INVOKE_REGION_PREVIEW)) { if (!(ar && ar->regiontype == RGN_TYPE_PREVIEW)) ar= BKE_area_find_region_type(sa, RGN_TYPE_PREVIEW); - if(ar) + if (ar) found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r); } else { - if(ar) + if (ar) found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r); } } @@ -864,7 +866,7 @@ static wmKeyMapItem *wm_keymap_item_find( { wmKeyMapItem *found= wm_keymap_item_find_props(C, opname, opcontext, properties, 1, hotkey, keymap_r); - if(!found && sloppy) + if (!found && sloppy) found= wm_keymap_item_find_props(C, opname, opcontext, NULL, 0, hotkey, keymap_r); return found; @@ -876,7 +878,7 @@ char *WM_key_event_operator_string( { wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, 0, sloppy, NULL); - if(kmi) { + if (kmi) { WM_keymap_item_to_string(kmi, str, len); return str; } @@ -890,7 +892,7 @@ int WM_key_event_operator_id( { wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, hotkey, TRUE, keymap_r); - if(kmi) + if (kmi) return kmi->id; else return 0; @@ -907,10 +909,10 @@ int WM_keymap_item_compare(wmKeyMapItem *k1, wmKeyMapItem *k2) k1type = WM_userdef_event_map(k1->type); k2type = WM_userdef_event_map(k2->type); - if(k1type != KM_ANY && k2type != KM_ANY && k1type != k2type) + if (k1type != KM_ANY && k2type != KM_ANY && k1type != k2type) return 0; - if(k1->val != KM_ANY && k2->val != KM_ANY) { + if (k1->val != KM_ANY && k2->val != KM_ANY) { /* take click, press, release conflict into account */ if (k1->val == KM_CLICK && ELEM3(k2->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0) return 0; @@ -920,19 +922,19 @@ int WM_keymap_item_compare(wmKeyMapItem *k1, wmKeyMapItem *k2) return 0; } - if(k1->shift != KM_ANY && k2->shift != KM_ANY && k1->shift != k2->shift) + if (k1->shift != KM_ANY && k2->shift != KM_ANY && k1->shift != k2->shift) return 0; - if(k1->ctrl != KM_ANY && k2->ctrl != KM_ANY && k1->ctrl != k2->ctrl) + if (k1->ctrl != KM_ANY && k2->ctrl != KM_ANY && k1->ctrl != k2->ctrl) return 0; - if(k1->alt != KM_ANY && k2->alt != KM_ANY && k1->alt != k2->alt) + if (k1->alt != KM_ANY && k2->alt != KM_ANY && k1->alt != k2->alt) return 0; - if(k1->oskey != KM_ANY && k2->oskey != KM_ANY && k1->oskey != k2->oskey) + if (k1->oskey != KM_ANY && k2->oskey != KM_ANY && k1->oskey != k2->oskey) return 0; - if(k1->keymodifier != k2->keymodifier) + if (k1->keymodifier != k2->keymodifier) return 0; return 1; @@ -950,9 +952,9 @@ void WM_keyconfig_update_tag(wmKeyMap *km, wmKeyMapItem *kmi) /* quick tag to do delayed keymap updates */ WM_KEYMAP_UPDATE= 1; - if(km) + if (km) km->flag |= KEYMAP_UPDATE; - if(kmi) + if (kmi) kmi->flag |= KMI_UPDATE; } @@ -964,7 +966,7 @@ static int wm_keymap_test_and_clear_update(wmKeyMap *km) update= (km->flag & KEYMAP_UPDATE); km->flag &= ~KEYMAP_UPDATE; - for(kmi=km->items.first; kmi; kmi=kmi->next) { + for (kmi=km->items.first; kmi; kmi=kmi->next) { update= update || (kmi->flag & KMI_UPDATE); kmi->flag &= ~KMI_UPDATE; } @@ -978,7 +980,7 @@ static wmKeyMap *wm_keymap_preset(wmWindowManager *wm, wmKeyMap *km) wmKeyMap *keymap; keymap= WM_keymap_list_find(&keyconf->keymaps, km->idname, km->spaceid, km->regionid); - if(!keymap) + if (!keymap) keymap= WM_keymap_list_find(&wm->defaultconf->keymaps, km->idname, km->spaceid, km->regionid); return keymap; @@ -991,42 +993,42 @@ void WM_keyconfig_update(wmWindowManager *wm) wmKeyMapDiffItem *kmdi; int compat_update = 0; - if(G.background) + if (G.background) return; - if(!WM_KEYMAP_UPDATE) + if (!WM_KEYMAP_UPDATE) return; /* update operator properties for non-modal user keymaps */ - for(km=U.user_keymaps.first; km; km=km->next) { - if((km->flag & KEYMAP_MODAL) == 0) { - for(kmdi=km->diff_items.first; kmdi; kmdi=kmdi->next) { - if(kmdi->add_item) + for (km=U.user_keymaps.first; km; km=km->next) { + if ((km->flag & KEYMAP_MODAL) == 0) { + for (kmdi=km->diff_items.first; kmdi; kmdi=kmdi->next) { + if (kmdi->add_item) wm_keymap_item_properties_set(kmdi->add_item); - if(kmdi->remove_item) + if (kmdi->remove_item) wm_keymap_item_properties_set(kmdi->remove_item); } - for(kmi=km->items.first; kmi; kmi=kmi->next) + for (kmi=km->items.first; kmi; kmi=kmi->next) wm_keymap_item_properties_set(kmi); } } /* update U.user_keymaps with user key configuration changes */ - for(km=wm->userconf->keymaps.first; km; km=km->next) { + for (km=wm->userconf->keymaps.first; km; km=km->next) { /* only diff if the user keymap was modified */ - if(wm_keymap_test_and_clear_update(km)) { + if (wm_keymap_test_and_clear_update(km)) { /* find keymaps */ defaultmap= wm_keymap_preset(wm, km); addonmap= WM_keymap_list_find(&wm->addonconf->keymaps, km->idname, km->spaceid, km->regionid); /* diff */ - if(defaultmap) + if (defaultmap) wm_keymap_diff_update(&U.user_keymaps, defaultmap, addonmap, km); } } /* create user key configuration from preset + addon + user preferences */ - for(km=wm->defaultconf->keymaps.first; km; km=km->next) { + for (km=wm->defaultconf->keymaps.first; km; km=km->next) { /* find keymaps */ defaultmap= wm_keymap_preset(wm, km); addonmap= WM_keymap_list_find(&wm->addonconf->keymaps, km->idname, km->spaceid, km->regionid); @@ -1035,7 +1037,7 @@ void WM_keyconfig_update(wmWindowManager *wm) /* add */ kmn= wm_keymap_patch_update(&wm->userconf->keymaps, defaultmap, addonmap, usermap); - if(kmn) { + if (kmn) { kmn->modal_items= km->modal_items; kmn->poll= km->poll; } @@ -1046,7 +1048,7 @@ void WM_keyconfig_update(wmWindowManager *wm) WM_KEYMAP_UPDATE= 0; - if(compat_update) { + if (compat_update) { WM_keyconfig_update_tag(NULL, NULL); WM_keyconfig_update(wm); } @@ -1061,13 +1063,13 @@ wmKeyMap *WM_keymap_active(wmWindowManager *wm, wmKeyMap *keymap) { wmKeyMap *km; - if(!keymap) + if (!keymap) return NULL; /* first user defined keymaps */ km= WM_keymap_list_find(&wm->userconf->keymaps, keymap->idname, keymap->spaceid, keymap->regionid); - if(km) + if (km) return km; return keymap; @@ -1082,14 +1084,14 @@ void WM_keymap_restore_item_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapIt wmKeyMap *defaultmap, *addonmap; wmKeyMapItem *orig; - if(!keymap) + if (!keymap) return; /* construct default keymap from preset + addons */ defaultmap= wm_keymap_preset(wm, keymap); addonmap= WM_keymap_list_find(&wm->addonconf->keymaps, keymap->idname, keymap->spaceid, keymap->regionid); - if(addonmap) { + if (addonmap) { defaultmap = wm_keymap_copy(defaultmap); wm_keymap_addon_add(defaultmap, addonmap); } @@ -1097,15 +1099,15 @@ void WM_keymap_restore_item_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapIt /* find original item */ orig = WM_keymap_item_find_id(defaultmap, kmi->id); - if(orig) { + if (orig) { /* restore to original */ - if(strcmp(orig->idname, kmi->idname) != 0) { + if (strcmp(orig->idname, kmi->idname) != 0) { BLI_strncpy(kmi->idname, orig->idname, sizeof(kmi->idname)); WM_keymap_properties_reset(kmi, NULL); } if (orig->properties) { - if(kmi->properties) { + if (kmi->properties) { IDP_FreeProperty(kmi->properties); MEM_freeN(kmi->properties); kmi->properties= NULL; @@ -1129,7 +1131,7 @@ void WM_keymap_restore_item_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapIt } /* free temporary keymap */ - if(addonmap) { + if (addonmap) { WM_keymap_free(defaultmap); MEM_freeN(defaultmap); } @@ -1143,7 +1145,7 @@ void WM_keymap_restore_to_default(wmKeyMap *keymap, bContext *C) /* remove keymap from U.user_keymaps and update */ usermap= WM_keymap_list_find(&U.user_keymaps, keymap->idname, keymap->spaceid, keymap->regionid); - if(usermap) { + if (usermap) { WM_keymap_free(usermap); BLI_freelinkN(&U.user_keymaps, usermap); @@ -1204,7 +1206,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) km = WM_keymap_find_all(C, "Mesh", 0, 0); /* some mesh operators are active in object mode too, like add-prim */ - if(km && km->poll && km->poll((bContext *)C)==0) { + if (km && km->poll && km->poll((bContext *)C)==0) { km = WM_keymap_find_all(C, "Object Mode", 0, 0); } } @@ -1212,7 +1214,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) km = WM_keymap_find_all(C, "Curve", 0, 0); /* some curve operators are active in object mode too, like add-prim */ - if(km && km->poll && km->poll((bContext *)C)==0) { + if (km && km->poll && km->poll((bContext *)C)==0) { km = WM_keymap_find_all(C, "Object Mode", 0, 0); } } @@ -1236,7 +1238,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) km = WM_keymap_find_all(C, "Metaball", 0, 0); /* some mball operators are active in object mode too, like add-prim */ - if(km && km->poll && km->poll((bContext *)C)==0) { + if (km && km->poll && km->poll((bContext *)C)==0) { km = WM_keymap_find_all(C, "Object Mode", 0, 0); } } |